docker · johndmulhausen · Mar 2, 2017 · Jan 28, 2017 · Jan 30, 2017 · Jan 31, 2017
diff --git a/_data/docsarchive/docker-compose.yml b/_data/docsarchive/docker-compose.yml
@@ -1,36 +1,36 @@
-v1.4:
-  image: docs/docker.github.io:v1.4
+v1.12:
+  image: docs/docker.github.io:v1.12
   ports:
-    - "4014:4000"
-v1.5:
-  image: docs/docker.github.io:v1.5
+    - "4112:4000"
+v1.11:
+  image: docs/docker.github.io:v1.11
   ports:
-    - "4015:4000"
-v1.6:
-  image: docs/docker.github.io:v1.6
+    - "4111:4000"
+v1.10:
+  image: docs/docker.github.io:v1.10
   ports:
-    - "4016:4000"
-v1.7:
-  image: docs/docker.github.io:v1.7
+    - "4110:4000"
+v1.9:
+  image: docs/docker.github.io:v1.9
   ports:
-    - "4017:4000"
+    - "4019:4000"
 v1.8:
   image: docs/docker.github.io:v1.8
   ports:
     - "4018:4000"
-v1.9:
-  image: docs/docker.github.io:v1.9
+v1.7:
+  image: docs/docker.github.io:v1.7
   ports:
-    - "4019:4000"
-v1.10:
-  image: docs/docker.github.io:v1.10
+    - "4017:4000"
+v1.6:
+  image: docs/docker.github.io:v1.6
   ports:
-    - "4110:4000"
-v1.11:
-  image: docs/docker.github.io:v1.11
+    - "4016:4000"
+v1.5:
+  image: docs/docker.github.io:v1.5
   ports:
-    - "4111:4000"
-v1.12:
-  image: docs/docker.github.io:v1.12
+    - "4015:4000"
+v1.4:
+  image: docs/docker.github.io:v1.4
   ports:
-    - "4112:4000"
+    - "4014:4000"
diff --git a/_data/toc.yaml b/_data/toc.yaml
@@ -19,7 +19,7 @@ guides:
 - sectiontitle: Get Docker
   section:
   - path: /engine/installation/
-    title: Install Docker Engine
+    title: Install Docker
   - path: /docker-for-mac/install/
     title: Docker for Mac
   - path: /docker-for-windows/install/
@@ -35,11 +35,11 @@ guides:
     - path: /engine/installation/linux/fedora/
       title: Fedora
     - path: /engine/installation/linux/debian/
-      title: Debian or Raspbian
+      title: Debian
     - path: /engine/installation/linux/oracle/
       title: Oracle Linux
     - path: /engine/installation/linux/suse/
-      title: OpenSuSE and SuSE Linux Enterprise
+      title: SuSE Linux Enterprise
     - path: /engine/installation/linux/other/
       title: Other Linux distributions
     - path: /engine/installation/binaries/
@@ -446,28 +446,8 @@ guides:
     title: Where to chat or get help
   - path: /opensource/doc-style/
     title: Style guide for Docker documentation
-- sectiontitle: Docs archive
-  section:
-  - path: /docsarchive/
-    title: View the docs archives
-  - path: /v1.4
-    title: v1.4
-  - path: /v1.5
-    title: v1.5
-  - path: /v1.6
-    title: v1.6
-  - path: /v1.7
-    title: v1.7
-  - path: /v1.8
-    title: v1.8
-  - path: /v1.9
-    title: v1.9
-  - path: /v1.10
-    title: v1.10
-  - path: /v1.11
-    title: v1.11
-  - path: /v1.12
-    title: v1.12
+- path: /docsarchive/
+  title: View the docs archives
 
 reference:
 - title: Dockerfile reference
@@ -889,6 +869,13 @@ samples:
     title: WordPress
 
 manuals:
+- sectiontitle: Docker Enterprise Edition
+  section:
+  - path: /enterprise/
+    title: About Docker EE
+  - path: /engine/installation/
+    title: Install Docker EE
+    nosync: true
 - sectiontitle: Commercially Supported Docker Engine
   section:
   - sectiontitle: 1.13

