Merge pull request docker#1005 from londoncalling/d4mac-win-improve-i…

…ntro

update d4mac, d4win intros, add better feedback topics

docker-for-mac/index.md

@@ -13,21 +13,20 @@ title: Get started with Docker for Mac
 
 Welcome to Docker for Mac!
 
-Please read through these topics on how to get started. To **give us feedback**
-on your experience with the app and report bugs or problems, log in to our
-[Docker for Mac forum](https://forums.docker.com/c/docker-for-mac).
+Docker is a full development platform for creating containerized apps, and
+Docker for Mac is the best way to get started with Docker on a Mac.
 
->**Already have Docker for Mac?** If you already have Docker for Mac installed,
-and are ready to get started, skip over to the [Getting Started with
-Docker](/engine/getstarted/index.md) tutorial.
+>**Already have Docker for Mac?** If you already have Docker for Mac installed, and are ready to get started, skip down to [Step 2. Check versions of Docker
+Engine, Compose, and
+Machine](#step-2-check-versions-of-docker-engine-compose-and-machine) to work
+through the rest of the Docker for Mac tour, or jump over to the standard
+[Getting Started with Docker](/engine/getstarted/index.md) tutorial.
 
 ## Download Docker for Mac
 
 If you have not already done so, please install Docker for Mac. You can download
-installers from the stable or beta channel.
-
-For more about stable and beta channels, see the
-[FAQs](faqs.md#stable-and-beta-channels).
+installers from the stable or beta channel. For more about stable and beta
+channels, see the [FAQs](faqs.md#stable-and-beta-channels).
 
 <table style="width:100%">
   <tr>
@@ -379,6 +378,23 @@ ln -s /Applications/Docker.app/Contents/Resources/etc/docker-machine.bash-comple
 ln -s /Applications/Docker.app/Contents/Resources/etc/docker-compose.bash-completion /usr/local/etc/bash_completion.d/docker-compose
 ```
 
+## Giving feedback and getting help
+
+To get help from the community, review current user topics, join or start a
+discussion, log on to our [Docker for Mac
+forum](https://forums.docker.com/c/docker-for-mac).
+
+To report bugs or problems, log on to [Docker for Mac issues on
+GitHub](https://github.com/docker/for-mac/issues), where you can review
+community reported issues, and file new ones. See [Diagnose problems, send
+feedback, and create GitHub
+issues](troubleshoot.md#diagnose-problems-send-feedback-and-create-github-issues).
+As a part of reporting issues on GitHub, we can help you troubleshoot the log
+data.
+
+To give us feedback on the documentation or update it yourself, use the Feedback
+options at the bottom of each docs page.
+
 ## Where to go next
 
 * Try out the [Getting Started with Docker](/engine/getstarted/index.md) tutorial.

docker-for-windows/index.md

@@ -10,16 +10,23 @@ redirect_from:
 - /installation/windows/
 title: Get started with Docker for Windows
 ---
-
 Welcome to Docker for Windows!
 
-Please read through these topics on how to get started. To **give us your feedback** on your experience with the app and report bugs or problems, log in to our [Docker for Windows forum](https://forums.docker.com/c/docker-for-windows).
+Docker is a full development platform for creating containerized apps, and
+Docker for Windows is the best way to get started with Docker on Windows
+systems.
 
->**Already have Docker for Windows?** If you already have Docker for Windows installed, and are ready to get started, skip over to the [Getting Started with Docker](/engine/getstarted/index.md) tutorial.
+>**Already have Docker for Windows?** If you already have Docker for Windows installed, and are ready to get started, skip down to [Step 3. Check versions of
+Docker Engine, Compose, and
+Machine](#step-3-check-versions-of-docker-engine-compose-and-machine) to work
+through the rest of the Docker for Windows tour, or jump over to the standard
+[Getting Started with Docker](/engine/getstarted/index.md) tutorial.
 
 ## Download Docker for Windows
 
-If you have not already done so, please install Docker for Windows. You can download installers from the stable or beta channel.  For more about stable and beta channels, see the [FAQs](faqs.md#questions-about-stable-and-beta-channels).
+If you have not already done so, please install Docker for Windows. You can
+download installers from the stable or beta channel.  For more about stable and
+beta channels, see the [FAQs](faqs.md#questions-about-stable-and-beta-channels).
 
 <table style="width:100%">
   <tr>
@@ -628,6 +635,22 @@ because they do not apply to Windows containers:
   * [Network](#network)
   * [Advanced (CPU and Memory configuration)](#advanced)
 
+
+### Giving feedback and getting help
+
+To get help from the community, review current user topics, join or start a
+discussion, log on to our [Docker for Windows
+forum](https://forums.docker.com/c/docker-for-windows).
+
+To report bugs or problems, log on to [Docker for Windows issues on
+GitHub](https://github.com/docker/for-win/issues), where you can review
+community reported issues, and file new ones. As a part of reporting issues on
+GitHub, we can help you troubleshoot the log data. See the [Diagnose and
+Feedback](#diagnose-and-feedback) topic below.
+
+To give feedback on the documentation or update it yourself, use the Feedback
+options at the bottom of each docs page.
+
 ### Diagnose and Feedback
 
 If you encounter problems for which you do not find solutions in this documentation, searching [Docker for Windows issues on GitHub](https://github.com/docker/for-win/issues) already filed by other users, or on the [Docker for Windows forum](https://forums.docker.com/c/docker-for-windows), we can help you troubleshoot the log data.

engine/getstarted/last_page.md

@@ -52,4 +52,8 @@ Depending on your interest, the Docker documentation contains a wealth of inform
     <td class="tg-031e">How to run a multi-container application with Compose</td>
     <td class="tg-031e"><a href="/compose/">Docker Compose documentation</a></td>
   </tr>
-</table>
+  <tr>
+    <td class="tg-031e">A tutorial on Docker Swarm, which provides clustering capabilities to scale applications across multiple Docker nodes </td>
+    <td class="tg-031e"><a href="/engine/swarm/swarm-tutorial/index.md">Getting started with swarm mode</a></td>
+  </tr>
+</table>