Skip to content

Commit 524fd15

Browse files
Merge pull request #6380 from thaJeztah/28.x_backport_docs_fixes
[28.x backport] docs fixes and fix flag annotation
2 parents 07bcb9c + 3b68cde commit 524fd15

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cli/command/service/update.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ func newUpdateCommand(dockerCLI command.Cli) *cobra.Command {
112112

113113
// Add needs parsing, Remove only needs the key
114114
flags.Var(newListOptsVar(), flagGenericResourcesRemove, "Remove a Generic resource")
115-
flags.SetAnnotation(flagHostAdd, "version", []string{"1.32"})
115+
flags.SetAnnotation(flagGenericResourcesRemove, "version", []string{"1.32"})
116116
flags.Var(newListOptsVarWithValidator(ValidateSingleGenericResource), flagGenericResourcesAdd, "Add a Generic resource")
117-
flags.SetAnnotation(flagHostAdd, "version", []string{"1.32"})
117+
flags.SetAnnotation(flagGenericResourcesAdd, "version", []string{"1.32"})
118118

119119
// TODO(thaJeztah): add completion for capabilities, stop-signal (currently non-exported in container package)
120120
// _ = cmd.RegisterFlagCompletionFunc(flagCapAdd, completeLinuxCapabilityNames)

docs/reference/run.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ $ docker run -it --mount type=bind,source=[PATH],target=[PATH] busybox
248248
```
249249

250250
In this case, the `--mount` flag takes three parameters. A type (`bind`), and
251-
two paths. The `source` path is a the location on the host that you want to
251+
two paths. The `source` path is the location on the host that you want to
252252
bind mount into the container. The `target` path is the mount destination
253253
inside the container.
254254

@@ -419,7 +419,7 @@ $ docker run -it -m 300M ubuntu:24.04 /bin/bash
419419

420420
We set memory limit only, this means the processes in the container can use
421421
300M memory and 300M swap memory, by default, the total virtual memory size
422-
(--memory-swap) will be set as double of memory, in this case, memory + swap
422+
(`--memory-swap`) will be set as double of memory, in this case, memory + swap
423423
would be 2*300M, so processes can use 300M swap memory as well.
424424

425425
```console
@@ -1087,7 +1087,7 @@ Additionally, you can set any environment variable in the container by using
10871087
one or more `-e` flags. You can even override the variables mentioned above, or
10881088
variables defined using a Dockerfile `ENV` instruction when building the image.
10891089

1090-
If the you name an environment variable without specifying a value, the current
1090+
If you name an environment variable without specifying a value, the current
10911091
value of the named variable on the host is propagated into the container's
10921092
environment:
10931093

0 commit comments

Comments
 (0)