From a8aaf5bfadbd98d507e358606dc928d2f7dfffcb Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Thu, 15 Sep 2016 18:53:46 +0200
Subject: [PATCH] Synchronize push reference with man page

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dddea689ab45ce146e6ac3a1199235e1f36ffe29)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 docs/reference/commandline/push.md | 37 ++++++++++++++++++++++++++++--
 man/docker-push.1.md               | 22 ++++++++++++------
 2 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/docs/reference/commandline/push.md b/docs/reference/commandline/push.md
index 42601ed1bb..f8803a45d1 100644
--- a/docs/reference/commandline/push.md
+++ b/docs/reference/commandline/push.md
@@ -22,9 +22,42 @@ Options:
 
 Use `docker push` to share your images to the [Docker Hub](https://hub.docker.com)
 registry or to a self-hosted one.
-[Read more about valid image names and tags](tag.md).
+
+Refer to the [`docker tag`](tag.md) reference for more information about valid
+image and tag names.
 
 Killing the `docker push` process, for example by pressing `CTRL-c` while it is
-running in a terminal, will terminate the push operation.
+running in a terminal, terminates the push operation.
 
 Registry credentials are managed by [docker login](login.md).
+
+## EXAMPLES
+
+### Pushing a new image to a registry
+
+First save the new image by finding the container ID (using [`docker ps`](ps.md))
+and then committing it to a new image name.  Note that only `a-z0-9-_.` are
+allowed when naming images:
+
+```bash
+$ docker commit c16378f943fe rhel-httpd
+```
+
+Now, push the image to the registry using the image ID. In this example the
+registry is on host named `registry-host` and listening on port `5000`. To do
+this, tag the image with the host name or IP address, and the port of the
+registry:
+
+```bash
+$ docker tag rhel-httpd registry-host:5000/myadmin/rhel-httpd
+$ docker push registry-host:5000/myadmin/rhel-httpd
+```
+
+Check that this worked by running:
+
+```bash
+$ docker images
+```
+
+You should see both `rhel-httpd` and `registry-host:5000/myadmin/rhel-httpd`
+listed.
diff --git a/man/docker-push.1.md b/man/docker-push.1.md
index 4919489a99..847e66d2e4 100644
--- a/man/docker-push.1.md
+++ b/man/docker-push.1.md
@@ -11,18 +11,28 @@ NAME[:TAG] | [REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG]
 
 # DESCRIPTION
 
-This command pushes an image or a repository to a registry. If you do not
-specify a `REGISTRY_HOST`, the command uses Docker's public registry located at
-`registry-1.docker.io` by default. Refer to **docker-tag(1)** for more 
-information about valid image and tag names.
+Use `docker push` to share your images to the [Docker Hub](https://hub.docker.com)
+registry or to a self-hosted one.
+
+Refer to **docker-tag(1)** for more information about valid image and tag names.
+
+Killing the **docker push** process, for example by pressing **CTRL-c** while it
+is running in a terminal, terminates the push operation.
+
+Registry credentials are managed by **docker-login(1)**.
+
 
 # OPTIONS
+
+**--disable-content-trust**
+  Skip image verification (default true)
+
 **--help**
   Print usage statement
 
 # EXAMPLES
 
-# Pushing a new image to a registry
+## Pushing a new image to a registry
 
 First save the new image by finding the container ID (using **docker ps**)
 and then committing it to a new image name.  Note that only a-z0-9-_. are
@@ -45,8 +55,6 @@ Check that this worked by running:
 You should see both `rhel-httpd` and `registry-host:5000/myadmin/rhel-httpd`
 listed.
 
-Registry credentials are managed by **docker-login(1)**.
-
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
 based on docker.com source material and internal work.