From b6def77c551495618a764f43219dc341231694d7 Mon Sep 17 00:00:00 2001 From: wanglei Date: Wed, 16 May 2018 20:16:08 +0800 Subject: [PATCH] Developer Certificate of Origin Version 1.1 Copyright (C) 2004, 2006 The Linux Foundation and its contributors. 1 Letterman Drive Suite D4700 San Francisco, CA, 94129 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Developer's Certificate of Origin 1.1 By making a contribution to this project, I certify that: (a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or (b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or (c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it. (d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved. Signed-off-by: nkwangleiGIT --- docs/reference/commandline/build.md | 2 +- docs/reference/commandline/cli.md | 2 +- docs/reference/commandline/dockerd.md | 2 +- docs/reference/commandline/export.md | 2 +- docs/reference/commandline/logs.md | 2 +- docs/reference/commandline/network_connect.md | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/reference/commandline/build.md b/docs/reference/commandline/build.md index 3dfed3fffe..531a0c82a8 100644 --- a/docs/reference/commandline/build.md +++ b/docs/reference/commandline/build.md @@ -508,7 +508,7 @@ images (saving space). For most use cases, multi-stage are a better alternative, as they give more fine-grained control over your build, and can take advantage of future -optimizations in the builder. Refer to the [use multi-stage builds](https://docs.docker.com/engine/userguide/eng-image/multistage-build/) +optimizations in the builder. Refer to the [use multi-stage builds](https://docs.docker.com/develop/develop-images/multistage-build/) section in the userguide for more information. diff --git a/docs/reference/commandline/cli.md b/docs/reference/commandline/cli.md index f290c53250..ebb9faae27 100644 --- a/docs/reference/commandline/cli.md +++ b/docs/reference/commandline/cli.md @@ -51,7 +51,7 @@ each `docker` command with `sudo`. To avoid having to use `sudo` with the `docker` and add users to it. For more information about installing Docker or `sudo` configuration, refer to -the [installation](https://docs.docker.com/engine/installation/) instructions for your operating system. +the [installation](https://docs.docker.com/install/) instructions for your operating system. ### Environment variables diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md index 44cb8c4b28..3dc4fd5aed 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -1425,7 +1425,7 @@ The list of currently supported options that can be reconfigured is this: - `cluster-store-opts`: it uses the new options to reload the discovery store. - `cluster-advertise`: it modifies the address advertised after reloading. - `labels`: it replaces the daemon labels with a new set of labels. -- `live-restore`: Enables [keeping containers alive during daemon downtime](https://docs.docker.com/engine/admin/live-restore/). +- `live-restore`: Enables [keeping containers alive during daemon downtime](https://docs.docker.com/config/containers/live-restore/). - `max-concurrent-downloads`: it updates the max concurrent downloads for each pull. - `max-concurrent-uploads`: it updates the max concurrent uploads for each push. - `default-runtime`: it updates the runtime to be used if not is diff --git a/docs/reference/commandline/export.md b/docs/reference/commandline/export.md index 8ceee8b16b..88663e4f33 100644 --- a/docs/reference/commandline/export.md +++ b/docs/reference/commandline/export.md @@ -32,7 +32,7 @@ with the container. If a volume is mounted on top of an existing directory in the container, `docker export` will export the contents of the *underlying* directory, not the contents of the volume. -Refer to [Backup, restore, or migrate data volumes](https://docs.docker.com/engine/tutorials/dockervolumes/#backup-restore-or-migrate-data-volumes) +Refer to [Backup, restore, or migrate data volumes](https://docs.docker.com/v17.03/engine/tutorials/dockervolumes/#backup-restore-or-migrate-data-volumes) in the user guide for examples on exporting data in a volume. ## Examples diff --git a/docs/reference/commandline/logs.md b/docs/reference/commandline/logs.md index d004b44f90..dc624d8b67 100644 --- a/docs/reference/commandline/logs.md +++ b/docs/reference/commandline/logs.md @@ -38,7 +38,7 @@ The `docker logs` command batch-retrieves logs present at the time of execution. > the `json-file` or `journald` logging driver. For more information about selecting and configuring logging drivers, refer to -[Configure logging drivers](https://docs.docker.com/engine/admin/logging/overview/). +[Configure logging drivers](https://docs.docker.com/config/containers/logging/configure/). The `docker logs --follow` command will continue streaming the new output from the container's `STDOUT` and `STDERR`. diff --git a/docs/reference/commandline/network_connect.md b/docs/reference/commandline/network_connect.md index 0cdcfd6c2d..bf3ab37959 100644 --- a/docs/reference/commandline/network_connect.md +++ b/docs/reference/commandline/network_connect.md @@ -113,5 +113,5 @@ You can connect a container to one or more networks. The networks need not be th * [network ls](network_ls.md) * [network rm](network_rm.md) * [network prune](network_prune.md) -* [Understand Docker container networks](https://docs.docker.com/engine/userguide/networking/) -* [Work with networks](https://docs.docker.com/engine/userguide/networking/work-with-networks/) +* [Understand Docker container networks](https://docs.docker.com/network/) +* [Work with networks](https://docs.docker.com/network/bridge/)