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

more explanation of Linux volumes location, copyedits for URLs 

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2016-12-14 09:24:23 -08:00
parent abd941b6a4
commit 4226a616bd
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ For more about stable and beta channels, see the
<tr valign="top">
<td width="50%">This installer is fully baked and tested, and comes with the latest GA version of Docker Engine. <br><br>This is the best channel to use if you want a reliable platform to work with. <br><br>These releases follow a version schedule with a longer lead time than the betas, synched with Docker Engine releases and hotfixes.
</td>
<td width="50%">This installer offers cutting edge features and comes with the experimental version of Docker Engine, which is described in the <a href="https://github.com/docker/docker/tree/master/experimental" target="_blank">Docker Experimental Features README</a> on GitHub.<br><br>This is the best channel to use if you want to experiment with features we are working on as they become available, and can weather some instability and bugs. This channel is a continuation of the beta program, where you can provide feedback as the apps evolve. Releases are typically more frequent than for stable, often one or more per month.</td>
<td width="50%">This installer offers cutting edge features and comes with the experimental version of Docker Engine, which is described in the [Docker Experimental Features README](https://github.com/docker/docker/tree/master/experimental) on GitHub.<br><br>This is the best channel to use if you want to experiment with features we are working on as they become available, and can weather some instability and bugs. This channel is a continuation of the beta program, where you can provide feedback as the apps evolve. Releases are typically more frequent than for stable, often one or more per month.</td>
</tr>
<tr valign="top">
<td width="50%">
@ -212,8 +212,8 @@ 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.
>**Tip: Beta dialogs** &mdash; Starting with Beta 31, CPUs and Memory settings
are on the Advanced dialog. Starting with Beta 33, you can specify the storage location of the Linux volume. These settings are shown below.
>**Tip: Beta dialogs** &mdash; Starting with Beta 31, **CPUs** and **Memory** settings
are on the Advanced dialog. Starting with Beta 33, you can specify the **storage location** of the Linux volume; i.e., where containers and images are stored. These settings are shown below.
>
>![CPUs and Memory settings UI
starting at Beta 31](images/settings-advanced-beta.png)
@ -255,9 +255,7 @@ own **Daemon** tab, including basic and advanced options.
#### Daemon Basic (experimental mode and registries)
By default, Docker for Mac Beta releases use the experimental version of Docker
Engine, described in the <a
href="https://github.com/docker/docker/tree/master/experimental"
target="_blank">Docker Experimental Features README</a> on GitHub. Starting with
Engine, described in the [Docker Experimental Features README](https://github.com/docker/docker/tree/master/experimental) on GitHub. Starting with
Beta 31, you can toggle **experimental mode** on and off. If you toggle it off,
Docker for Mac Beta uses the current generally available release of Docker
Engine, the same as Stable Docker for Mac versions uses.

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

@ -29,7 +29,7 @@ If you have not already done so, please install Docker for Windows. You can down
<tr valign="top">
<td width="50%">This installer is fully baked and tested, and comes with the latest GA version of Docker Engine. <br><br>This is the best channel to use if you want a reliable platform to work with. <br><br>These releases follow a version schedule with a longer lead time than the betas, synched with Docker Engine releases and hotfixes.
</td>
<td width="50%">This installer offers cutting edge features and comes with the experimental version of Docker Engine, which is described in the <a href="https://github.com/docker/docker/tree/master/experimental" target="_blank">Docker Experimental Features README</a> on GitHub.<br><br>This is the best channel to use if you want to experiment with features we are working on as they become available, and can weather some instability and bugs. This channel is a continuation of the beta program, where you can provide feedback as the apps evolve. Releases are typically more frequent than for stable, often one or more per month.</td>
<td width="50%">This installer offers cutting edge features and comes with the experimental version of Docker Engine, which is described in the [Docker Experimental Features README](https://github.com/docker/docker/tree/master/experimental) on GitHub.<br><br>This is the best channel to use if you want to experiment with features we are working on as they become available, and can weather some instability and bugs. This channel is a continuation of the beta program, where you can provide feedback as the apps evolve. Releases are typically more frequent than for stable, often one or more per month.</td>
</tr>
<tr valign="top">
<td width="50%">