diff --git a/cli/command/image/build.go b/cli/command/image/build.go index 11c4acb266..205b0adb83 100644 --- a/cli/command/image/build.go +++ b/cli/command/image/build.go @@ -305,8 +305,8 @@ func runBuild(dockerCli command.Cli, options buildOptions) error { progressOutput = &lastProgressOutput{output: progressOutput} } - // if up to this point nothing has set the context then we must have have - // another way for sending it(streaming) and set the context to the Dockerfile + // if up to this point nothing has set the context then we must have another + // way for sending it(streaming) and set the context to the Dockerfile if dockerfileCtx != nil && buildCtx == nil { buildCtx = dockerfileCtx } diff --git a/cli/config/configfile/file.go b/cli/config/configfile/file.go index babd63693b..9a923d3241 100644 --- a/cli/config/configfile/file.go +++ b/cli/config/configfile/file.go @@ -177,7 +177,7 @@ func (configFile *ConfigFile) Save() error { return configFile.SaveToWriter(f) } -// ParseProxyConfig computes proxy configuration by retreiving the config for the provided host and +// ParseProxyConfig computes proxy configuration by retrieving the config for the provided host and // then checking this against any environment variables provided to the container func (configFile *ConfigFile) ParseProxyConfig(host string, runOpts []string) map[string]*string { var cfgKey string diff --git a/cli/trust/trust.go b/cli/trust/trust.go index 3372c1312f..829ab84e39 100644 --- a/cli/trust/trust.go +++ b/cli/trust/trust.go @@ -299,7 +299,7 @@ type ImageRefAndAuth struct { } // GetImageReferencesAndAuth retrieves the necessary reference and auth information for an image name -// as a ImageRefAndAuth struct +// as an ImageRefAndAuth struct func GetImageReferencesAndAuth(ctx context.Context, authResolver func(ctx context.Context, index *registrytypes.IndexInfo) types.AuthConfig, imgName string) (ImageRefAndAuth, error) { ref, err := reference.ParseNormalizedNamed(imgName) if err != nil { diff --git a/docs/extend/config.md b/docs/extend/config.md index 912349c0cc..e68af3bf6a 100644 --- a/docs/extend/config.md +++ b/docs/extend/config.md @@ -126,7 +126,7 @@ Config provides the base accessible fields for working with V0 plugin format - **`propagatedMount`** *string* path to be mounted as rshared, so that mounts under that path are visible to docker. This is useful for volume plugins. - This path will be bind-mounted outisde of the plugin rootfs so it's contents + This path will be bind-mounted outside of the plugin rootfs so it's contents are preserved on upgrade. - **`env`** *PluginEnv array* diff --git a/docs/reference/builder.md b/docs/reference/builder.md index 0738f37561..a0f381c942 100644 --- a/docs/reference/builder.md +++ b/docs/reference/builder.md @@ -765,7 +765,7 @@ type of documentation between the person who builds the image and the person who runs the container, about which ports are intended to be published. To actually publish the port when running the container, use the `-p` flag on `docker run` to publish and map one or more ports, or the `-P` flag to publish all exposed -ports and map them to to high-order ports. +ports and map them to high-order ports. To set up port redirection on the host system, see [using the -P flag](run.md#expose-incoming-ports). The `docker network` command supports diff --git a/docs/reference/commandline/build.md b/docs/reference/commandline/build.md index 96fe673c52..01ab913eca 100644 --- a/docs/reference/commandline/build.md +++ b/docs/reference/commandline/build.md @@ -512,7 +512,7 @@ The `--squash` option has a number of known limitations: layers in tact, and one for the squashed version. - While squashing layers may produce smaller images, it may have a negative impact on performance, as a single layer takes longer to extract, and - downloading a single layer cannot be paralellized. + downloading a single layer cannot be parallelized. - When attempting to squash an image that does not make changes to the filesystem (for example, the Dockerfile only contains `ENV` instructions), the squash step will fail (see [issue #33823](https://github.com/moby/moby/issues/33823) diff --git a/docs/reference/commandline/create.md b/docs/reference/commandline/create.md index e80ba77094..446d5d81ab 100644 --- a/docs/reference/commandline/create.md +++ b/docs/reference/commandline/create.md @@ -217,7 +217,7 @@ For the `devicemapper`, `btrfs`, `windowsfilter` and `zfs` graph drivers, user cannot pass a size less than the Default BaseFS Size. For the `overlay2` storage driver, the size option is only available if the backing fs is `xfs` and mounted with the `pquota` mount option. -Under these conditions, user can pass any size less then the backing fs size. +Under these conditions, user can pass any size less than the backing fs size. ### Specify isolation technology for container (--isolation) diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md index a94d01ddd6..f8573910f1 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -393,7 +393,7 @@ $ sudo dockerd --storage-opt dm.thinp_autoextend_threshold=80 ##### `dm.thinp_autoextend_percent` -Sets the value percentage value to increase the thin pool by when when `lvm` +Sets the value percentage value to increase the thin pool by when `lvm` attempts to autoextend the available space [100 = disabled] ###### Example: diff --git a/docs/reference/commandline/inspect.md b/docs/reference/commandline/inspect.md index 65831ddb66..d650798318 100644 --- a/docs/reference/commandline/inspect.md +++ b/docs/reference/commandline/inspect.md @@ -47,7 +47,7 @@ describes all the details of the format. The `docker inspect` command matches any type of object by either ID or name. In some cases multiple type of objects (for example, a container and a volume) -exist with the same name, making the result ambigious. +exist with the same name, making the result ambiguous. To restrict `docker inspect` to a specific type of object, use the `--type` option. diff --git a/docs/reference/commandline/network_create.md b/docs/reference/commandline/network_create.md index 8fd8e54867..ae8da1d59b 100644 --- a/docs/reference/commandline/network_create.md +++ b/docs/reference/commandline/network_create.md @@ -204,7 +204,7 @@ to create an externally isolated `overlay` network, you can specify the You can create the network which will be used to provide the routing-mesh in the swarm cluster. You do so by specifying `--ingress` when creating the network. Only one ingress network can be created at the time. The network can be removed only -if no services depend on it. Any option available when creating a overlay network +if no services depend on it. Any option available when creating an overlay network is also available when creating the ingress network, besides the `--attachable` option. ```bash diff --git a/docs/reference/commandline/network_inspect.md b/docs/reference/commandline/network_inspect.md index c05035b905..467c1d2443 100644 --- a/docs/reference/commandline/network_inspect.md +++ b/docs/reference/commandline/network_inspect.md @@ -207,7 +207,7 @@ $ docker network inspect ingress details such as the service's VIP and port mappings. It also shows IPs of service tasks, and the IPs of the nodes where the tasks are running. -Following is an example output for a overlay network `ov1` that has one service `s1` +Following is an example output for an overlay network `ov1` that has one service `s1` attached to. service `s1` in this case has three replicas. ```bash diff --git a/docs/reference/commandline/run.md b/docs/reference/commandline/run.md index a955014fb2..b6f278c146 100644 --- a/docs/reference/commandline/run.md +++ b/docs/reference/commandline/run.md @@ -240,7 +240,7 @@ For the `devicemapper`, `btrfs`, `windowsfilter` and `zfs` graph drivers, user cannot pass a size less than the Default BaseFS Size. For the `overlay2` storage driver, the size option is only available if the backing fs is `xfs` and mounted with the `pquota` mount option. -Under these conditions, user can pass any size less then the backing fs size. +Under these conditions, user can pass any size less than the backing fs size. ### Mount tmpfs (--tmpfs) diff --git a/docs/reference/commandline/service_create.md b/docs/reference/commandline/service_create.md index f970475ae9..fda08009a4 100644 --- a/docs/reference/commandline/service_create.md +++ b/docs/reference/commandline/service_create.md @@ -353,7 +353,7 @@ volumes in a service:
  • default: Equivalent to consistent.
  • consistent: Full consistency. The container runtime and the host maintain an identical view of the mount at all times.
  • cached: The host's view of the mount is authoritative. There may be delays before updates made on the host are visible within a container.
    • -
  • delegated: The container runtime's view of the mount is authoritative. There may be delays before updates made in a container are are visible on the host.
    • +
  • delegated: The container runtime's view of the mount is authoritative. There may be delays before updates made in a container are visible on the host.

    • diff --git a/experimental/vlan-networks.md b/experimental/vlan-networks.md index 13eb5981d1..f0309b1a9e 100644 --- a/experimental/vlan-networks.md +++ b/experimental/vlan-networks.md @@ -220,7 +220,7 @@ $$ ip a show eth0 The mode ` -o ipvlan_mode=l3` must be explicitly specified since the default ipvlan mode is `l2`. -The following example does not specify a parent interface. The network drivers will create a dummy type link for the user rather then rejecting the network creation and isolating containers from only communicating with one another. +The following example does not specify a parent interface. The network drivers will create a dummy type link for the user rather than rejecting the network creation and isolating containers from only communicating with one another. ``` # Create the Ipvlan L3 network diff --git a/man/docker-run.1.md b/man/docker-run.1.md index 6dbe8945b2..66f482101c 100644 --- a/man/docker-run.1.md +++ b/man/docker-run.1.md @@ -582,7 +582,7 @@ incompatible with any restart policy other than `none`. This option is only available for the `devicemapper`, `btrfs`, `overlay2` and `zfs` graph drivers. For the `devicemapper`, `btrfs` and `zfs` storage drivers, user cannot pass a size less than the Default BaseFS Size. For the `overlay2` storage driver, the size option is only available if the backing fs is `xfs` and mounted with the `pquota` mount option. - Under these conditions, user can pass any size less then the backing fs size. + Under these conditions, user can pass any size less than the backing fs size. **--stop-signal**=*SIGTERM* Signal to stop a container. Default is SIGTERM. diff --git a/man/dockerd.8.md b/man/dockerd.8.md index 733cc20f88..5ff7dcd331 100644 --- a/man/dockerd.8.md +++ b/man/dockerd.8.md @@ -480,7 +480,7 @@ autoextend the available space [100 = disabled] ##### dm.thinp_autoextend_percent -Sets the value percentage value to increase the thin pool by when when `lvm` +Sets the value percentage value to increase the thin pool by when `lvm` attempts to autoextend the available space [100 = disabled] ###### Example: diff --git a/man/src/network/create.md b/man/src/network/create.md index 6915cdd354..79da86d756 100644 --- a/man/src/network/create.md +++ b/man/src/network/create.md @@ -123,7 +123,7 @@ to create an externally isolated `overlay` network, you can specify the You can create the network which will be used to provide the routing-mesh in the swarm cluster. You do so by specifying `--ingress` when creating the network. Only one ingress network can be created at the time. The network can be removed only -if no services depend on it. Any option available when creating a overlay network +if no services depend on it. Any option available when creating an overlay network is also available when creating the ingress network, besides the `--attachable` option. ```bash diff --git a/man/src/network/inspect.md b/man/src/network/inspect.md index 91cb2dae32..a42db71ce5 100644 --- a/man/src/network/inspect.md +++ b/man/src/network/inspect.md @@ -92,7 +92,7 @@ $ docker network inspect simple-network details such as the service's VIP and port mappings. It also shows IPs of service tasks, and the IPs of the nodes where the tasks are running. -Following is an example output for a overlay network `ov1` that has one service `s1` +Following is an example output for an overlay network `ov1` that has one service `s1` attached to. service `s1` in this case has three replicas. ```bash