Merge pull request #1041 from usha-mandya/desktop-ent-review

Add OS support statement and fix pending review comments

Author: usha-mandya

ee/desktop/admin/install/mac.md

@@ -18,6 +18,8 @@ This page contains information about the system requirements and specific instru
 
 - VirtualBox prior to version 4.3.30 must NOT be installed (it is incompatible with Docker for Mac). If you have a newer version of VirtualBox installed, it’s fine.
 
+> **Note:** Docker supports Docker Desktop Enterprise on the most recent versions of macOS. That is, the current release of macOS and the previous two releases. As new major versions of macOS are made generally available, Docker will stop supporting the oldest version and support the newest version of macOS (in addition to the previous two releases).
+
 # Installation
 
 Download Docker Desktop Enterprise for [**Mac**](https://download.docker.com/mac/enterprise/Docker.pkg). The DDE installer includes Docker Engine, Docker CLI client, and Docker Compose.

ee/desktop/admin/install/windows.md

@@ -26,6 +26,8 @@ Hyper-V on Windows 10:
 
 ![Virtualization Technology (VTx) must be enabled in BIOS settings](../../images/windows-prereq.png "BIOS setting information for hardware virtualization support")
 
+> **Note:** Docker supports Docker Desktop Enterprise on Windows based on Microsoft’s support lifecycle for Windows 10 operating system. For more information, see the [Windows lifecycle fact sheet](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet).
+
 # Installation
 
 Download Docker Desktop Enterprise for [**Windows**](https://download.docker.com/win/enterprise/DockerDesktop.msi).
@@ -50,15 +52,14 @@ Docker Desktop Enterprise requires the following firewall exceptions. If you do
 
 - The process `com.docker.vpnkit` proxies all outgoing container TCP and
     UDP traffic. This includes Docker image downloading but not DNS
-    resolution, which is performed over a Unix domain socket connected
-    to the `mDNSResponder` system service.
+    resolution, which is performed over a loopback TCP and UDP connection
+    to the main application.
 
 - The process `com.docker.vpnkit` binds external ports on behalf of
     containers. For example, `docker run -p 80:80 nginx` binds port 80 on all
     interfaces.
 
-- If using Kubernetes, the API server is exposed with TLS on
-    `127.0.0.1:6443` by `com.docker.vpnkit`.
+- If using Kubernetes, the API server is exposed with TLS on `127.0.0.1:6445` by `com.docker.vpnkit`.
 
 # Version packs
 

ee/desktop/images/console.png

@@ -9,8 +9,8 @@ current release. The documentation is updated for each release.
 
 For information on system requirements, installation, and download, see:
 
-- [Install Docker Desktop Enterprise on Mac](/ee/desktop/install/mac)
-- [Install Docker Desktop Enterprise on Windows](/ee/desktop/install/windows)
+- [Install Docker Desktop Enterprise on Mac](/ee/desktop/admin/install/mac)
+- [Install Docker Desktop Enterprise on Windows](/ee/desktop/admin/install/windows)
 
 For Docker Enterprise Engine release notes, see [Docker Engine release notes](/engine/release-notes).
 

ee/desktop/images/win-ver-select.PNG

@@ -4,11 +4,11 @@ description: Troubleshoot Mac issues
 keywords: Troubleshoot, diagnose, mac, issues, Docker Enterprise, Docker Desktop, Enterprise
 ---
 
-This page contains information on how to diagnose Docker Desktop Enterprise (DDE) issues on Mac, send feedback, and submit the issues to Docker Support.
+This page contains information on how to diagnose Docker Desktop Enterprise (DDE) issues on Mac.
 
 # Creating a diagnostics file in Docker Desktop Enterprise
 
-Select **Diagnose and Feedback** from the whale menu in the menu bar.
+Select **Diagnose and Feedback** from the Docker menu in the menu bar.
 
 ![A diagnostics file is created.](../images/diagnose-mac.png)
 
@@ -18,17 +18,21 @@ Diagnostics are provided in .zip files identified by date and time. The uncompre
 
 ## Creating a diagnostics file from a terminal
 
-On occasion, it is useful to run diagnostics yourself, for instance if Docker Desktop Enterprise cannot start.
+In some cases, it is useful to run diagnostics yourself, for instance if Docker Desktop Enterprise cannot start.
+
+To run diagnostics from a terminal, enter the following command:
 
-To run diagnostics from a terminal, enter the following command :
 ```
 /Applications/Docker.app/Contents/MacOS/com.docker.diagnose gather
 ```
+
 This command displays the information that it is gathering, and when it finishes, it displays information resembling the following example:
+
 ```
 Diagnostics Bundle: /tmp/2A989798-1658-4BF0-934D-AC4F148D0782/20190115142942.zip
 Diagnostics ID:     2A989798-1658-4BF0-934D-AC4F148D0782/20190115142942
 ```
+
 The name of the diagnostics file is displayed next to “Diagnostics Bundle” (`/tmp/2A989798-1658-4BF0-934D-AC4F148D0782/20190115142942.zip` in this example). This is the file that you attach to the support ticket.
 
 You can view the content of your diagnostics file using the **open** command and specifying the name of your diagnostics file:
@@ -59,8 +63,7 @@ $ /usr/bin/log show --debug --info --style syslog --last 1d --predicate "$pred"
 
 ## Viewing logs with the Console app
 
-The Console log viewer is located in `/Applications/Utilities`; you can search for it with
-Spotlight Search.
+The Console log viewer is located in `/Applications/Utilities`; you can search for it with Spotlight Search.
 
 In the Console window search bar, type
 `docker` and press Enter. Then select **ANY** to expand the drop-down list next to your 'docker' search entry, and select **Process**.

ee/desktop/images/win-vp-list.PNG

@@ -4,7 +4,7 @@ description: Learn about Docker Desktop Enterprise
 keywords: Docker EE, Windows, Docker Desktop, Enterprise, troubleshoot
 ---
 
-This page contains information on how to diagnose Docker Desktop Enterprise (DDE) issues on Windows, send feedback, and submit the issues to Docker Support.
+This page contains information on how to diagnose Docker Desktop Enterprise (DDE) issues on Windows.
 
 # Creating a diagnostics file in Docker Desktop Enterprise
 
@@ -34,7 +34,7 @@ Diagnostics Bundle: C:\Users\djs\AppData\Local\Temp\6CE654F6-7B17-4FC7-AAE0-CC53
 Diagnostics ID: 6CE654F6-7B17-4FC7-AAE0-CC53B73B76A2/20190115163621
 ```
 
-The name of the diagnostics file is displayed next to “Diagnostics Bundle” (C:\Users\djs\AppData\Local\Temp\6CE654F6-7B17-4FC7-AAE0-CC53B73B76A2\20190115163621.zip in this example). This is the file that you attach to the support ticket.
+The name of the diagnostics file is displayed next to “Diagnostics Bundle”  (`\Temp\6CE654F6-7B17-4FC7-AAE0-CC53B73B76A2\20190115163621.zip` in this example). This is the file that you attach to the support ticket.
 
 ## Additional Docker Desktop Enterprise troubleshooting topics
 

ee/desktop/release-notes.md

@@ -59,15 +59,25 @@ $ docker image ls
 $ docker image rm nginx
 ```
 
-# Docker Desktop Enterprise preferences
+# Docker Desktop user interface
+
+The Docker Desktop Enterprise user interface provides options to configure Docker Desktop preferences such as installation, version packs, Docker Hub login, and more. Right-click the Docker icon from the menu bar to open the Docker Desktop user interface.
+
+## Version Selection
+
+The **Version Selection** option lists the version packs installed on your Docker Desktop environment and allows you to switch between Docker Engine and Kubernetes versions using a single click. When you select a different version pack, Docker Desktop restarts and the selected versions of Docker Engine and Kubernetes will be used.
+
+To switch to a different version pack, simply click on the version pack you would like to use.
+
+## Preferences
 
 Click on the Docker icon from the menu bar and then **Preferences** to configure the runtime options described below.
 
 > **Note:** Administrators have the ability to lock some configuration options. Locked options cannot be selected, and are displayed with a lock icon.
 
 ![Docker context menu](../images/prefs.png)
 
-## General
+### General
 
 ![Preferences](../images/./prefs-general.png)
 
@@ -84,7 +94,7 @@ General settings include:
   data to Docker. This information helps Docker improve the application and get
   more context for troubleshooting problems. (Enabled by default)
 
-## File Sharing
+### File Sharing
 
 Choose which local directories to share with your containers. File sharing is
 required for volume mounting if the project lives outside of the `/Users`
@@ -112,7 +122,7 @@ For more information, see:
 
 - [Volume mounting requires file sharing for any project directories outside of `/Users`](https://docs.docker.com/docker-for-mac/troubleshoot/#volume-mounting-requires-file-sharing-for-any-project-directories-outside-of-users).
 
-## Disk
+### Disk
 
 Specify the **Disk image location** of the Linux volume, where containers and
 images are stored.
@@ -123,7 +133,7 @@ the existing image or replace it.
 
 ![Disk settings](../images/prefs-disk.png)
 
-## Advanced
+### Advanced
 
 On the Advanced tab, you can limit resources available to Docker.
 
@@ -141,7 +151,7 @@ to a higher number; to decrease it, lower the number.
 
 - **Swap**: Configure swap file size as needed. The default is 1 GB.
 
-## Proxies
+### Proxies
 
 Docker Desktop Enterprise detects HTTP/HTTPS Proxy Settings from macOS and automatically
 propagates these to Docker and to your containers. For example, if you set your
@@ -172,7 +182,7 @@ Docker restarts automatically to pick up the new settings. If you have
 containers that you wish to keep running across restarts, you should consider
 using [restart policies](https://docs.docker.com/engine/reference/run/#restart-policies---restart).
 
-## Daemon
+### Daemon
 
 You can configure options on the Docker daemon that determine how your
 containers run.
@@ -182,7 +192,7 @@ Select **Basic** to configure the daemon with interactive settings, or select
 
 ![Daemon](../images/prefs-daemon-basic.png)
 
-### Experimental features
+#### Experimental features
 
 Docker Desktop Enterprise has experimental features enabled
 on Docker Engine, as described in [Docker Experimental Features](https://github.com/docker/cli/blob/master/experimental/README.md) Readme. If you don't select **Experimental Features**, Docker Desktop Enterprise uses the current generally available release of Docker Engine.
@@ -198,7 +208,7 @@ here. (If `false`, Experimental mode is off.)
 true
 ```
 
-### Insecure registries
+#### Insecure registries
 
 You can set up a custom and insecure [registry](https://docs.docker.com/registry/introduction) to store your public or private images (instead of
 using [Docker Hub](https://hub.docker.com/) or [Docker Trusted Registry](https://docs.docker.com/ee/dtr/). Add URLs for
@@ -210,7 +220,7 @@ For more information, see:
 
 - [How do I add client certificates?](https://docs.docker.com/docker-for-mac/faqs/#how-do-i-add-client-certificates)
 
-### Daemon configuration file
+#### Daemon configuration file
 
 Click the **Advanced** tab to configure the daemon from the JSON file. For a
 full list of options, see the Docker Engine [dockerd command line reference](https://docs.docker.com/engine/reference/commandline/dockerd).
@@ -221,7 +231,7 @@ changes when asked.
 
 ![Docker Daemon](../images/prefs-daemon-adv.png)
 
-## Kubernetes
+### Kubernetes
 
 Docker Desktop Enterprise includes a standalone Kubernetes server that runs on your Mac, so
 that you can test deploying your Docker workloads on Kubernetes.
@@ -262,12 +272,30 @@ Kubernetes containers are stopped and removed, and the
 
 For more information about using the Kubernetes integration with Docker Desktop Enterprise, see [Deploy on Kubernetes](https://docs.docker.com/docker-for-mac/kubernetes).
 
-## Reset
+### Reset
 
 Click on the Docker icon from the menu bar and then **Preferences**. Click **Reset** to reset to factory defaults, restart the Docker daemon, reset Kubernetes cluster, or to reset the disk image.
 
 ![Uninstall or reset Docker](../images/prefs-reset-mac.png)
 
+## Diagnose and Feedback
+
+The **Diagnose and Feedback** option allows you troubleshoot any issues you may be experiencing with Docker Desktop Enterprise. For more information, see [Troubleshoot DDE issues on mac](/troubleshoot/mac-issues).
+
+## Design new application
+
+Select this option to open the Application Designer user interface. Application Designer provides a library of application and service templates to help Docker developers quickly create new Docker applications. For more information, see [Application Designer](/app-designer).
+
+## Docker Hub
+
+Select **Sign in /Create Docker ID** from the Docker Desktop Enterprise menu to access your [Docker Hub](https://hub.docker.com/) account. Once logged in, select **Repositories**  on the Docker Desktop Enterprise menu to access your Docker Hub repositories directly.
+
+See the following [Docker Hub topics](https://docs.docker.com/docker-hub/) to learn more:
+
+- [Organizations and Teams in Docker Hub](https://docs.docker.com/docker-hub/orgs/)
+
+- [Builds and Images](https://docs.docker.com/docker-hub/official_images/)
+
 ## Add TLS certificates
 
 You can add trusted Certificate Authorities (CAs) (used to verify registry

ee/desktop/troubleshoot/mac-issues.md

@@ -436,7 +436,7 @@ The **Version Selection** option lists the version packs installed on your Docke
 
 To switch to a different version pack, simply click on the version pack you would like to use.
 
-![Version Selection](../images/win-ver-select.png)
+![Version Selection](../images/win-ver-select.PNG)
 
 ## Diagnose and Feedback