Browse code

Docker Registry Server > Docker Registry Fixing registry index Tested on beta and this redirect works

Signed-off-by: Mary Anthony <mary@docker.com>

Mary Anthony authored on 2015/04/19 09:42:24
Showing 6 changed files
... ...
@@ -39,7 +39,7 @@ ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs
39 39
     https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/images/registry.png \
40 40
   /docs/sources/registry/images/
41 41
 
42
-ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/overview.md \
42
+ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/index.md \
43 43
     https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/deploying.md \
44 44
     https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/configuration.md \
45 45
     https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/storagedrivers.md \
... ...
@@ -13,7 +13,7 @@ docker-login - Register or log in to a Docker registry.
13 13
 [SERVER]
14 14
 
15 15
 # DESCRIPTION
16
-Register or log in to a Docker Registry Service located on the specified
16
+Register or log in to a Docker Registry located on the specified
17 17
 `SERVER`.  You can specify a URL or a `hostname` for the `SERVER` value. If you
18 18
 do not specify a `SERVER`, the command uses Docker's public registry located at
19 19
 `https://registry-1.docker.io/` by default.  To get a username/password for Docker's public registry, create an account on Docker Hub.
... ...
@@ -2,14 +2,14 @@
2 2
 % Docker Community
3 3
 % JUNE 2014
4 4
 # NAME
5
-docker-logout - Log out from a Docker Registry Service.
5
+docker-logout - Log out from a Docker Registry.
6 6
 
7 7
 # SYNOPSIS
8 8
 **docker logout**
9 9
 [SERVER]
10 10
 
11 11
 # DESCRIPTION
12
-Log out of a Docker Registry Service located on the specified `SERVER`. You can
12
+Log out of a Docker Registry located on the specified `SERVER`. You can
13 13
 specify a URL or a `hostname` for the `SERVER` value. If you do not specify a
14 14
 `SERVER`, the command attempts to log you out of Docker's public registry
15 15
 located at `https://registry-1.docker.io/` by default.  
... ...
@@ -172,10 +172,10 @@ inside it)
172 172
   Load an image from a tar archive
173 173
 
174 174
 **docker-login(1)**
175
-  Register or login to a Docker Registry Service
175
+  Register or login to a Docker Registry
176 176
 
177 177
 **docker-logout(1)**
178
-  Log the user out of a Docker Registry Service
178
+  Log the user out of a Docker Registry
179 179
 
180 180
 **docker-logs(1)**
181 181
   Fetch the logs of a container
... ...
@@ -190,10 +190,10 @@ inside it)
190 190
   List containers
191 191
 
192 192
 **docker-pull(1)**
193
-  Pull an image or a repository from a Docker Registry Service
193
+  Pull an image or a repository from a Docker Registry
194 194
 
195 195
 **docker-push(1)**
196
-  Push an image or a repository to a Docker Registry Service
196
+  Push an image or a repository to a Docker Registry
197 197
 
198 198
 **docker-restart(1)**
199 199
   Restart a running container
... ...
@@ -134,7 +134,7 @@ pages:
134 134
 - ['swarm/scheduler/filter.md', 'Reference', 'Swarm filters']
135 135
 - ['swarm/API.md', 'Reference', 'Swarm API']
136 136
 - ['reference/api/index.md', '**HIDDEN**']
137
-- ['registry/overview.md', 'Reference', 'Docker Registry 2.0']
137
+- ['registry/index.md', 'Reference', 'Docker Registry 2.0']
138 138
 - ['registry/deploying.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; Deploy a registry' ]
139 139
 - ['registry/configuration.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; Configure a registry' ]
140 140
 - ['registry/storagedrivers.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; Storage driver model' ]
... ...
@@ -42,7 +42,9 @@
42 42
     { "Condition": { "KeyPrefixEquals": "installation/openSUSE/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "installation/SUSE/" } },
43 43
     { "Condition": { "KeyPrefixEquals": "contributing/contributing/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/who-written-for/" } },
44 44
     { "Condition": { "KeyPrefixEquals": "contributing/devenvironment/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/set-up-prereqs/" } },
45
-    { "Condition": { "KeyPrefixEquals": "contributing/docs_style-guide/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/doc-style/" } }
45
+    { "Condition": { "KeyPrefixEquals": "contributing/docs_style-guide/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/doc-style/" } },
46
+    { "Condition": { "KeyPrefixEquals": "registry/overview/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "registry/" } }
47
+
46 48
   ]
47 49
 }
48 50