From 274a666900c8d3bc947495ab82964a5720a050c7 Mon Sep 17 00:00:00 2001 From: Victoria Bialas Date: Mon, 30 Jan 2017 10:59:00 -0800 Subject: [PATCH] clarified that experimental mode is enabled in d4mac, d4win updated stable, beta download, and experimental mode descriptions with more detail copyedits Signed-off-by: Victoria Bialas --- docker-for-mac/index.md | 42 +++++++++++++++++++++++++++-------- docker-for-windows/index.md | 44 +++++++++++++++++++++++++++++-------- 2 files changed, 68 insertions(+), 18 deletions(-) diff --git a/docker-for-mac/index.md b/docker-for-mac/index.md index 6d67c116bf..5f11b3753c 100644 --- a/docker-for-mac/index.md +++ b/docker-for-mac/index.md @@ -35,9 +35,25 @@ channels, see the [FAQs](/docker-for-mac/faqs.md#stable-and-beta-channels). Beta channel - This installer is fully baked and tested, and comes with the latest GA version of Docker Engine.

This is the best channel to use if you want a reliable platform to work with.

These releases follow a version schedule with a longer lead time than the betas, synched with Docker Engine releases and hotfixes.

On the stable channel, you can select whether to send usage statistics and other data. + This installer is fully baked and tested, and comes + with the latest GA version of Docker Engine along with experimental features in Docker Engine, which are enabled by + default and configurable on Docker Daemon preferences for experimental mode.

This is the + best channel to use if you want a reliable platform to work with. + (Be sure to disable experimental features for apps in production.)

These releases follow a version schedule with a longer lead + time than the betas, synched with Docker Engine releases and + hotfixes.

On the stable channel, you can select whether to send usage + statistics and other data. - This installer offers cutting edge features and comes with the experimental version of Docker Engine, described in the Docker Experimental Features README on GitHub.

This is the best channel to use if you want to experiment with features under development, 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.

We collect usage data on betas across the board. + This installer provides the latest Beta release of + Docker for Mac, offers cutting edge features along with + experimental features in Docker Engine, which are enabled by + default and configurable on Docker Daemon preferences for experimental mode.

This is the + best channel to use if you want to experiment with features under development, 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.

We collect all usage + data on betas across the board. @@ -323,6 +339,7 @@ containers. ![Proxies settings](/docker-for-mac/images/settings-proxies.png) +

### Docker Daemon You can configure options on the Docker daemon that determine how your @@ -341,13 +358,20 @@ some of the commmon settings to make it easier to configure them. #### Experimental mode -By default, Docker for Mac Beta releases use the experimental version of Docker -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. +Starting with Stable 1.13.0 and Beta 31, both Docker for Mac Stable and Beta +releases have experimental features enabled on Docker Engine, as described in +the [Docker Experimental Features +README](https://github.com/docker/docker/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 subsquent Betas, and never released +on Stable. + +On both Beta 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. You can check whether you are running experimental mode or not by typing `docker version` on the command line. Experimental mode is listed under `Server` data. diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md index 2db8dd7916..0714014dba 100644 --- a/docker-for-windows/index.md +++ b/docker-for-windows/index.md @@ -35,9 +35,28 @@ beta channels, see the Beta channel - This installer is fully baked and tested, and comes with the latest GA version of Docker Engine.

This is the best channel to use if you want a reliable platform to work with.

These releases follow a version schedule with a longer lead time than the betas, synched with Docker Engine releases and hotfixes.

On the stable channel, you can select whether to send usage statistics and other data. + This installer is fully baked and tested, and comes + with the latest GA version of Docker Engine along with + experimental features in Docker Engine, which are enabled + by default and configurable on + Docker Daemon settings for + experimental mode.

This is the best channel to use if + you want a reliable platform to work with. (Be sure to disable + experimental features for apps in production.)

These releases follow a version schedule with a longer lead time than the betas, + synched with Docker Engine releases and hotfixes.

On the + stable channel, you can select whether to send usage statistics + and other data. - This installer offers cutting edge features and comes with the experimental version of Docker Engine, which is described in the Docker Experimental Features README on GitHub.

This is the best channel to use if you want to experiment with features under development, 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.

We collect all usage data on betas across the board. + This installer provides the latest Beta release of + Docker for Windows, offers cutting edge features along with experimental features in Docker Engine, which are enabled + by default and configurable on + Docker Daemon settings for experimental mode.

This is + the best channel to use if you want to experiment with features + under development, 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.

+ We collect all usage data on betas across the board. @@ -552,6 +571,7 @@ You can see from the above output that the `HTTP_PROXY`, `http_proxy` and `no_pr When your proxy configuration changes, 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](/engine/reference/run/#restart-policies-restart) +

### Docker daemon You can configure options on the Docker daemon that determine how your @@ -569,13 +589,19 @@ some of the commmon settings to make it easier to configure them. #### Experimental mode -By default, Docker for Windows Beta releases use the experimental version of -Docker Engine, described in the [Docker Experimental Features -README](https://github.com/docker/docker/tree/master/experimental) on GitHub. -Starting with Beta 34 and Stable 1.13.0, you can toggle **experimental mode** on and off via the -**Basic** Daemon settings. If you toggle it off, Docker for Windows Beta uses the -current generally available release of Docker Engine, the same as Stable Docker -for Windows versions uses by default. +Starting with Stable 1.13.0 and Beta 34, both Docker for Windows Stable and Beta +releases have the experimental version of Docker Engine enabled, described +in the [Docker Experimental Features README](https://github.com/docker/docker/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 subsquent Betas, and never released +on Stable. + +On both Beta 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. You can check whether you are running experimental mode or not by typing `docker version` in a PowerShell. Experimental mode is listed under `Server` data.