Edition vpc (docker#1797)

* Added BYO VPC links for aws and added beta channel for azure

Signed-off-by: French Ben <[email protected]>

Author: FrenchBen

_includes/d4a_buttons.md

@@ -1,20 +1,26 @@
 {% capture aws_button_latest %}
-<a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker.tmpl" data-rel="Stable-1" target="blank" class="aws-deploy">![Docker for AWS](https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png)</a>
+<a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker.tmpl" data-rel="Stable-2" target="blank" class="aws-deploy">![Docker for AWS](https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png)</a>
 {% endcapture %}
 {% capture aws_blue_latest %}
-<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker.tmpl" data-rel="Stable-1" target="blank">Deploy Docker for AWS (stable)</a>
+<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker.tmpl" data-rel="Stable-2" target="blank">Deploy Docker for AWS (stable)</a>
 {% endcapture %}
-{% capture aws_blue_beta %}
-<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/edge/Docker.tmpl" data-rel="Beta-14" target="blank">Deploy Docker for AWS (beta)</a>
+{% capture aws_blue_edge %}
+<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/edge/Docker.tmpl" data-rel="Beta-18" target="blank">Deploy Docker for AWS (beta)</a>
+{% endcapture %}
+{% capture aws_blue_vpc_latest %}
+<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker-no-vpc.tmpl" data-rel="Stable-1" target="blank">Deploy Docker for AWS (stable)<br/><small>uses your existing VPC</small></a>
+{% endcapture %}
+{% capture aws_blue_vpc_edge %}
+<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/edge/Docker-no-vpc.tmpl" data-rel="Beta-18" target="blank">Deploy Docker for AWS (beta)<br/><small>uses your existing VPC</small></a>
 {% endcapture %}
 
 {% capture azure_blue_latest %}
-<a class="button darkblue-btn azure-deploy" href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fstable%2FDocker.tmpl" data-rel="Stable-1" target="blank">Deploy Docker for Azure (stable)</a>
+<a class="button darkblue-btn azure-deploy" href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fstable%2FDocker.tmpl" data-rel="Stable-2" target="blank">Deploy Docker for Azure (stable)</a>
 {% endcapture %}
-{% capture azure_blue_beta %}
-<a class="button darkblue-btn azure-deploy" href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fedge%2FDocker.tmpl" data-rel="Beta-14" target="blank">Deploy Docker for Azure (beta)</a>
+{% capture azure_blue_edge %}
+<a class="button darkblue-btn azure-deploy" href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fedge%2FDocker.tmpl" data-rel="Beta-18" target="blank">Deploy Docker for Azure (beta)</a>
 {% endcapture %}
 {% capture azure_button_latest %}
-<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fstable%2FDocker.tmpl" data-rel="Stable-1" target="_blank" class="azure-deploy">![Docker for Azure](http://azuredeploy.net/deploybutton.png)</a>
+<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fstable%2FDocker.tmpl" data-rel="Stable-2" target="_blank" class="azure-deploy">![Docker for Azure](http://azuredeploy.net/deploybutton.png)</a>
 {% endcapture %}
 

docker-for-aws/index.md

@@ -33,7 +33,14 @@ using CloudFormation. For more about stable and beta channels, see the
   {{aws_blue_latest}}
   </td>
   <td width="50%">
-  {{aws_blue_beta}}
+  {{aws_blue_edge}}
+  </td>
+  </tr>
+  <tr valign="top">
+  <td width="50%">
+  </td>
+  <td width="50%">
+  {{aws_blue_vpc_edge}}
   </td>
   </tr>
 </table>

docker-for-azure/faqs.md

@@ -5,7 +5,23 @@ title: Docker for Azure Frequently asked questions (FAQ)
 toc_max: 2
 ---
 
-## FAQ
+## Stable and beta channels
+
+Two different download channels are available for Docker for AWS:
+
+* The **stable channel** provides a general availability release-ready deployment
+  for a fully baked and tested, more reliable cluster. The stable version of Docker
+  for AWS comes with the latest released version of Docker Engine. The release
+  schedule is synched with Docker Engine releases and hotfixes. On the stable
+  channel, you can select whether to send usage statistics and other data.
+
+* The **beta channel** provides a deployment with new features we are working on,
+  but is not necessarily fully tested. It comes with the experimental version of
+  Docker Engine. Bugs, crashes and issues are more likely to occur with the beta
+  cluster, but you get a chance to preview new functionality, experiment, and provide
+  feedback as the deployment evolve. Releases are typically more frequent than for
+  stable, often one or more per month. Usage statistics and crash reports are sent
+  by default. You do not have the option to disable this on the beta channel.
 
 ## Can I use my own VHD?
 No, at this time we only support the default Docker for Azure VHD.

docker-for-azure/index.md

@@ -11,20 +11,26 @@ redirect_from:
 ## Quickstart
 
 If your account has the [proper permissions](#prerequisites), you can generate the [Service Principal](#service-principal) and
-then use the below button from the stable channel to bootstrap Docker for Azure using Azure Resource Manager.
+then choose from the stable or beta channel to bootstrap Docker for Azure using Azure Resource Manager. 
+For more about stable and beta channels, see the [FAQs](/docker-for-azure/faqs.md#stable-and-beta-channels)
 
 <table style="width:100%">
   <tr>
     <th style="font-size: x-large; font-family: arial">Stable channel</th>
+    <th style="font-size: x-large; font-family: arial">Beta channel</th>
   </tr>
   <tr valign="top">
-    <td width="100%">This deployment is fully baked and tested, and comes with the latest GA version of Docker Engine. <br><br>This is the best channel to use if you want a reliable platform to work with. <br><br>These releases follow a version schedule with a longer lead time than the betas, synched with Docker Engine releases and hotfixes.
+    <td width="50%">The stable deployment is fully baked and tested, and comes with the latest GA version of Docker Engine. <br><br>This is the best channel to use if you want a reliable platform to work with. <br><br>These releases follow a version schedule with a longer lead time than the betas, synched with Docker Engine releases and hotfixes.
     </td>
+    <td width="50%">The beta deployment offers cutting edge features and comes with the experimental version of Docker Engine, described in the <a href="https://github.com/docker/docker/tree/master/experimental">Docker Experimental Features README</a> on GitHub.<br><br>This is the best channel to use if you want to experiment with features under development, and can weather some instability and bugs. This channel is a continuation of the beta program, where you can provide feedback as the apps evolve. Releases are typically more frequent than for stable, often one or more per month. <br><br>We collect usage data on betas across the board.</td>
   </tr>
   <tr valign="top">
-  <td width="100%">
+  <td width="50%">
   {{azure_blue_latest}}
   </td>
+  <td width="50%">
+  {{azure_blue_edge}}
+  </td>
   </tr>
 </table>
 

docker-for-azure/release-notes.md

@@ -6,35 +6,54 @@ title: Docker for Azure Release Notes
 
 {% include d4a_buttons.md %}
 
-## 1.13.0-1
-Release date: 1/18/2017
+## Stable Channel
+
+### 1.13.1-2 (stable)
+Release date: 02/08/2017
 
 {{azure_button_latest}}
 
-### New
+**New**
+
+- Docker Engine upgraded to [Docker 1.13.1](https://github.com/docker/docker/blob/master/CHANGELOG.md)
+
+### 1.13.0-1
+Release date: 1/18/2017
+
+**New**
 
 - Docker Engine upgraded to [Docker 1.13.0](https://github.com/docker/docker/blob/master/CHANGELOG.md)
 - Writing to home directory no longer requires `sudo`
 - Added support to perform fine grained monitoring of health status of swarm nodes, destroy unhealthy nodes and create replacement nodes
 - Added support to scale the number of nodes in manager and worker vm scale sets through Azure UI/CLI for managing the number of nodes in a scale set
 - Improved logging and remote diagnostics mechanisms for system containers
 
-## 1.13.0-beta12
+## Beta Channel
+
+### 1.13.1-beta18
+Release date: 02/16/2017
+
+**New**
+
+- Docker Engine upgraded to [Docker 1.13.1](https://github.com/docker/docker/blob/master/CHANGELOG.md)
+- Added Swarm wide support for [persistent storage volumes](persistent-data-volumes.md)
+
+### 1.13.0-beta12
 
 Release date: 12/09/2016
 
-### New
+**New**
 
 - Docker Engine upgraded to [Docker 1.13.0-rc2](https://github.com/docker/docker/blob/master/CHANGELOG.md)
 - SSH access has been added to the worker nodes
 - The Docker daemon no longer listens on port 2375
 - Added a `swarm-exec` to execute a docker command across all of the swarm nodes. See [Executing Docker commands in all swarm nodes](deploy.md#execute-docker-commands-in-all-swarm-nodes) for more details.
 
-## 1.12.3-beta10
+### 1.12.3-beta10
 
 Release date: 11/08/2016
 
-### New
+**New**
 
 - Docker Engine upgraded to Docker 1.12.3
 - Fixed the shell container that runs on the managers, to remove a ssh host key that was accidentally added to the image.
@@ -44,33 +63,33 @@ This could have led to a potential man in the middle (MITM) attack. The ssh host
 - All container logs can be found in the `xxxxlog` storage account
 - You can connect to each manager using SSH by following our deploy [guide](deploy.md)
 
-## 1.12.2-beta9
+### 1.12.2-beta9
 
 Release date: 10/17/2016
 
-### New
+**New**
 
 - Docker Engine upgraded to Docker 1.12.2
 - Manager behind its own LB
 - Added sudo support to the shell container on manager nodes
 
-## 1.12.1-beta5
+### 1.12.1-beta5
 
 Release date: 8/19/2016
 
-### New
+**New**
 
  * Docker Engine upgraded to 1.12.1
 
 ### Errata
 
  * To assist with debugging, the Docker Engine API is available internally in the Azure VPC on TCP port 2375. These ports cannot be accessed from outside the cluster, but could be used from within the cluster to obtain privileged access on other cluster nodes. In future releases, direct remote access to the Docker API will not be available.
 
-## 1.12.0-beta4
+### 1.12.0-beta4
 
 Release date: 8/9/2016
 
-### New
+**New**
 
  * First release