From 2f288fe89465092b2432109e3230e15b5977597a Mon Sep 17 00:00:00 2001
From: Richard Scothern <richard.scothern@gmail.com>
Date: Fri, 25 Sep 2015 13:49:50 -0700
Subject: [PATCH] Command line, manpage and deprecation documentation.

Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
---
 docs/reference/commandline/daemon.md | 5 +++++
 man/docker-daemon.8.md               | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/docs/reference/commandline/daemon.md b/docs/reference/commandline/daemon.md
index 8b343373c1..e3ed62ef42 100644
--- a/docs/reference/commandline/daemon.md
+++ b/docs/reference/commandline/daemon.md
@@ -49,6 +49,7 @@ weight=1
       --log-driver="json-file"               Default driver for container logs
       --log-opt=[]                           Log driver specific options
       --mtu=0                                Set the containers network MTU
+      --no-legacy-registry=false             Do not contact legacy registries
       -p, --pidfile="/var/run/docker.pid"    Path to use for daemon PID file
       --registry-mirror=[]                   Preferred Docker registry mirror
       -s, --storage-driver=""                Storage driver to use
@@ -457,6 +458,10 @@ because its use creates security vulnerabilities it should ONLY be enabled for
 testing purposes.  For increased security, users should add their CA to their 
 system's list of trusted CAs instead of enabling `--insecure-registry`.
 
+## Legacy Registries
+
+Enabling `--no-legacy-registry` forces a docker daemon to only interact with registries which support the V2 protocol.  Specifically, the daemon will not attempt `push`, `pull` and `login` to v1 registries.  The exception to this is `search` which can still be performed on v1 registries.
+
 ## Running a Docker daemon behind a HTTPS_PROXY
 
 When running inside a LAN that uses a `HTTPS` proxy, the Docker Hub
diff --git a/man/docker-daemon.8.md b/man/docker-daemon.8.md
index 3f1932d07d..20e5e5b370 100644
--- a/man/docker-daemon.8.md
+++ b/man/docker-daemon.8.md
@@ -40,6 +40,7 @@ docker-daemon - Enable daemon mode
 [**--log-driver**[=*json-file*]]
 [**--log-opt**[=*map[]*]]
 [**--mtu**[=*0*]]
+[**--no-legacy-registry**[=*false*]]
 [**-p**|**--pidfile**[=*/var/run/docker.pid*]]
 [**--registry-mirror**[=*[]*]]
 [**-s**|**--storage-driver**[=*STORAGE-DRIVER*]]
@@ -170,6 +171,9 @@ unix://[/path/to/socket] to use.
 **--mtu**=VALUE
   Set the containers network mtu. Default is `0`.
 
+**--no-legacy-registry**=*true*|*false*
+  Do not contact legacy registries
+
 **-p**, **--pidfile**=""
   Path to use for daemon PID file. Default is `/var/run/docker.pid`