docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clarified Cloud menu integration edge only (#2543) 

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2017-03-29 14:39:29 -05:00 committed by GitHub
parent 07d0d0b4d9
commit 1a9fb5e720
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker-for-mac/index.md
View File

@ -104,6 +104,8 @@ the menu bar.
You can set the following runtime options. You can set the following runtime options.
>**Note:** The above example shows a user signed in for integrated Docker Cloud access. This is currently available only on the [Edge channel](install.md#download-docker-for-mac). To learn more about the feature, see [Docker Cloud (Edge feature)](#docker-cloud-edge-feature).
### General ### General
![Preferences](/docker-for-mac/images/settings.png) ![Preferences](/docker-for-mac/images/settings.png)
@ -356,9 +358,11 @@ distributed as Docker Images.
![Docker Store](images/docker-store.png) ![Docker Store](images/docker-store.png)
## Docker Cloud ## Docker Cloud (Edge feature)
You can access your Docker Cloud account from within Docker for Mac. >**Note:** Integrated Docker Cloud access is currently available only on the [Edge channel](install.md#download-docker-for-mac). On stable, you'll need to log onto [Docker Cloud](https://cloud.docker.com/) independently for now.
You can access your [Docker Cloud](https://cloud.docker.com/) account from within Docker for Mac.
![Docker Cloud](images/docker-cloud.png) ![Docker Cloud](images/docker-cloud.png)

8
docker-for-windows/index.md
View File

@ -311,6 +311,8 @@ To get a popup menu with application options, right-click the whale:
![Docker for Windows popup menu](/docker-for-windows/images/config-popup-menu-win.png) ![Docker for Windows popup menu](/docker-for-windows/images/config-popup-menu-win.png)
>**Note:** The above example shows a user signed in for integrated Docker Cloud access. This is currently available only on the [Edge channel](install.md#download-docker-for-windows). To learn more about the feature, see [Docker Cloud (Edge feature)](#docker-cloud-edge-feature).
The **Settings** dialogs provide options to allow Docker auto-start, The **Settings** dialogs provide options to allow Docker auto-start,
automatically check for updates, share local drives with Docker containers, automatically check for updates, share local drives with Docker containers,
enable VPN compatibility, manage CPUs and memory Docker uses, restart Docker, or enable VPN compatibility, manage CPUs and memory Docker uses, restart Docker, or
@ -614,12 +616,14 @@ distributed as Docker Images.
![Docker Store](images/docker-store.png) ![Docker Store](images/docker-store.png)
### Docker Cloud ### Docker Cloud (Edge feature)
You can access your Docker Cloud account from within Docker for Windows. You can access your [Docker Cloud](https://cloud.docker.com/) account from within Docker for Windows.
![Docker Cloud](images/docker-cloud.png) ![Docker Cloud](images/docker-cloud.png)
>**Note:** Integrated Docker Cloud access is currently available only on the [Edge channel](install.md#download-docker-for-windows). On stable, you'll need to log onto [Docker Cloud](https://cloud.docker.com/) independently for now.
From the Docker for Windows menu, sign in to Docker Cloud with your Docker ID, From the Docker for Windows menu, sign in to Docker Cloud with your Docker ID,
or create one. or create one.