diff --git a/cli/command/container/cp.go b/cli/command/container/cp.go index 8193e8b04fe2..fbce9df646e5 100644 --- a/cli/command/container/cp.go +++ b/cli/command/container/cp.go @@ -158,7 +158,7 @@ container source to stdout.`, } flags := cmd.Flags() - flags.BoolVarP(&opts.followLink, "follow-link", "L", false, "Always follow symbol link in SRC_PATH") + flags.BoolVarP(&opts.followLink, "follow-link", "L", false, "Always follow symlinks in SRC_PATH") flags.BoolVarP(&opts.copyUIDGID, "archive", "a", false, "Archive mode (copy all uid/gid information)") flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Suppress progress output during copy. Progress output is automatically suppressed if no terminal is attached") return cmd @@ -271,7 +271,7 @@ func copyFromContainer(ctx context.Context, dockerCLI command.Cli, copyConfig cp } apiClient := dockerCLI.Client() - // if client requests to follow symbol link, then must decide target file to be copied + // if client requests to follow symlinks, then must decide target file to be copied var rebaseName string if copyConfig.followLink { src, err := apiClient.ContainerStatPath(ctx, copyConfig.container, client.ContainerStatPathOptions{ diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index a18626bca84b..aa2b543f6bcd 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -170,7 +170,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -a '(__fish_pri # cp complete -c docker -f -n '__fish_docker_no_subcommand' -a cp -d "Copy files/folders between a container and the local filesystem" complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -s a -l archive -d 'Archive mode (copy all uid/gid information)' -complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -s L -l follow-link -d 'Always follow symbol link in SRC_PATH' +complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -s L -l follow-link -d 'Always follow symlinks in SRC_PATH' complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -l help -d 'Print usage' # create diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index a5bc35de6d12..8ccbffe58fba 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -706,7 +706,7 @@ __docker_container_subcommand() { local state _arguments $(__docker_arguments) \ $opts_help \ - "($help -L --follow-link)"{-L,--follow-link}"[Always follow symbol link]" \ + "($help -L --follow-link)"{-L,--follow-link}"[Always follow symlinks]" \ "($help -)1:container:->container" \ "($help -)2:hostpath:_files" && ret=0 case $state in diff --git a/docs/reference/commandline/config_ls.md b/docs/reference/commandline/config_ls.md index 1f5ad9e844ab..0678b1ce95a2 100644 --- a/docs/reference/commandline/config_ls.md +++ b/docs/reference/commandline/config_ls.md @@ -82,7 +82,7 @@ The following filter matches only services with the `project` label with the `project-a` value. ```console -$ docker service ls --filter label=project=test +$ docker config ls --filter label=project=project-a ID NAME CREATED UPDATED mem02h8n73mybpgqjf0kfi1n0 test_config About an hour ago About an hour ago @@ -95,7 +95,7 @@ The `name` filter matches on all or prefix of a config's name. The following filter matches config with a name containing a prefix of `test`. ```console -$ docker config ls --filter name=test_config +$ docker config ls --filter name=test ID NAME CREATED UPDATED mem02h8n73mybpgqjf0kfi1n0 test_config About an hour ago About an hour ago diff --git a/docs/reference/commandline/container_cp.md b/docs/reference/commandline/container_cp.md index 9a6166625988..8d8958bb37b7 100644 --- a/docs/reference/commandline/container_cp.md +++ b/docs/reference/commandline/container_cp.md @@ -17,7 +17,7 @@ container source to stdout. | Name | Type | Default | Description | |:----------------------|:-------|:--------|:-------------------------------------------------------------------------------------------------------------| | `-a`, `--archive` | `bool` | | Archive mode (copy all uid/gid information) | -| `-L`, `--follow-link` | `bool` | | Always follow symbol link in SRC_PATH | +| `-L`, `--follow-link` | `bool` | | Always follow symlinks in SRC_PATH | | `-q`, `--quiet` | `bool` | | Suppress progress output during copy. Progress output is automatically suppressed if no terminal is attached | diff --git a/docs/reference/commandline/container_ls.md b/docs/reference/commandline/container_ls.md index 5b2481fe13e1..bdbff11e70c6 100644 --- a/docs/reference/commandline/container_ls.md +++ b/docs/reference/commandline/container_ls.md @@ -128,7 +128,7 @@ CONTAINER ID IMAGE COMMAND CREATED 9b6247364a03 busybox "top" 2 minutes ago Up 2 minutes nostalgic_stallman ``` -You can also filter for a substring in a name as this shows: +You can filter for a substring in a name as this shows: ```console $ docker ps --filter "name=nostalgic" diff --git a/docs/reference/commandline/cp.md b/docs/reference/commandline/cp.md index ded96d696643..085f089e133b 100644 --- a/docs/reference/commandline/cp.md +++ b/docs/reference/commandline/cp.md @@ -17,7 +17,7 @@ container source to stdout. | Name | Type | Default | Description | |:----------------------|:-------|:--------|:-------------------------------------------------------------------------------------------------------------| | `-a`, `--archive` | `bool` | | Archive mode (copy all uid/gid information) | -| `-L`, `--follow-link` | `bool` | | Always follow symbol link in SRC_PATH | +| `-L`, `--follow-link` | `bool` | | Always follow symlinks in SRC_PATH | | `-q`, `--quiet` | `bool` | | Suppress progress output during copy. Progress output is automatically suppressed if no terminal is attached | diff --git a/docs/reference/commandline/image_build.md b/docs/reference/commandline/image_build.md index 862b00bdc62f..5a7a00717b29 100644 --- a/docs/reference/commandline/image_build.md +++ b/docs/reference/commandline/image_build.md @@ -113,7 +113,7 @@ COPY failed: forbidden path outside the build context: ../../some-dir () ``` BuildKit on the other hand strips leading relative paths that traverse outside -of the build context. Re-using the previous example, the path `COPY +of the build context. Reusing the previous example, the path `COPY ../../some-dir .` evaluates to `COPY some-dir .` with BuildKit. ## Examples diff --git a/docs/reference/commandline/image_pull.md b/docs/reference/commandline/image_pull.md index aad73fe29ade..beb270660aa6 100644 --- a/docs/reference/commandline/image_pull.md +++ b/docs/reference/commandline/image_pull.md @@ -32,13 +32,13 @@ use `docker pull`. ### Proxy configuration If you are behind an HTTP proxy server, for example in corporate settings, -before open a connect to registry, you may need to configure the Docker -daemon's proxy settings, refer to the [dockerd command-line reference](https://docs.docker.com/reference/cli/dockerd/#proxy-configuration) -for details. +you may have to configure the Docker daemon to use the proxy server for +operations such as pulling and pushing images. Refer to the +[dockerd command-line reference](https://docs.docker.com/reference/cli/dockerd/#proxy-configuration) for details. ### Concurrent downloads -By default the Docker daemon will pull three layers of an image at a time. +By default the Docker daemon downloads three layers of an image at a time. If you are on a low bandwidth connection this may cause timeout issues and you may want to lower this via the `--max-concurrent-downloads` daemon option. See the [daemon documentation](https://docs.docker.com/reference/cli/dockerd/) for more details. diff --git a/docs/reference/commandline/secret_ls.md b/docs/reference/commandline/secret_ls.md index 2137bbc7e269..4f6e647d314a 100644 --- a/docs/reference/commandline/secret_ls.md +++ b/docs/reference/commandline/secret_ls.md @@ -82,7 +82,7 @@ The following filter matches only services with the `project` label with the `project-a` value. ```console -$ docker service ls --filter label=project=test +$ docker secret ls --filter label=project=project-a ID NAME CREATED UPDATED mem02h8n73mybpgqjf0kfi1n0 test_secret About an hour ago About an hour ago @@ -95,7 +95,7 @@ The `name` filter matches on all or prefix of a secret's name. The following filter matches secret with a name containing a prefix of `test`. ```console -$ docker secret ls --filter name=test_secret +$ docker secret ls --filter name=test ID NAME CREATED UPDATED mem02h8n73mybpgqjf0kfi1n0 test_secret About an hour ago About an hour ago diff --git a/docs/reference/commandline/swarm_ca.md b/docs/reference/commandline/swarm_ca.md index 49c2730aa9a7..337912db80e6 100644 --- a/docs/reference/commandline/swarm_ca.md +++ b/docs/reference/commandline/swarm_ca.md @@ -58,7 +58,7 @@ desired root digest: sha256:05da740cf2577a25224c53019e2cce99bcc5ba09664ad6bb2a94 rotated CA certificates: [> ] 0/2 nodes ``` -Once the rotation os finished (all the progress bars have completed) the now-current +Once the rotation is finished (all the progress bars have completed) the now-current CA certificate will be printed: ```console diff --git a/man/docker-run.1.md b/man/docker-run.1.md index a2241e0ffc35..f1a212b95dd8 100644 --- a/man/docker-run.1.md +++ b/man/docker-run.1.md @@ -734,7 +734,7 @@ any options, the systems uses the following options: **-u**, **--user**="" Sets the username or UID used and optionally the groupname or GID for the specified command. - The followings examples are all valid: + The following examples are all valid: --user [user | user:group | uid | uid:gid | user:gid | uid:group ] Without this argument the command will be run as root in the container. diff --git a/man/src/container/exec.md b/man/src/container/exec.md index 82d1428d45f7..0b7deb13c9db 100644 --- a/man/src/container/exec.md +++ b/man/src/container/exec.md @@ -19,7 +19,7 @@ the same capabilities as the container, which may be limited. Set # USER `user` sets the username or UID used and optionally the groupname or GID for the specified command. - The followings examples are all valid: + The following examples are all valid: --user [user | user:group | uid | uid:gid | user:gid | uid:group ] Without this argument the command will be run as root in the container. diff --git a/man/src/volume.md b/man/src/volume.md index 0a09a41da381..6f006595d49a 100644 --- a/man/src/volume.md +++ b/man/src/volume.md @@ -1,5 +1,5 @@ The `docker volume` command has subcommands for managing data volumes. A data -volume is a specially-designated directory that by-passes storage driver +volume is a specially-designated directory that bypasses storage driver management. Data volumes persist data independent of a container's life cycle. When you