Skip to content

Commit

Permalink
Merge remote-tracking branch 'docker.github.io/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
allysmith424 committed Jan 23, 2020
2 parents 3cf7cea + 398ac67 commit bfa52ea
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
7 changes: 3 additions & 4 deletions _includes/experimental.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ Experimental features provide early access to future product functionality.
These features are intended for testing and feedback only as they may change
between releases without warning or can be removed entirely from a future
release. Experimental features must not be used in production environments.
Docker does not offer support for experimental features. For more information,
see [Experimental features](https://success.docker.com/article/experimental-features).
Docker does not offer support for experimental features.
>
> To enable experimental features in the Docker CLI, edit the `config.json`
> file and set `experimental` to enabled.
>
> To enable experimental features from the Docker Desktop menu, click
> **Settings** (**Preferences** on macOS) > **Daemon** and then select the
> **Experimental features** check box.
> **Settings** (**Preferences** on macOS) > **Command Line** and then turn on
> the **Enable experimental features** toggle. Click **Apply & Restart**.
{: .important }
5 changes: 1 addition & 4 deletions docker-for-windows/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,7 @@ of Docker Engine enabled by default, described in the [Docker Experimental Featu
{% include experimental.md %}
On both Edge and Stable releases, you can toggle the **Experimental features** on and off. If you toggle it off, Docker Desktop uses the current generally
available release of Docker Engine.
Run `docker version` to see if you are in Experimental mode. Experimental mode
Run `docker version` to verify whether you have enabled experimental features. Experimental mode
is listed under `Server` data. If `Experimental` is `true`, then Docker is
running in experimental mode, as shown here:
Expand Down
1 change: 1 addition & 0 deletions docker-for-windows/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ For information about Edge releases, see the [Edge release notes](edge-release-n
[What to know before you install](install.md#what-to-know-before-you-install).

## Docker Desktop Community 2.2.0.0
2020-01-21

> [Download](https://hub.docker.com/?overlay=onboarding)
>
Expand Down

0 comments on commit bfa52ea

Please sign in to comment.