From fd0957a4071fe2b427f68a99a8b0dfe8300709ad Mon Sep 17 00:00:00 2001
From: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Date: Tue, 8 Nov 2016 10:31:09 +0000
Subject: [PATCH] update experimental/README.md

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
---
 experimental/README.md | 71 ++++++++++--------------------------------
 1 file changed, 16 insertions(+), 55 deletions(-)

diff --git a/experimental/README.md b/experimental/README.md
index 0ee893deaf..796080cca5 100644
--- a/experimental/README.md
+++ b/experimental/README.md
@@ -9,65 +9,26 @@ issues associated with it. If necessary, links are provided to additional
 documentation on an issue.  As an active Docker user and community member,
 please feel free to provide any feedback on these features you wish.
 
-## Install Docker experimental
+## Use Docker experimental
 
-Unlike the regular Docker binary, the experimental channels is built and
-updated nightly on https://experimental.docker.com. From one day to the
-next, new features may appear, while existing experimental features may be
-refined or entirely removed.
+Experimental features are now included in the standard Docker binaries as of
+version 1.13.0.
+For enabling experimental features, you need to start the Docker daemon with
+`--experimental` flag.
+You can also enable the daemon flag via `/etc/docker/daemon.json`. e.g.
 
-1. Verify that you have `curl` installed.
+```json
+{
+    "experimental": true
+}
+```
 
-        $ which curl
+Then make sure the experimental flag is enabled:
 
-    If `curl` isn't installed, install it after updating your manager:
-
-        $ sudo apt-get update
-        $ sudo apt-get install curl
-
-2. Get the latest Docker package.
-
-        $ curl -sSL https://experimental.docker.com/ | sh
-
-    The system prompts you for your `sudo` password. Then, it downloads and
-    installs Docker and its dependencies.
-
-	>**Note**: If your company is behind a filtering proxy, you may find that the
-	>`apt-key`
-	>command fails for the Docker repo during installation. To work around this,
-	>add the key directly using the following:
-	>
-	>       $ curl -sSL https://experimental.docker.com/gpg | sudo apt-key add -
-
-3. Verify `docker` is installed correctly.
-
-        $ sudo docker run hello-world
-
-    This command downloads a test image and runs it in a container.
-
-### Get the Linux binary
-To download the latest experimental `docker` binary for Linux,
-use the following URLs:
-
-    https://experimental.docker.com/builds/Linux/i386/docker-latest.tgz
-
-    https://experimental.docker.com/builds/Linux/x86_64/docker-latest.tgz
-
-After downloading the appropriate binary, you can follow the instructions
-[here](https://docs.docker.com/engine/installation/binaries/#/get-the-docker-engine-binaries) to run the `docker` daemon.
-
-> **Note**
->
-> 1) You can get the MD5 and SHA256 hashes by appending .md5 and .sha256 to the URLs respectively
->
-> 2) You can get the compressed binaries by appending .tgz to the URLs
-
-### Build an experimental binary
-You can also build the experimental binary from the standard development environment by adding
-`DOCKER_EXPERIMENTAL=1` to the environment where you run `make` to build Docker binaries. For example,
-to build a Docker binary with the experimental features enabled:
-
-        $ DOCKER_EXPERIMENTAL=1 make binary
+```bash
+$ docker version -f '{{.Server.Experimental}}'
+true
+```
 
 ## Current experimental features