diff --git a/_includes/d4a_buttons.md b/_includes/d4a_buttons.md
@@ -1,26 +1,28 @@
-{% 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>
-{% endcapture %}
+{% assign d4a_stable = "CE-Stable-1" %}
+{% assign d4a_edge = "CE-Edge-1" %}
+{% assign edition_version = "17.03.0-ce" %}
+
+
 {% 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="{{ d4a_stable }}" target="blank">Deploy Docker Community Edition (CE) 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="{{ d4a_edge }}" target="blank">Deploy Docker Community Edition (CE) 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="{{ d4a_stable }}" target="blank">Deploy Docker Community Edition (CE) 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="{{ d4a_edge }}" target="blank">Deploy Docker Community Edition (CE) 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="{{ d4a_stable }}" target="blank">Deploy Docker Community Edition (CE) 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="{{ d4a_edge }}" target="blank">Deploy Docker Community Edition (CE) 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>
-{% endcapture %}
-
diff --git a/_includes/docker_platform_matrix.md b/_includes/docker_platform_matrix.md
@@ -0,0 +1,17 @@
+{% capture green-check %}![yes](/engine/installation/images/green-check.svg){: style="height: 14px"}{% endcapture %}
+
+| Platform                                                                             | Docker EE         | Docker CE         |
+|:-------------------------------------------------------------------------------------|:-----------------:|:-----------------:|
+| [Ubuntu](linux/ubuntulinux.md)                                                       | {{ green-check }} | {{ green-check }} |
+| [Debian](linux/debian.md)                                                            |                   | {{ green-check }} |
+| [Red Hat Enterprise Linux](linux/rhel.md)                                            | {{ green-check }} |                   |
+| [CentOS](linux/centos.md)                                                            | {{ green-check }} | {{ green-check }} |
+| [Fedora](linux/fedora.md)                                                            |                   | {{ green-check }} |
+| [Oracle Linux](linux/oracle.md)                                                      | {{ green-check }} |                   |
+| [SUSE Linux Enterprise Server](linux/suse.md)                                        | {{ green-check }} |                   |
+| [Microsoft Windows Server 2016](https://docs.microsoft.com/en-us/virtualization/windowscontainers/quick-start/quick-start-windows-server){: target="_blank" class="_" } | {{ green-check }} |                   |
+| [Microsoft Windows 10](/docker-for-windows/))                                        |                   | {{ green-check }} |
+| [macOS](/docker-for-mac/)                                                            |                   | {{ green-check }} |
+| [Microsoft Azure](/docker-cloud/infrastructure/link-aws.md)                          | {{ green-check }} | {{ green-check }} |
+| [Amazon Web Services](/docker-cloud/infrastructure/link-aws.md)                      | {{ green-check }} | {{ green-check }} |
+{: style="width: 75%" }
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -0,0 +1,111 @@
+
+  <div class="newsletter_section">
+      <div class="container">
+        <!-- newsletter
+          <div class="col-md-8">
+              <form class="form-inline">
+                  <div class="form-group">
+                      <input type="email" class="form-control input" placeholder="email address">
+                      <button type="submit" class="button outline-btn newsletter">Submit</button>
+                  </div>
+              </form>
+          </div>-->
+      </div>
+  </div>
+    <div class="container">
+        <div class="top_footer">
+            <div class="row">
+                <div class="col-xs-12 col-sm-3 col-md-2">
+                    <ul class="footer_links">
+                        <li><a href="https://www.docker.com/what-docker">What is Docker</a></li>
+                        <li><a href="https://www.docker.com/what-container">What is a Container</a></li>
+                        <li><a href="https://www.docker.com/use-cases">Use Cases</a></li>
+                        <li><a href="https://www.docker.com/customers">Customers</a></li>
+                        <li><a href="https://www.docker.com/partners/partner-program">Partners</a></li>
+                        <li class="break"><a href="https://www.docker.com/industry-government">For Government</a></li>
+                        <li><a href="https://www.docker.com/company">About Docker</a></li>
+                        <li><a href="https://www.docker.com/company/management">Management</a></li>
+                        <li><a href="https://www.docker.com/company/news-and-press">Press &amp; News</a></li>
+                        <li><a href="https://www.docker.com/careers">Careers</a></li>
+                    </ul>
+                </div>
+                <div class="col-xs-12 col-sm-3 col-md-2">
+                    <ul class="footer_links">
+                        <li><a href="https://www.docker.com/products/overview">Product</a></li>
+                        <li><a href="https://www.docker.com/pricing">Pricing</a></li>
+                        <li><a href="https://www.docker.com/docker-community">Community Edition</a></li>
+                        <li class="break"><a href="https://www.docker.com/enterprise">Enterprise Edition </a></li>
+                        <li><a href="https://www.docker.com/products/docker-datacenter">Docker Datacenter</a></li>
+                        <li><a href="https://cloud.docker.com/">Docker Cloud</a></li>
+                        <li><a href="https://store.docker.com/">Docker Store</a></li>
+                    </ul>
+                </div>
+                <div class="col-xs-12 col-sm-3 col-md-3">
+                    <ul class="footer_links">
+                        <li><a href="https://www.docker.com/docker-mac">Docker for Mac </a></li>
+                        <li class="break"><a href="https://www.docker.com/docker-windows">Docker for Windows(PC)</a></li>
+                        <li><a href="https://www.docker.com/docker-aws" class="web30">Docker for AWS</a></li>
+                        <li class="break"><a href="https://www.docker.com/docker-microsoft-azure">Docker for Azure</a></li>
+                        <li><a href="https://www.docker.com/docker-windows-server">Docker for Windows Server</a></li>
+                        <li><a href="https://www.docker.com/docker-centos">Docker for CentOS distribution</a></li>
+                        <li><a href="https://www.docker.com/docker-debian">Docker for Debian</a></li>
+                        <li><a href="https://www.docker.com/docker-fedora">Docker for Fedora&#x00AE</a></li>
+                        <li><a href="https://www.docker.com/docker-oracle-linux">Docker for Oracle Enterprise Linux</a></li>
+                        <li><a href="https://www.docker.com/docker-rhel">Docker for RHEL</a></li>
+                        <li><a href="https://www.docker.com/docker-sles">Docker for SLES</a></li>
+                        <li><a href="https://www.docker.com//docker-ubuntu">Docker for Ubuntu</a></li>
+                    </ul>
+                </div>
+                <div class="col-xs-12 col-sm-3 col-md-2">
+                    <ul class="footer_links">
+                        <li><a href="https://docs.docker.com/">Documentation</a></li>
+                        <li><a href="https://www.docker.com/docker">Learn</a></li>
+                        <li><a href="https://blog.docker.com" target="_blank">Blog</a></li>
+                        <li><a href="https://training.docker.com/" target="_blank">Training</a></li>
+                        <li><a href="https://www.docker.com/docker-support-services">Support</a></li>
+                        <li><a href="https://success.docker.com/kbase">Knowledge Base</a></li>
+                        <li><a href="https://www.docker.com/products/resources">Resources</a></li>
+                    </ul>
+                </div>
+                <div class="col-xs-12 col-sm-3 col-md-2">
+                    <ul class="footer_links">
+                        <li><a href="https://www.docker.com/docker-community">Community</a></li>
+                        <li><a href="https://www.docker.com/technologies/overview">Open Source</a></li>
+                        <li><a href="https://www.docker.com/community/events">Events</a></li>
+                        <li><a href="https://forums.docker.com/" target="_blank">Forums</a></li>
+                        <li><a href="https://www.docker.com/community/docker-captains">Docker Captians</a></li>
+                        <li><a href="https://www.docker.com/docker-community/scholarships">Scholarships</a></li>
+                        <li><a href="https://blog.docker.com/curated/">Community News</a></li>
+                    </ul>
+                </div>
+            </div>
+            <div class="footer-nav">
+                <nav class="footer_sub_nav">
+                    <ul class="menu">
+                        <li><a href="http://status.docker.com/">Status</a></li>
+                        <li><a href="https://www.docker.com/docker-security">Security</a></li>
+                        <li><a href="https://www.docker.com/legal">Legal</a></li>
+                        <li><a href="https://www.docker.com/company/contact">Contact</a></li>
+                    </ul>
+                </nav>
+            </div>
+        </div>
+        <div class="bottom_footer">
+            <div class="footer-copyright">
+                <p class="copyright">
+                    Copyright © 2017 Docker Inc. All rights reserved. </p>
+            </div>
+            <div class="footer_social_nav">
+                <ul class="nav-social">
+                    <li class="fa fa-twitter"><a href="http://twitter.com/docker">Twitter</a></li>
+                    <li class="fa fa-youtube"><a href="http://www.youtube.com/user/dockerrun">Youtube</a></li>
+                    <li class="fa fa-google-plus"><a href="https://plus.google.com/u/0/communities/108146856671494713993">Google</a></li>
+                    <li class="fa fa-github"><a href="https://github.com/docker/docker">Github</a></li>
+                    <li class="fa fa-linkedin"><a href="https://www.linkedin.com/company/docker">Linkedin</a></li>
+                    <li class="fa fa-facebook"><a href="https://www.facebook.com/docker.run">Facebook</a></li>
+                    <li class="fa fa-reddit"><a href="http://www.reddit.com/r/docker">Reddit</a></li>
+                    <li class="fa fa-slideshare"><a href="http://www.slideshare.net/docker">Slideshare</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>