Skip to content

Commit 666e4d5

Browse files
vvolandvvoland
authored
Merge pull request #6980 from thaJeztah/grammar_fixes
docs: minor grammar fixes
2 parents d090f98 + e4d651d commit 666e4d5

14 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎cli/command/container/cp.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ container source to stdout.`,
158158
}
159159

160160
flags := cmd.Flags()
161-
flags.BoolVarP(&opts.followLink, "follow-link", "L", false, "Always follow symbol link in SRC_PATH")
161+
flags.BoolVarP(&opts.followLink, "follow-link", "L", false, "Always follow symlinks in SRC_PATH")
162162
flags.BoolVarP(&opts.copyUIDGID, "archive", "a", false, "Archive mode (copy all uid/gid information)")
163163
flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Suppress progress output during copy. Progress output is automatically suppressed if no terminal is attached")
164164
return cmd
@@ -271,7 +271,7 @@ func copyFromContainer(ctx context.Context, dockerCLI command.Cli, copyConfig cp
271271
}
272272

273273
apiClient := dockerCLI.Client()
274-
// if client requests to follow symbol link, then must decide target file to be copied
274+
// if client requests to follow symlinks, then must decide target file to be copied
275275
var rebaseName string
276276
if copyConfig.followLink {
277277
src, err := apiClient.ContainerStatPath(ctx, copyConfig.container, client.ContainerStatPathOptions{

‎contrib/completion/fish/docker.fish‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -a '(__fish_pri
170170
# cp
171171
complete -c docker -f -n '__fish_docker_no_subcommand' -a cp -d "Copy files/folders between a container and the local filesystem"
172172
complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -s a -l archive -d 'Archive mode (copy all uid/gid information)'
173-
complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -s L -l follow-link -d 'Always follow symbol link in SRC_PATH'
173+
complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -s L -l follow-link -d 'Always follow symlinks in SRC_PATH'
174174
complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -l help -d 'Print usage'
175175

176176
# create

‎contrib/completion/zsh/_docker‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ __docker_container_subcommand() {
706706
local state
707707
_arguments $(__docker_arguments) \
708708
$opts_help \
709-
"($help -L --follow-link)"{-L,--follow-link}"[Always follow symbol link]" \
709+
"($help -L --follow-link)"{-L,--follow-link}"[Always follow symlinks]" \
710710
"($help -)1:container:->container" \
711711
"($help -)2:hostpath:_files" && ret=0
712712
case $state in

‎docs/reference/commandline/config_ls.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ The following filter matches only services with the `project` label with the
8282
`project-a` value.
8383

8484
```console
85-
$ docker service ls --filter label=project=test
85+
$ docker config ls --filter label=project=project-a
8686

8787
ID NAME CREATED UPDATED
8888
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.
9595
The following filter matches config with a name containing a prefix of `test`.
9696

9797
```console
98-
$ docker config ls --filter name=test_config
98+
$ docker config ls --filter name=test
9999

100100
ID NAME CREATED UPDATED
101101
mem02h8n73mybpgqjf0kfi1n0 test_config About an hour ago About an hour ago

‎docs/reference/commandline/container_cp.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ container source to stdout.
1717
| Name | Type | Default | Description |
1818
|:----------------------|:-------|:--------|:-------------------------------------------------------------------------------------------------------------|
1919
| `-a`, `--archive` | `bool` | | Archive mode (copy all uid/gid information) |
20-
| `-L`, `--follow-link` | `bool` | | Always follow symbol link in SRC_PATH |
20+
| `-L`, `--follow-link` | `bool` | | Always follow symlinks in SRC_PATH |
2121
| `-q`, `--quiet` | `bool` | | Suppress progress output during copy. Progress output is automatically suppressed if no terminal is attached |
2222

2323

‎docs/reference/commandline/container_ls.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ CONTAINER ID IMAGE COMMAND CREATED
128128
9b6247364a03 busybox "top" 2 minutes ago Up 2 minutes nostalgic_stallman
129129
```
130130

131-
You can also filter for a substring in a name as this shows:
131+
You can filter for a substring in a name as this shows:
132132

133133
```console
134134
$ docker ps --filter "name=nostalgic"

‎docs/reference/commandline/cp.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ container source to stdout.
1717
| Name | Type | Default | Description |
1818
|:----------------------|:-------|:--------|:-------------------------------------------------------------------------------------------------------------|
1919
| `-a`, `--archive` | `bool` | | Archive mode (copy all uid/gid information) |
20-
| `-L`, `--follow-link` | `bool` | | Always follow symbol link in SRC_PATH |
20+
| `-L`, `--follow-link` | `bool` | | Always follow symlinks in SRC_PATH |
2121
| `-q`, `--quiet` | `bool` | | Suppress progress output during copy. Progress output is automatically suppressed if no terminal is attached |
2222

2323

‎docs/reference/commandline/image_build.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ COPY failed: forbidden path outside the build context: ../../some-dir ()
113113
```
114114

115115
BuildKit on the other hand strips leading relative paths that traverse outside
116-
of the build context. Re-using the previous example, the path `COPY
116+
of the build context. Reusing the previous example, the path `COPY
117117
../../some-dir .` evaluates to `COPY some-dir .` with BuildKit.
118118

119119
## Examples

‎docs/reference/commandline/image_pull.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ use `docker pull`.
3232
### Proxy configuration
3333

3434
If you are behind an HTTP proxy server, for example in corporate settings,
35-
before open a connect to registry, you may need to configure the Docker
36-
daemon's proxy settings, refer to the [dockerd command-line reference](https://docs.docker.com/reference/cli/dockerd/#proxy-configuration)
37-
for details.
35+
you may have to configure the Docker daemon to use the proxy server for
36+
operations such as pulling and pushing images. Refer to the
37+
[dockerd command-line reference](https://docs.docker.com/reference/cli/dockerd/#proxy-configuration) for details.
3838

3939
### Concurrent downloads
4040

41-
By default the Docker daemon will pull three layers of an image at a time.
41+
By default the Docker daemon downloads three layers of an image at a time.
4242
If you are on a low bandwidth connection this may cause timeout issues and you may want to lower
4343
this via the `--max-concurrent-downloads` daemon option. See the
4444
[daemon documentation](https://docs.docker.com/reference/cli/dockerd/) for more details.

‎docs/reference/commandline/secret_ls.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ The following filter matches only services with the `project` label with the
8282
`project-a` value.
8383

8484
```console
85-
$ docker service ls --filter label=project=test
85+
$ docker secret ls --filter label=project=project-a
8686

8787
ID NAME CREATED UPDATED
8888
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.
9595
The following filter matches secret with a name containing a prefix of `test`.
9696

9797
```console
98-
$ docker secret ls --filter name=test_secret
98+
$ docker secret ls --filter name=test
9999

100100
ID NAME CREATED UPDATED
101101
mem02h8n73mybpgqjf0kfi1n0 test_secret About an hour ago About an hour ago

0 commit comments

Comments
 (0)