Merge pull request #2907 from akimd/faq

Template: reorganize a bit

.github/ISSUE_TEMPLATE.md

@@ -6,6 +6,7 @@ Issues unrelated to Docker for Mac will be closed.  In particular, see
   - https://github.com/docker/compose/issues for docker-compose
   - https://github.com/docker/machine/issues for docker-machine
   - https://github.com/moby/moby/issues for Docker daemon
+  - https://github.com/docker/docker.github.io/issues for the documentation
 -->
 
 
@@ -14,9 +15,8 @@ Replace `- [ ]` with `- [x]`, or click after having submitted the issue.
 -->
 
   - [ ] I have tried with the latest version of my channel (Stable or Edge)
-  - [ ] I have submitted Diagnostics
-  - [ ] I have included the Diagnostics ID in this Issue
-  - macOS Version:
+  - [ ] I have uploaded Diagnostics
+  - Diagnostics ID:
 
 ### Expected behavior
 
@@ -25,21 +25,24 @@ Replace `- [ ]` with `- [x]`, or click after having submitted the issue.
 ### Information
 <!--
 Please, help us understand the problem.  For instance:
-- Have you tried several times?
-- Is the problem new?
-- Did the problem appear with an update?
+  - Is it reproducible?
+  - Is the problem new?
+  - Did the problem appear with an update?
+  - A reproducible case if this is a bug, Dockerfiles FTW.
+-->
+  - macOS Version:
 
-<!--  - Full output of the diagnostics from "Diagnose & Feedback" in the menu ... -->
+### Diagnostic logs
+<!-- Full output of the diagnostics from "Diagnose & Feedback" in the menu ... -->
 ```
 Docker for Mac: version...
 
 ```
-<!--
-  - A reproducible case if this is a bug, Dockerfiles FTW
-  - Page URL if this is a docs issue or the name of a man page
-  -->
 
 ### Steps to reproduce the behavior
+<!--
+A reproducible case, Dockerfiles FTW.
+-->
 
   1. ...
   2. ...