Browse code

Merge pull request #27819 from lixiaobing10051267/masterDirInvalid

fill all the rest invalid address because no related directory

Misty Stanley-Jones authored on 2016/10/29 05:05:18
Showing 5 changed files
... ...
@@ -58,7 +58,7 @@ respectively.
58 58
 
59 59
 ## Default user authorization mechanism
60 60
 
61
-If TLS is enabled in the [Docker daemon](../security/https.md), the default user authorization flow extracts the user details from the certificate subject name.
61
+If TLS is enabled in the [Docker daemon](https://docs.docker.com/engine/security/https/), the default user authorization flow extracts the user details from the certificate subject name.
62 62
 That is, the `User` field is set to the client certificate subject common name, and the `AuthenticationMethod` field is set to `TLS`.
63 63
 
64 64
 ## Basic architecture
... ...
@@ -30,7 +30,7 @@ kind of protocol.
30 30
 ## Network driver plugins and swarm mode
31 31
 
32 32
 Docker 1.12 adds support for cluster management and orchestration called
33
-[swarm mode](../swarm/index.md). Docker Engine running in swarm mode currently
33
+[swarm mode](https://docs.docker.com/engine/swarm/). Docker Engine running in swarm mode currently
34 34
 only supports the built-in overlay driver for networking. Therefore existing
35 35
 networking plugins will not work in swarm mode.
36 36
 
... ...
@@ -118,7 +118,7 @@ image you can specify it with `--cache-from` option. Images specified with
118 118
 registries.
119 119
 
120 120
 When you're done with your build, you're ready to look into [*Pushing a
121
-repository to its registry*](../tutorials/dockerrepos.md#contributing-to-docker-hub).
121
+repository to its registry*](https://docs.docker.com/engine/tutorials/dockerrepos/#/contributing-to-docker-hub).
122 122
 
123 123
 ## Format
124 124
 
... ...
@@ -491,7 +491,7 @@ Or
491 491
 The `FROM` instruction sets the [*Base Image*](glossary.md#base-image)
492 492
 for subsequent instructions. As such, a valid `Dockerfile` must have `FROM` as
493 493
 its first instruction. The image can be any valid image – it is especially easy
494
-to start by **pulling an image** from the [*Public Repositories*](../tutorials/dockerrepos.md).
494
+to start by **pulling an image** from the [*Public Repositories*](https://docs.docker.com/engine/tutorials/dockerrepos/).
495 495
 
496 496
 - `FROM` must be the first non-comment instruction in the `Dockerfile`.
497 497
 
... ...
@@ -1204,7 +1204,7 @@ containers. The value can be a JSON array, `VOLUME ["/var/log/"]`, or a plain
1204 1204
 string with multiple arguments, such as `VOLUME /var/log` or `VOLUME /var/log
1205 1205
 /var/db`. For more information/examples and mounting instructions via the
1206 1206
 Docker client, refer to
1207
-[*Share Directories via Volumes*](../tutorials/dockervolumes.md#mount-a-host-directory-as-a-data-volume)
1207
+[*Share Directories via Volumes*](https://docs.docker.com/engine/tutorials/dockervolumes/#/mount-a-host-directory-as-a-data-volume)
1208 1208
 documentation.
1209 1209
 
1210 1210
 The `docker run` command initializes the newly created volume with any data
... ...
@@ -1697,7 +1697,7 @@ The `SHELL` feature was added in Docker 1.12.
1697 1697
 ## Dockerfile examples
1698 1698
 
1699 1699
 Below you can see some examples of Dockerfile syntax. If you're interested in
1700
-something more realistic, take a look at the list of [Dockerization examples](../examples/index.md).
1700
+something more realistic, take a look at the list of [Dockerization examples](https://docs.docker.com/engine/examples/).
1701 1701
 
1702 1702
 ```
1703 1703
 # Nginx
... ...
@@ -159,7 +159,7 @@ installs Docker on them, then configures the Docker client to talk to them.
159 159
 
160 160
 ## node
161 161
 
162
-A [node](../swarm/how-swarm-mode-works/nodes.md) is a physical or virtual
162
+A [node](https://docs.docker.com/engine/swarm/how-swarm-mode-works/nodes/) is a physical or virtual
163 163
 machine running an instance of the Docker Engine in swarm mode.
164 164
 
165 165
 **Manager nodes** perform swarm management and orchestration duties. By default
... ...
@@ -198,7 +198,7 @@ and its [tags](https://hub.docker.com/r/library/nginx/tags/)
198 198
 
199 199
 ## service
200 200
 
201
-A [service](../swarm/how-swarm-mode-works/services.md) is the definition of how
201
+A [service](https://docs.docker.com/engine/swarm/how-swarm-mode-works/services/) is the definition of how
202 202
 you want to run your application containers in a swarm. At the most basic level
203 203
 a service  defines which container image to run in the swarm and which commands
204 204
 to run in the container. For orchestration purposes, the service defines the
... ...
@@ -212,7 +212,7 @@ environment.
212 212
 
213 213
 ## service discovery
214 214
 
215
-Swarm mode [service discovery](../swarm/networking.md) is a DNS component
215
+Swarm mode [service discovery](https://docs.docker.com/engine/swarm/networking/) is a DNS component
216 216
 internal to the swarm that automatically assigns each service on an overlay
217 217
 network in the swarm a VIP and DNS entry. Containers on the network share DNS
218 218
 mappings for the service via gossip so any container on the network can access
... ...
@@ -224,7 +224,7 @@ automatically distributes requests to the service VIP among the active tasks.
224 224
 
225 225
 ## swarm
226 226
 
227
-A [swarm](../swarm/index.md) is a cluster of one or more Docker Engines running in [swarm mode](#swarm-mode).
227
+A [swarm](https://docs.docker.com/engine/swarm/) is a cluster of one or more Docker Engines running in [swarm mode](#swarm-mode).
228 228
 
229 229
 ## Swarm
230 230
 
... ...
@@ -239,7 +239,7 @@ works with Docker can now transparently scale up to multiple hosts.
239 239
 
240 240
 ## swarm mode
241 241
 
242
-[Swarm mode](../swarm/index.md) refers to cluster management and orchestration
242
+[Swarm mode](https://docs.docker.com/engine/swarm/) refers to cluster management and orchestration
243 243
 features embedded in Docker Engine. When you initialize a new swarm (cluster) or
244 244
 join nodes to a swarm, the Docker Engine runs in swarm mode.
245 245
 
... ...
@@ -252,7 +252,7 @@ tags are how various images in a repository are distinguished from each other.
252 252
 
253 253
 ## task
254 254
 
255
-A [task](../swarm/how-swarm-mode-works/services.md#tasks-and-scheduling) is the
255
+A [task](https://docs.docker.com/engine/swarm/how-swarm-mode-works/services/#/tasks-and-scheduling) is the
256 256
 atomic unit of scheduling within a swarm. A task carries a Docker container and
257 257
 the commands to run inside the container. Manager nodes assign tasks to worker
258 258
 nodes according to the number of replicas set in the service scale.
... ...
@@ -260,7 +260,7 @@ nodes according to the number of replicas set in the service scale.
260 260
 The diagram below illustrates the relationship of services to tasks and
261 261
 containers.
262 262
 
263
-![services diagram](../swarm/images/services-diagram.png)
263
+![services diagram](https://docs.docker.com/engine/swarm/images/services-diagram.png)
264 264
 
265 265
 ## Toolbox
266 266
 
... ...
@@ -1253,7 +1253,7 @@ container's logging driver. The following options are supported:
1253 1253
 
1254 1254
 The `docker logs` command is available only for the `json-file` and `journald`
1255 1255
 logging drivers.  For detailed information on working with logging drivers, see
1256
-[Configure a logging driver](../admin/logging/overview.md).
1256
+[Configure a logging driver](https://docs.docker.com/engine/admin/logging/overview/).
1257 1257
 
1258 1258
 
1259 1259
 ## Overriding Dockerfile image defaults
... ...
@@ -1507,7 +1507,7 @@ The example below mounts an empty tmpfs into the container with the `rw`,
1507 1507
 
1508 1508
 The volumes commands are complex enough to have their own documentation
1509 1509
 in section [*Manage data in
1510
-containers*](../tutorials/dockervolumes.md). A developer can define
1510
+containers*](https://docs.docker.com/engine/tutorials/dockervolumes/). A developer can define
1511 1511
 one or more `VOLUME`'s associated with an image, but only the operator
1512 1512
 can give access from one container to another (or from a container to a
1513 1513
 volume mounted on the host).