misc updates to d4mac and win, kitematic (#2663)

copyedits on Kitematic, fix Mac install page

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2017-04-06 19:49:52 -07:00 committed by GitHub
parent d6b23d654e
commit 006aed530f
7 changed files with 25 additions and 2 deletions

View File

@ -104,6 +104,11 @@ provides discussion threads as well, and you can create discussion topics there,
but we recommend using the GitHub issues over the forums for better tracking and
response.
### How can I opt out of sending my usage data?
If you do not want auto-send of usage data, use the Stable channel. For more
information, see [Stable and Edge channels](#stable-and-edge-channels) ("What is the difference between the Stable and Edge versions of Docker for Mac?").
### Can I use Docker for Mac with new swarm mode?
Yes, you can use Docker for Mac to test single-node features of [swarm

View File

@ -45,6 +45,7 @@ For more about Stable and Edge channels, see the
best channel to use if you want a reliable platform to work with. These releases follow the Docker Engine stable releases.<br><br>
On this channel, you can select whether to send usage
statistics and other data. <br><br>Stable builds are released once per quarter.
</td>
<td width="50%">This installer provides the latest Edge release of
Docker for Mac and Engine, and typically offers new features in development. Use this channel if you want to get experimental features faster, and can weather some instability and bugs. We collect all usage data on Edge releases across the board. <br><br>Edge builds are released once per month.
</td>

View File

@ -95,6 +95,11 @@ provides discussion threads as well, and you can create discussion topics there,
but we recommend using the GitHub issues over the forums for better tracking and
response.
### How can I opt out of sending my usage data?
If you do not want auto-send of usage data, use the Stable channel. For more
information, see [Stable and Edge channels](#questions-about-stable-and-edge-channels) ("What is the difference between the Stable and Edge versions of Docker for Windows?").
### Can I use Docker for Windows with new swarm mode?
Yes! You can use Docker for Windows to test single-node features of

Binary file not shown.

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -24,7 +24,19 @@ and configuring volumes. You can use Kitematic to change environment variables,
stream logs, and single click terminal into your Docker container all from the
GUI.
First, if you haven't yet done so, download and start Kitematic by installing [Docker Toolbox](/toolbox/overview.md#ready-to-get-started).
First, if you haven't yet done so, download and install Kitematic in one of the following ways:
* Choose **Kitematic** from the Docker for Mac or Docker for Windows menu to get started with the Kitematic install.
* Install [Docker Toolbox](/toolbox/overview.md#ready-to-get-started) (on older systems that do not meet the requirements of [Docker for Mac](/docker-for-mac/install.md#what-to-know-before-you-install) or [Docker for Windows](/docker-for-windows/install.md#what-to-know-before-you-install)).
* Download Kitematic directly from the [Kitematic releases page](https://github.com/docker/kitematic/releases/).
Start Kitematic. (On desktop systems, click on the app.)
## Log in with your Docker ID
Provide your Docker ID and user name and click **LOG IN** or click **Skip for now** to browse Docker Hub as a guest.
## Container list
@ -85,7 +97,7 @@ The "Terminal" icon at the top of the container summary will `docker exec -i -t
This will allow you to make quick changes, or to debug a problem.
> **Note**: Your exec'ed `sh` process will not have the same environment settings
> as the main container process and its children.
> as the main container process and its children.
> Get the environment commands for your shell: `docker-machine env default`.
### Managing Volumes