Merge pull request #1303 from londoncalling/voting-app-sample-updates

updated tutorial tables, added links to 1.13.0 blog post

engine/getstarted-voting-app/customize-app.md

@@ -69,6 +69,10 @@ did not change.
 
 ## Resources
 
+* [Introducing Docker 1.13.0](https://blog.docker.com/2017/01/whats-new-in-docker-1-13/) blog post
+from [Docker Core Engineering](https://blog.docker.com/author/core_eng/)
+
+
 * A deeper dive voting app walkthrough is available on
 [Docker Labs](https://github.com/docker/labs/) as [Deploying an app to a Swarm](https://github.com/docker/labs/blob/master/beginner/chapters/votingapp.md).
 The lab walkthrough provides more technical detail on deployment configuration,

engine/getstarted-voting-app/index.md

@@ -8,9 +8,9 @@ This example is built around a web-based voting application that collects,
 tallies, and returns the results of votes (for cats and dogs, or other choices
 you specify). The voting app includes several services, each one running in its
 own container. We'll deploy the app as a _stack_ to introduce some new concepts
-surfaced in [Compose Version 3](/compose/compose-file.md), and also use [swarm
-mode](/engine/swarm/index.md), which is cluster management and orchestration
-capability built into Docker Engine.
+surfaced in [Compose Version 3](/compose/compose-file.md#version-3), and also
+use [swarm mode](/engine/swarm/index.md), which is cluster management and
+orchestration capability built into Docker Engine.
 
 ## Got Docker?
 
@@ -255,12 +255,11 @@ as Docker stacks and services.
 
 ### Compose file reference
 
-For more on what's new in Compose Version 3 and how to upgrade, see these topics
-in the [Compose file reference](/compose/compose-file.md):
+For more on what's new in Compose Version 3:
 
-* [Versioning](/compose/compose-file.md#versioning)
-* [Version 3](/compose/compose-file.md#version-3)
-* [Upgrading](/compose/compose-file.md#upgrading)
+* [Introducing Docker 1.13.0](https://blog.docker.com/2017/01/whats-new-in-docker-1-13/) blog post from [Docker Core Engineering](https://blog.docker.com/author/core_eng/)
+
+* [Versioning](/compose/compose-file.md#versioning), [Version 3](/compose/compose-file.md#version-3), and  [Upgrading](/compose/compose-file.md#upgrading) in [Compose file reference](/compose/compose-file.md)
 
 ## What's next?
 

index.md

@@ -8,27 +8,42 @@ title: Docker Documentation
 Docker packages your app with its dependencies, freeing you from worrying about your
 system configuration, and making your app more portable.
 
-<table><tr><td width="50%">
+<table>
+<tr valign="top">
+<td width="50%">
 {% capture basics %}
 ## Learn the basics of Docker
 
-The basic tutorial teaches you about how to build, push, and pull Docker images,
-and run them as containers. This tutorial stops short of teaching you how to
-deploy applications.
-
-[Start the basic tutorial](/engine/getstarted/){: class="button darkblue-btn"}
+The basic tutorial introduces Docker concepts, tools, and commands. The examples show you how to build, push,
+and pull Docker images, and run them as containers. This
+tutorial stops short of teaching you how to deploy applications.
 {% endcapture %}{{ basics | markdownify }}
-</td><td width="50%">
+</td>
+<td width="50%">
+
 {% capture apps %}
 ## Define and deploy applications
 
-The application tutorial teaches you how to relate containers to each other and
-define them as part of an application that is ready to deploy at scale in a
-production environment.
+The define-and-deploy tutorial shows how to relate
+containers to each other and define them as services in an application that is ready to deploy at scale in a
+production environment. Highlights [Compose Version 3 new features](/engine/getstarted-voting-app/index.md#compose-version-3-features-and-compatibility) and swarm mode.
+{% endcapture %}{{ apps | markdownify }}
 
+</td></tr>
+
+<tr valign="top">
+<td width="50%">
+{% capture basics %}
+[Start the basic tutorial](/engine/getstarted/){: class="button darkblue-btn"}
+{% endcapture %}{{ basics | markdownify }}
+</td>
+<td width="50%">
+{% capture apps %}
 [Start the application tutorial](/engine/getstarted-voting-app/){: class="button darkblue-btn"}
 {% endcapture %}{{ apps | markdownify }}
-</td></tr></table>
+</td>
+</tr>
+</table>
 
 {% include content/typical_docker_workflow.md %}
 

learn.md

@@ -7,24 +7,39 @@ redirect_from:
 In this section, you can explore various ways to get up to speed on
 Docker workflows.
 
-<table><tr><td width="50%">
+<table>
+<tr valign="top">
+<td width="50%">
 {% capture basics %}
 ## Learn the basics of Docker
 
-The basic tutorial teaches you about how to build, push, and pull Docker images,
-and run them as containers. This tutorial stops short of teaching you how to
-deploy applications.
-
-[Start the basic tutorial](/engine/getstarted/){: class="button darkblue-btn"}
+The basic tutorial introduces Docker concepts, tools, and commands. The examples show you how to build, push,
+and pull Docker images, and run them as containers. This
+tutorial stops short of teaching you how to deploy applications.
 {% endcapture %}{{ basics | markdownify }}
-</td><td width="50%">
+</td>
+<td width="50%">
+
 {% capture apps %}
 ## Define and deploy applications
 
-The application tutorial teaches you how to relate containers to each other and
-define them as part of an application that is ready to deploy at scale in a
-production environment.
+The define-and-deploy tutorial shows how to relate
+containers to each other and define them as services in an application that is ready to deploy at scale in a
+production environment. Highlights [Compose Version 3 new features](/engine/getstarted-voting-app/index.md#compose-version-3-features-and-compatibility) and swarm mode.
+{% endcapture %}{{ apps | markdownify }}
 
+</td></tr>
+
+<tr valign="top">
+<td width="50%">
+{% capture basics %}
+[Start the basic tutorial](/engine/getstarted/){: class="button darkblue-btn"}
+{% endcapture %}{{ basics | markdownify }}
+</td>
+<td width="50%">
+{% capture apps %}
 [Start the application tutorial](/engine/getstarted-voting-app/){: class="button darkblue-btn"}
 {% endcapture %}{{ apps | markdownify }}
-</td></tr></table>
+</td>
+</tr>
+</table>