Updated docs to reflect edge channel

Signed-off-by: French Ben <frenchben@docker.com>
docker · johndmulhausen · Mar 2, 2017 · Jan 28, 2017 · Jan 30, 2017 · Jan 31, 2017
commit a9bbf13e54137e3589b675f65d95e8e926641e93
diff --git a/_includes/d4a_buttons.md b/_includes/d4a_buttons.md
@@ -1,25 +1,39 @@
 {% 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-2" 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="CE-Stable-1" target="blank" class="aws-deploy">![Docker for AWS](https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png)</a>
 {% endcapture %}
+
+{% capture aws_button_edge %}
+<a 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="CE-Stable-1" 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-2" 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="CE-Stable-1" target="blank">Deploy Docker for AWS (stable)</a>
 {% endcapture %}
+
 {% 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>
+<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="CE-Edge-1" target="blank">Deploy Docker for AWS (edge)</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>
+<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="CE-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>
+<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="CE-Edge-1" target="blank">Deploy Docker for AWS (edge)<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-2" 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="CE-Stable-1" target="blank">Deploy Docker for Azure (stable)</a>
 {% endcapture %}
+
 {% 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>
+<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="CE-Edge-1" target="blank">Deploy Docker for Azure (edge)</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-2" 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="CE-Stable-1" target="_blank" class="azure-deploy">![Docker for Azure](http://azuredeploy.net/deploybutton.png)</a>
+{% endcapture %}
+
+{% capture azure_button_edge %}
+<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fedge%2FDocker.tmpl" data-rel="CE-Stable-1" target="_blank" class="azure-deploy">![Docker for Azure](http://azuredeploy.net/deploybutton.png)</a>
 {% endcapture %}
diff --git a/docker-for-aws/faqs.md b/docker-for-aws/faqs.md
@@ -5,7 +5,7 @@ title: Docker for AWS Frequently asked questions (FAQ)
 toc_max: 2
 ---
 
-## Stable and beta channels
+## Stable and edge channels
 
 Two different download channels are available for Docker for AWS:
 
@@ -15,13 +15,13 @@ Two different download channels are available for Docker for AWS:
   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,
+* The **edge 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
+  Docker Engine. Bugs, crashes and issues are more likely to occur with the edge
   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.
+  by default. You do not have the option to disable this on the edge channel.
 
 ## Can I use my own AMI?
 

diff --git a/docker-for-aws/index.md b/docker-for-aws/index.md
@@ -13,20 +13,20 @@ redirect_from:
 
 If your account [has the proper
 permissions](/docker-for-aws/iam-permissions.md), you can
-use the blue button from the stable or beta channel to bootstrap Docker for AWS
-using CloudFormation. For more about stable and beta channels, see the
-[FAQs](/docker-for-aws/faqs.md#stable-and-beta-channels).
+use the blue button from the stable or edge channel to bootstrap Docker for AWS
+using CloudFormation. For more about stable and edge channels, see the
+[FAQs](/docker-for-aws/faqs.md#stable-and-edge-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>
+    <th style="font-size: x-large; font-family: arial">Edge channel</th>
   </tr>
   <tr valign="top">
-    <td width="50%">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%">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 edge channel, synched with Docker Engine releases and hotfixes.
     </td>
-    <td width="50%">This 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>
+    <td width="50%">This 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 edge 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 edges across the board.</td>
   </tr>
   <tr valign="top">
   <td width="50%">

diff --git a/docker-for-aws/release-notes.md b/docker-for-aws/release-notes.md
@@ -1,31 +1,47 @@
 ---
 description: Release notes
-keywords: aws, amazon, iaas, release
+keywords: aws, amazon, iaas, release, edge, stable
 title: Docker for AWS Release Notes
 ---
 
 {% include d4a_buttons.md %}
 
 ## Stable Channel
 
-### 1.13.1-2 (stable)
-Release date: 02/08/2017
+### 17.03.0 CE
+Release date: 03/01/2017
 
 {{aws_button_latest}}
 
 **New**
 
+- Docker Engine upgraded to [Docker 17.03.0 CE](https://github.com/docker/docker/blob/master/CHANGELOG.md)
+
+### 1.13.1-2
+Release date: 02/08/2017
+
+**New**
+
 - Docker Engine upgraded to [Docker 1.13.1](https://github.com/docker/docker/blob/master/CHANGELOG.md)
 
-### 1.13.0-1 (stable)
+### 1.13.0-1
 Release date: 01/18/2017
 
 **New**
 
 - Docker Engine upgraded to [Docker 1.13.0](https://github.com/docker/docker/blob/master/CHANGELOG.md)
 - Change ELB health check from TCP to HTTP
 
-## Beta Channel
+## Edge Channel
+
+### 17.03.0-edge1 CE
+Release date: 03/01/2017
+
+{{aws_button_edge}}
+
+**New**
+
+- Docker Engine upgraded to [Docker 17.03.0 CE](https://github.com/docker/docker/blob/master/CHANGELOG.md)
 
 ### 1.13.1-beta18
 Release date: 02/16/2017

diff --git a/docker-for-azure/faqs.md b/docker-for-azure/faqs.md
@@ -5,7 +5,7 @@ title: Docker for Azure Frequently asked questions (FAQ)
 toc_max: 2
 ---
 
-## Stable and beta channels
+## Stable and edge channels
 
 Two different download channels are available for Docker for AWS:
 
@@ -15,13 +15,13 @@ Two different download channels are available for Docker for AWS:
   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,
+* The **edge 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
+  Docker Engine. Bugs, crashes and issues are more likely to occur with the edge
   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.
+  by default. You do not have the option to disable this on the edge channel.
 
 ## Can I use my own VHD?
 No, at this time we only support the default Docker for Azure VHD.

diff --git a/docker-for-azure/index.md b/docker-for-azure/index.md
@@ -11,18 +11,18 @@ redirect_from:
 ## Quickstart
 
 If your account has the [proper permissions](#prerequisites), you can generate the [Service Principal](#service-principal) and
-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)
+then choose from the stable or edge channel to bootstrap Docker for Azure using Azure Resource Manager. 
+For more about stable and edge channels, see the [FAQs](/docker-for-azure/faqs.md#stable-and-edge-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>
+    <th style="font-size: x-large; font-family: arial">Edge channel</th>
   </tr>
   <tr valign="top">
-    <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 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 edge channel, 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>
+    <td width="50%">The edge 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 edge 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 edges across the board.</td>
   </tr>
   <tr valign="top">
   <td width="50%">
@@ -78,7 +78,7 @@ AD App Secret:   <secret>
 AD Tenant ID:   <tenant-id>
 ```
 
-If you have multiple Azure subscriptions, make sure you're creating the Service Principal with subscription ID that you shared with Docker when signing up for the beta.
+If you have multiple Azure subscriptions, make sure you're creating the Service Principal with subscription ID that you shared with Docker when signing up for the edge.
 
 * `sp-name` is the name of the authentication app that the script creates with Azure. The name is not important, simply choose something you'll recognize in the Azure portal. Example: `sp1`.
 * `rg-name` is the name of the new resource group that will be created to deploy the resources (VMs, networks, storage accounts) associated with the swarm. The Service Principal will be scoped to this resource group. Example: `swarm1`.

diff --git a/docker-for-azure/release-notes.md b/docker-for-azure/release-notes.md
@@ -1,20 +1,27 @@
 ---
 description: Release notes
-keywords: azure, microsoft, iaas, tutorial
+keywords: azure, microsoft, iaas, tutorial, edge, stable
 title: Docker for Azure Release Notes
 ---
 
 {% include d4a_buttons.md %}
 
 ## Stable Channel
 
-### 1.13.1-2 (stable)
+### 17.03.0 CE
 Release date: 02/08/2017
 
 {{azure_button_latest}}
 
 **New**
 
+- Docker Engine upgraded to [Docker 17.03.0 CE](https://github.com/docker/docker/blob/master/CHANGELOG.md)
+
+### 1.13.1-2
+Release date: 02/08/2017
+
+**New**
+
 - Docker Engine upgraded to [Docker 1.13.1](https://github.com/docker/docker/blob/master/CHANGELOG.md)
 
 ### 1.13.0-1
@@ -28,7 +35,16 @@ Release date: 1/18/2017
 - 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
 
-## Beta Channel
+## Edge Channel
+
+### 17.03.0-edge1 CE
+Release date: 03/01/2017
+
+{{azure_button_edge}}
+
+**New**
+
+- Docker Engine upgraded to [Docker 17.03.0 CE](https://github.com/docker/docker/blob/master/CHANGELOG.md)
 
 ### 1.13.1-beta18
 Release date: 02/16/2017