Merge pull request #12518 from moxiegirl/fix-12516-registry-doc

Docker Registry Server > Docker Registry

docs/Dockerfile

@@ -39,7 +39,7 @@ ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs
     https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/images/registry.png \
   /docs/sources/registry/images/
 
-ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/overview.md \
+ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/index.md \
     https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/deploying.md \
     https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/configuration.md \
     https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/storagedrivers.md \

docs/man/docker-login.1.md

@@ -13,7 +13,7 @@ docker-login - Register or log in to a Docker registry.
 [SERVER]
 
 # DESCRIPTION
-Register or log in to a Docker Registry Service located on the specified
+Register or log in to a Docker Registry located on the specified
 `SERVER`.  You can specify a URL or a `hostname` for the `SERVER` value. If you
 do not specify a `SERVER`, the command uses Docker's public registry located at
 `https://registry-1.docker.io/` by default.  To get a username/password for Docker's public registry, create an account on Docker Hub.

docs/man/docker-logout.1.md

@@ -2,14 +2,14 @@
 % Docker Community
 % JUNE 2014
 # NAME
-docker-logout - Log out from a Docker Registry Service.
+docker-logout - Log out from a Docker Registry.
 
 # SYNOPSIS
 **docker logout**
 [SERVER]
 
 # DESCRIPTION
-Log out of a Docker Registry Service located on the specified `SERVER`. You can
+Log out of a Docker Registry located on the specified `SERVER`. You can
 specify a URL or a `hostname` for the `SERVER` value. If you do not specify a
 `SERVER`, the command attempts to log you out of Docker's public registry
 located at `https://registry-1.docker.io/` by default.  

docs/man/docker.1.md

@@ -172,10 +172,10 @@ inside it)
   Load an image from a tar archive
 
 **docker-login(1)**
-  Register or login to a Docker Registry Service
+  Register or login to a Docker Registry
 
 **docker-logout(1)**
-  Log the user out of a Docker Registry Service
+  Log the user out of a Docker Registry
 
 **docker-logs(1)**
   Fetch the logs of a container
@@ -190,10 +190,10 @@ inside it)
   List containers
 
 **docker-pull(1)**
-  Pull an image or a repository from a Docker Registry Service
+  Pull an image or a repository from a Docker Registry
 
 **docker-push(1)**
-  Push an image or a repository to a Docker Registry Service
+  Push an image or a repository to a Docker Registry
 
 **docker-restart(1)**
   Restart a running container

docs/mkdocs.yml

@@ -134,7 +134,7 @@ pages:
 - ['swarm/scheduler/filter.md', 'Reference', 'Swarm filters']
 - ['swarm/API.md', 'Reference', 'Swarm API']
 - ['reference/api/index.md', '**HIDDEN**']
-- ['registry/overview.md', 'Reference', 'Docker Registry 2.0']
+- ['registry/index.md', 'Reference', 'Docker Registry 2.0']
 - ['registry/deploying.md', 'Reference', '    ▪  Deploy a registry' ]
 - ['registry/configuration.md', 'Reference', '    ▪  Configure a registry' ]
 - ['registry/storagedrivers.md', 'Reference', '    ▪  Storage driver model' ]

docs/s3_website.json

@@ -42,7 +42,9 @@
     { "Condition": { "KeyPrefixEquals": "installation/openSUSE/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "installation/SUSE/" } },
     { "Condition": { "KeyPrefixEquals": "contributing/contributing/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/who-written-for/" } },
     { "Condition": { "KeyPrefixEquals": "contributing/devenvironment/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/set-up-prereqs/" } },
-    { "Condition": { "KeyPrefixEquals": "contributing/docs_style-guide/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/doc-style/" } }
+    { "Condition": { "KeyPrefixEquals": "contributing/docs_style-guide/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/doc-style/" } },
+    { "Condition": { "KeyPrefixEquals": "registry/overview/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "registry/" } }
+
   ]
 }