d4mac,win 17.06 edge release notes, docs updates (#3461)

* d4mac,win 17.06 edge release notes, docs updates

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added description of new feature shared drives on demand for Windows Edge

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

docker-for-mac/index.md

@@ -1,6 +1,6 @@
 ---
 description: Getting Started
-keywords: mac, beta, alpha, tutorial
+keywords: mac, beta, edge, alpha, tutorial
 redirect_from:
 - /mackit/
 - /mackit/getting-started/
@@ -11,6 +11,8 @@ redirect_from:
 - /engine/installation/mac/
 - /docker-for-mac/index/
 title: Get started with Docker for Mac
+toc_max: 4
+toc_min: 1
 ---
 
 Welcome to Docker for Mac!
@@ -18,7 +20,7 @@ Welcome to 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.
 
-> **Got Docker for Mac?** If you have not yet installed Docker for Mac, please see [Install Docker for Mac](install.md) for an explanation of stable and beta
+> **Got Docker for Mac?** If you have not yet installed Docker for Mac, please see [Install Docker for Mac](install.md) for an explanation of stable and edge
 channels, system requirements, and download/install information.
 
 >**Looking for system requirements?** Check out
@@ -131,6 +133,16 @@ You can set the following runtime options.
   Uncheck this to opt out and prevent auto-send of data. Docker may prompt for
   more information in some cases, even with auto-send enabled.
 
+#### Choose whether to store Docker credentials on Mac keychain (Edge feature)
+
+In current Edge releases, you have an additonal option to **Securely store
+Docker logins in MacOS keychain**. This is enabled by default, and on Stable
+releases you have no option to disable it. So the effect of this is that on Edge
+releases, you can "opt out" of storing your Docker login credentials by
+disabling this.
+
+![Opt in or out of storing credentials in keychain](images/settings-edge.png)
+
 ### File sharing
 
 You can decide which directories on your Mac to share with containers.
@@ -177,19 +189,18 @@ the total available memory on your Mac. You can increase the RAM on the app to
 get faster performance by setting this number higher (for example to `3`) or
 lower (to `1`) if you want Docker for Mac to use less memory.
 
-#### Storage location
+#### Disk image location (storage)
 
-You can specify the **storage location** of the Linux volume; i.e., where
+You can specify the **Disk image location** of the Linux volume; i.e., where
 containers and images are stored.
 
-##### Disk image location (Beta)
+You can move the disk image location.
 
-Starting with Beta 39, _storage image_ is referred to as _disk image_, and is tracked by the app.  If you attempt to move the disk image to a location that already has one, you will get a prompt asking if you want to use the existing image or replace it. For Beta releases going forward, the labels on this dialog were updated as follows.
+If you attempt to move the disk image to a location that
+already has one, you will get a prompt asking if you want to use the existing
+image or replace it.
 
-*  **Storage location** is renamed to **Disk image location**
+![Advanced settings](images/settings-advanced-beta.png)
-*  **Change location** button is renamed to **move disk image**
-
-![Beta Advanced settings](images/settings-advanced-beta.png)
 
 ### HTTP proxy settings
 
@@ -219,18 +230,18 @@ some of the common settings to make it easier to configure them.
 
 #### Experimental mode
 
-Starting with Stable 1.13.0 and Beta 31, both Docker for Mac Stable and Beta
+Both Docker for Mac Stable and Edge releases have experimental features enabled
-releases have experimental features enabled on Docker Engine, as described in
+on Docker Engine, as described in the [Docker Experimental Features
-the [Docker Experimental Features
+README](https://github.com/moby/moby/blob/master/experimental/README.md) on
-README](https://github.com/moby/moby/blob/master/experimental/README.md) on GitHub.
+GitHub.
 
 Experimental features are not appropriate for production environments or
 workloads. They are meant to be sandbox experiments for new ideas. Some
 experimental features may become incorporated into upcoming stable releases, but
-others may be modified or pulled from subsequent Betas, and never released
+others may be modified or pulled from subsequent Edge releases, and never
-on Stable.
+released on Stable.
 
-On both Beta and Stable releases, you can toggle **experimental mode** on and
+On both Edge and Stable releases, you can toggle **experimental mode** on and
 off. If you toggle it off, Docker for Mac uses the current generally available
 release of Docker Engine.
 
@@ -307,6 +318,18 @@ Docker uninstalled successfully. You can move the Docker application to the tras
 You might want to use the command-line uninstall if, for example, you find that
 the app is non-functional, and you cannot uninstall it from the menu.
 
+### Reset Docker data (Edge feature)
+
+In current Edge releases, you have an additonal reset option to **Remove all
+data**.
+
+This option removes/resets all Docker data _without_ a reset to factory defaults
+(which would cause you to lose settings). This is an update per Edge release
+17.06.0-rc1-ce-mac13, and fixes [Docker for Mac issue
+1309](https://github.com/docker/for-mac/issues/1309)).
+
+![Uninstall or reset Docker Edge features](images/settings-uninstall-edge.png)
+
 ## Installing bash completion
 
 If you are using

docker-for-mac/release-notes.md

@@ -355,6 +355,31 @@ events or unexpected unmounts.
 
 ## Edge Release Notes
 
+### Docker Community Edition 17.06.0-rc1-ce-mac13, 2017-06-01 (edge)
+
+**Upgrades**
+
+- [Docker 17.06.0-rc1-ce](https://github.com/docker/docker-ce/releases/tag/v17.06.0-ce-rc1)
+- [Docker Credential Helpers 0.5.1](https://github.com/docker/docker-credential-helpers/releases/tag/v0.5.1)
+- `qcow-tool` v0.10.0 (improve the performance of `compact`: `mirage/ocaml-qcow#94`)
+- OSX Yosemite 10.10 is marked as deprecated
+- Linux Kernel 4.9.30
+
+**New**
+
+- GUI Option to opt out of credential store
+- GUI option to reset docker data without losing all settings (fixes [Docker for Mac issue 1309](https://github.com/docker/for-mac/issues/1309))
+- Add an experimental DNS name for the host: `docker.for.mac.localhost`
+- Support for client (i.e. "login") certificates for authenticating registry access (fixes [Docker for Mac issue 1320](https://github.com/docker/for-mac/issues/1320))
+
+**Bug fixes and minor changes**
+
+- Resync HTTP(S) proxy settings on application start
+- Interpret system proxy setting of localhost correctly (see [Docker for Mac issue 1511](https://github.com/docker/for-mac/issues/1511))
+- All docker binaries bundled with Docker for Mac are now signed
+- Display all docker cloud organizations and repositories in the whale menu (fixes [Docker for Mac issue 1538 ](https://github.com/docker/for-mac/issues/1538))
+- OSXFS: improved latency for many common operations (e.g. read and write) by approximately 25%
+
 ### Docker Community Edition 17.05.0-ce-mac11, 2017-05-12 (edge)
 
 **Upgrades**
@@ -387,6 +412,7 @@ events or unexpected unmounts.
 ### Docker Community Edition 17.04.0-ce-mac7, 2017-04-06 (edge)
 
 **New**
+
 - osxfs: support for `cached` mount flag to improve performance of macOS mounts when strict consistency is not necessary
 
 **Upgrades**

docker-for-windows/index.md

@@ -1,6 +1,6 @@
 ---
 description: Getting Started
-keywords: windows, beta, alpha, tutorial
+keywords: windows, beta, edge, alpha, tutorial
 redirect_from:
 - /winkit/getting-started/
 - /winkit/
@@ -11,6 +11,8 @@ redirect_from:
 - /engine/installation/windows/
 - /docker-for-windows/index/
 title: Get started with Docker for Windows
+toc_max: 4
+toc_min: 1
 ---
 Welcome to Docker for Windows!
 
@@ -19,7 +21,7 @@ Docker for Windows is the best way to get started with Docker on Windows
 systems.
 
 > **Got Docker for Windows?** If you have not yet installed Docker for Windows, please see [Install Docker for Windows](install.md) for an explanation of stable
-and beta channels, system requirements, and download/install information.
+and edge channels, system requirements, and download/install information.
 
 >**Looking for system requirements?** Check out
 [What to know before you install](install.md#what-to-know-before-you-install), which has moved to the new install topic.
@@ -394,8 +396,8 @@ volumes](troubleshoot.md#permissions-errors-on-data-directories-for-shared-volum
 > in the FAQs.
 {: .note-vanilla}
 
-See also
+See also [Verify domain user has permissions for shared
-[Verify domain user has permissions for shared drives](troubleshoot.md#verify-domain-user-has-permissions-for-shared-drives-volumes)
+drives](troubleshoot.md#verify-domain-user-has-permissions-for-shared-drives-volumes)
 in Troubleshooting.
 
 #### Firewall rules for shared drives
@@ -403,16 +405,33 @@ in Troubleshooting.
 Shared drives require port 445 to be open between the host machine and the virtual
 machine that runs Linux containers.
 
-> **Note**: In Docker for Windows Beta 29 and higher,
+> **Note**: Docker detects if port 445 is closed and shows
-> Docker detects if port 445 is closed and shows the following message when you
+the following message when you try to add a shared drive: ![Port 445
-> try to add a shared drive:
+blocked](/docker-for-windows/images/drive_sharing_firewall_blocked.png)
-> ![Port 445 blocked](/docker-for-windows/images/drive_sharing_firewall_blocked.png)
-
 
 To share the drive, allow connections between the Windows host machine and the
 virtual machine in Windows Firewall or your third party firewall software. You
 do not need to open port 445 on any other network. By default, allow connections
-to 10.0.75.1 port 445 (the Windows host) from 10.0.75.2 (the virtual machine). If the firewall rules appear to be open, consider [reinstalling the File and Print Sharing service on the virtual network adapter.](http://stackoverflow.com/questions/42203488/settings-to-windows-firewall-to-allow-docker-for-windows-to-share-drive/43904051#43904051)
+to 10.0.75.1 port 445 (the Windows host) from 10.0.75.2 (the virtual machine).
+If the firewall rules appear to be open, consider [reinstalling the File and
+Print Sharing service on the virtual network
+adapter.](http://stackoverflow.com/questions/42203488/settings-to-windows-firewall-to-allow-docker-for-windows-to-share-drive/43904051#43904051)
+
+#### Shared drives on demand (Edge feature)
+
+On current Edge releases, sharing a drive can be done "on demand", the first
+time a particular mount is requested.
+
+If you run a Docker command from a shell with a volume mount (as shown in the
+example below) or kick off a Compose file that includes volume mounts, you get a
+popup asking if you want to share the specified drive.
+
+You can select to **Share it**, in which case it is added your Docker for
+Windows [Shared Drives list](/docker-for-windows/index.md#shared-drives) and
+available to containers. Alternatively, you can opt not to share it by hitting
+Cancel.
+
+![ ](/docker-for-windows/images/shared-drive-on-demand.png)
 
 ### Advanced
 
@@ -486,17 +505,18 @@ some of the common settings to make it easier to configure them.
 
 #### Experimental mode
 
-Starting with Stable 1.13.0 and Beta 34, both Docker for Windows Stable and Beta
+Both Docker for Windows Stable and Edge releases have the experimental version
-releases have the experimental version of Docker Engine enabled, described
+of Docker Engine enabled, described in the [Docker Experimental Features
-in the [Docker Experimental Features README](https://github.com/moby/moby/blob/master/experimental/README.md) on GitHub.
+README](https://github.com/moby/moby/blob/master/experimental/README.md) on
+GitHub.
 
 Experimental features are not appropriate for production environments or
 workloads. They are meant to be sandbox experiments for new ideas. Some
 experimental features may become incorporated into upcoming stable releases, but
-others may be modified or pulled from subsequent Betas, and never released
+others may be modified or pulled from subsequent Edge releases, and never
-on Stable.
+released on Stable.
 
-On both Beta and Stable releases, you can toggle **experimental mode** on and
+On both Edge and Stable releases, you can toggle **experimental mode** on and
 off. If you toggle it off, Docker for Windows uses the current generally
 available release of Docker Engine.
 
@@ -527,13 +547,13 @@ Server:
 
 #### Custom registries
 
-Also starting with with Beta 34 and Stable 1.13.0, you can set up your own
+You can set up your own [registries](/registry/introduction.md) on the **Basic**
-[registries](/registry/introduction.md) on the **Basic** Daemon settings.
+Daemon settings.
 
 As an alternative to using [Docker Hub](https://hub.docker.com/) to store your
 public or private images or [Docker Trusted
-Registry](/datacenter/dtr/2.1/guides/index.md), you can use Docker to set up your
+Registry](/datacenter/dtr/2.1/guides/index.md), you can use Docker to set up
-own insecure [registry](/registry/introduction.md). Add URLs for insecure
+your own insecure [registry](/registry/introduction.md). Add URLs for insecure
 registries and registry mirrors on which to host your images. (See also, [How do
 I add custom CA certificates?](faqs.md#how-do-i-add-custom-ca-certificates) in
 the FAQs.)

docker-for-windows/release-notes.md

@@ -309,13 +309,35 @@ We did not distribute a 1.12.4 stable release
 
 ## Edge Release Notes
 
-### Docker Community Edition 17.0.5c-win11 Release Notes (2017-05-12 17.05.0-ce-win11) (edge)
+### Docker Community Edition 17.06.0-win13 Release Notes (2017-06-01 17.06.0-rc1-ce-win13) (edge)
+
+**Upgrades**
+
+- [Docker 17.06.0-rc1-ce](https://github.com/docker/docker-ce/releases/tag/v17.06.0-ce-rc1)
+- [Docker Credential Helpers 0.5.1](https://github.com/docker/docker-credential-helpers/releases/tag/v0.5.1)
+- Linux Kernel 4.9.30
+
+**New**
+
+- Sharing a drive can be done on demand, the first time a mount is requested
+- Add an experimental DNS name for the host: `docker.for.win.localhost`
+- Support for client (i.e. "login") certificates for authenticating
+registry access (fixes [Docker for Windows issue 569](https://github.com/docker/for-win/issues/569))
+
+**Bug fixes and minor changes**
+
+- Many processes that were running in admin mode are now running within the user identity
+- Cloud federation command lines now opens in the user home directory
+- Named pipes are now created with more constrained security descriptors to improve security
+- Security fix : Users must be part of a specific group "docker-users" to run Docker for windows
+
+### Docker Community Edition 17.0.5-win11 Release Notes (2017-05-12 17.05.0-ce-win11) (edge)
 
 **Upgrades**
 
 - Security fix for CVE-2017-7308  
 
-### Docker Community Edition 17.0.5c-win9 Release Notes (2017-05-09 17.05.0-ce-win9) (edge)
+### Docker Community Edition 17.0.5-win9 Release Notes (2017-05-09 17.05.0-ce-win9) (edge)
 
 **Upgrades**
 
@@ -333,7 +355,7 @@ We did not distribute a 1.12.4 stable release
 - Detect a bitlocker policy preventing windows containers to work
 - fix an issue on filesharing when explicitly disabled on vmswitch interface
 - fix VM not starting when machine had very long name
-- Fix a bug where Windows daemon.json file was not written (fixes https://github.com/docker/for-win/issues/670)
+- Fix a bug where Windows daemon.json file was not written (fixes [Docker for Windows issue 670](https://github.com/docker/for-win/issues/670))
 
 ### Docker Community Edition 17.0.5-win8 Release Notes (2017-04-13 17.05.0-ce-rc1-win8) (edge)