From 34bac6f06e90f49587b9e2811a9f6db061ed106c Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Sat, 29 Oct 2016 15:03:26 +0800 Subject: [PATCH] Fix bunch of typos Signed-off-by: Qiang Huang Upstream-commit: e6866492c4492db3bb9546afa2fbaed20f4c1883 Component: engine --- components/engine/CHANGELOG.md | 2 +- components/engine/CONTRIBUTING.md | 2 +- components/engine/api/swagger.yaml | 2 +- components/engine/api/types/swarm/node.go | 2 +- components/engine/builder/dockerfile/internals.go | 2 +- components/engine/cli/command/registry/logout.go | 2 +- components/engine/cli/command/swarm/join_token.go | 2 +- components/engine/container/memory_store.go | 2 +- components/engine/contrib/docker-device-tool/README.md | 2 +- components/engine/daemon/cluster/executor/container/validate.go | 2 +- components/engine/daemon/monitor.go | 2 +- components/engine/daemon/volumes.go | 2 +- components/engine/docs/reference/builder.md | 2 +- .../engine/docs/reference/commandline/swarm_join_token.md | 2 +- components/engine/hack/make.sh | 2 +- components/engine/hack/release.sh | 2 +- components/engine/image/spec/v1.1.md | 2 +- components/engine/image/spec/v1.2.md | 2 +- components/engine/integration-cli/docker_cli_cp_test.go | 2 +- components/engine/integration-cli/docker_cli_run_test.go | 2 +- components/engine/man/docker-create.1.md | 2 +- components/engine/man/docker-run.1.md | 2 +- components/engine/man/docker-update.1.md | 2 +- components/engine/pkg/archive/archive.go | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/components/engine/CHANGELOG.md b/components/engine/CHANGELOG.md index 706c2ab341..106979b5b6 100644 --- a/components/engine/CHANGELOG.md +++ b/components/engine/CHANGELOG.md @@ -1287,7 +1287,7 @@ by another client (#15489) #### Security - Fix tar breakout vulnerability * Extractions are now sandboxed chroot -- Security options are no longer comitted to images +- Security options are no longer committed to images #### Runtime - Fix deadlock in `docker ps -f exited=1` diff --git a/components/engine/CONTRIBUTING.md b/components/engine/CONTRIBUTING.md index 2a4767aeac..eb5f8ab0e9 100644 --- a/components/engine/CONTRIBUTING.md +++ b/components/engine/CONTRIBUTING.md @@ -123,7 +123,7 @@ However, there might be a way to implement that feature *on top of* Docker. group is for contributors and other people contributing to the Docker project. You can join them without a google account by sending an email to docker-dev+subscribe@googlegroups.com. - After receiving the join-request message, you can simply reply to that to confirm the subscribtion. + After receiving the join-request message, you can simply reply to that to confirm the subscription. diff --git a/components/engine/api/swagger.yaml b/components/engine/api/swagger.yaml index 84676ac431..48d9b1cad4 100644 --- a/components/engine/api/swagger.yaml +++ b/components/engine/api/swagger.yaml @@ -4031,7 +4031,7 @@ paths: post: summary: "Build an image" description: | - Build an image from a tar achive with a Dockerfile in it. + Build an image from a tar archive with a Dockerfile in it. The Dockerfile specifies how the image is built from the tar archive. It is typically in the archive's root, but can be at a different path or have a different name by specifying the `dockerfile` parameter. [See the Dockerfile reference for more information](https://docs.docker.com/engine/reference/builder/). diff --git a/components/engine/api/types/swarm/node.go b/components/engine/api/types/swarm/node.go index 785e76e345..028b67d6f8 100644 --- a/components/engine/api/types/swarm/node.go +++ b/components/engine/api/types/swarm/node.go @@ -54,7 +54,7 @@ type NodeDescription struct { Engine EngineDescription `json:",omitempty"` } -// Platform represents the platfrom (Arch/OS). +// Platform represents the platform (Arch/OS). type Platform struct { Architecture string `json:",omitempty"` OS string `json:",omitempty"` diff --git a/components/engine/builder/dockerfile/internals.go b/components/engine/builder/dockerfile/internals.go index cf1015ca46..0b6c994894 100644 --- a/components/engine/builder/dockerfile/internals.go +++ b/components/engine/builder/dockerfile/internals.go @@ -410,7 +410,7 @@ func (b *Builder) processImageFrom(img builder.Image) error { fmt.Fprintf(b.Stderr, "# Executing %d build %s...\n", nTriggers, word) } - // Copy the ONBUILD triggers, and remove them from the config, since the config will be comitted. + // Copy the ONBUILD triggers, and remove them from the config, since the config will be committed. onBuildTriggers := b.runConfig.OnBuild b.runConfig.OnBuild = []string{} diff --git a/components/engine/cli/command/registry/logout.go b/components/engine/cli/command/registry/logout.go index 5d80595ff0..a735818049 100644 --- a/components/engine/cli/command/registry/logout.go +++ b/components/engine/cli/command/registry/logout.go @@ -47,7 +47,7 @@ func runLogout(dockerCli *command.DockerCli, serverAddress string) error { ) if !isDefaultRegistry { hostnameAddress = registry.ConvertToHostname(serverAddress) - // the tries below are kept for backward compatibily where a user could have + // the tries below are kept for backward compatibility where a user could have // saved the registry in one of the following format. regsToTry = append(regsToTry, hostnameAddress, "http://"+hostnameAddress, "https://"+hostnameAddress) } diff --git a/components/engine/cli/command/swarm/join_token.go b/components/engine/cli/command/swarm/join_token.go index b411202083..3a17a8020f 100644 --- a/components/engine/cli/command/swarm/join_token.go +++ b/components/engine/cli/command/swarm/join_token.go @@ -46,7 +46,7 @@ func newJoinTokenCommand(dockerCli *command.DockerCli) *cobra.Command { return err } if !quiet { - fmt.Fprintf(dockerCli.Out(), "Succesfully rotated %s join token.\n\n", args[0]) + fmt.Fprintf(dockerCli.Out(), "Successfully rotated %s join token.\n\n", args[0]) } } diff --git a/components/engine/container/memory_store.go b/components/engine/container/memory_store.go index 9fa1165d9a..c218f63405 100644 --- a/components/engine/container/memory_store.go +++ b/components/engine/container/memory_store.go @@ -64,7 +64,7 @@ func (c *memoryStore) First(filter StoreFilter) *Container { } // ApplyAll calls the reducer function with every container in the store. -// This operation is asyncronous in the memory store. +// This operation is asynchronous in the memory store. // NOTE: Modifications to the store MUST NOT be done by the StoreReducer. func (c *memoryStore) ApplyAll(apply StoreReducer) { wg := new(sync.WaitGroup) diff --git a/components/engine/contrib/docker-device-tool/README.md b/components/engine/contrib/docker-device-tool/README.md index 1bf11d202c..6c54d5995f 100644 --- a/components/engine/contrib/docker-device-tool/README.md +++ b/components/engine/contrib/docker-device-tool/README.md @@ -10,5 +10,5 @@ Compile ## inside build container $ go build contrib/docker-device-tool/device_tool.go - # if devicemapper version is old and compliation fails, compile with `libdm_no_deferred_remove` tag + # if devicemapper version is old and compilation fails, compile with `libdm_no_deferred_remove` tag $ go build -tags libdm_no_deferred_remove contrib/docker-device-tool/device_tool.go diff --git a/components/engine/daemon/cluster/executor/container/validate.go b/components/engine/daemon/cluster/executor/container/validate.go index dad1524a6d..2416701872 100644 --- a/components/engine/daemon/cluster/executor/container/validate.go +++ b/components/engine/daemon/cluster/executor/container/validate.go @@ -19,7 +19,7 @@ func validateMounts(mounts []api.Mount) error { // The checks on abs paths are required due to the container API confusing // volume mounts as bind mounts when the source is absolute (and vice-versa) // See #25253 - // TODO: This is probably not neccessary once #22373 is merged + // TODO: This is probably not necessary once #22373 is merged case api.MountTypeBind: if !filepath.IsAbs(mount.Source) { return fmt.Errorf("invalid bind mount source, must be an absolute path: %s", mount.Source) diff --git a/components/engine/daemon/monitor.go b/components/engine/daemon/monitor.go index c05d1336c0..7333c0da73 100644 --- a/components/engine/daemon/monitor.go +++ b/components/engine/daemon/monitor.go @@ -63,7 +63,7 @@ func (daemon *Daemon) StateChanged(id string, e libcontainerd.StateInfo) error { err := <-wait if err == nil { if err = daemon.containerStart(c, "", "", false); err != nil { - logrus.Debugf("failed to restart contianer: %+v", err) + logrus.Debugf("failed to restart container: %+v", err) } } if err != nil { diff --git a/components/engine/daemon/volumes.go b/components/engine/daemon/volumes.go index 095b212a05..d705c8e976 100644 --- a/components/engine/daemon/volumes.go +++ b/components/engine/daemon/volumes.go @@ -190,7 +190,7 @@ func (daemon *Daemon) registerMountPoints(container *container.Container, hostCo mp.Name = v.Name() mp.Driver = v.DriverName() - // only use the cached path here since getting the path is not neccessary right now and calling `Path()` may be slow + // only use the cached path here since getting the path is not necessary right now and calling `Path()` may be slow if cv, ok := v.(interface { CachedPath() string }); ok { diff --git a/components/engine/docs/reference/builder.md b/components/engine/docs/reference/builder.md index 3c7a2b8b62..b3010a47d4 100644 --- a/components/engine/docs/reference/builder.md +++ b/components/engine/docs/reference/builder.md @@ -1273,7 +1273,7 @@ Server containers or Hyper-V containers. For Hyper-V containers, the engine is, for architectural reasons, unable to create the directory if it does not previously exist. For Windows Server containers, the directory is created if it does not exist. Hence, for consistency between Windows Server and -Hyper-V containers, it is strongly recommended to include an explict instruction +Hyper-V containers, it is strongly recommended to include an explicit instruction to create the directory in the Dockerfile. For example: # escape=` diff --git a/components/engine/docs/reference/commandline/swarm_join_token.md b/components/engine/docs/reference/commandline/swarm_join_token.md index 189687d955..65607c18e2 100644 --- a/components/engine/docs/reference/commandline/swarm_join_token.md +++ b/components/engine/docs/reference/commandline/swarm_join_token.md @@ -58,7 +58,7 @@ Use the `--rotate` flag to generate a new join token for the specified role: ```bash $ docker swarm join-token --rotate worker -Succesfully rotated worker join token. +Successfully rotated worker join token. To add a worker to this swarm, run the following command: diff --git a/components/engine/hack/make.sh b/components/engine/hack/make.sh index 0d9828830d..ee93b8ee3d 100755 --- a/components/engine/hack/make.sh +++ b/components/engine/hack/make.sh @@ -85,7 +85,7 @@ if command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; the echo "#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "# GITCOMMIT = $GITCOMMIT" echo "# The version you are building is listed as unsupported because" - echo "# there are some files in the git repository that are in an uncommited state." + echo "# there are some files in the git repository that are in an uncommitted state." echo "# Commit these changes, or add to .gitignore to remove the -unsupported from the version." echo "# Here is the current list:" git status --porcelain --untracked-files=no diff --git a/components/engine/hack/release.sh b/components/engine/hack/release.sh index 2eddf498d2..8e23eca064 100755 --- a/components/engine/hack/release.sh +++ b/components/engine/hack/release.sh @@ -206,7 +206,7 @@ release_build() { s3Os=Linux ;; windows) - # this is windows use the .zip and .exe extentions for the files. + # this is windows use the .zip and .exe extensions for the files. s3Os=Windows zipExt=".zip" binaryExt=".exe" diff --git a/components/engine/image/spec/v1.1.md b/components/engine/image/spec/v1.1.md index 63e97def13..83f138011d 100644 --- a/components/engine/image/spec/v1.1.md +++ b/components/engine/image/spec/v1.1.md @@ -79,7 +79,7 @@ This specification uses the following terms: sha256:a9561eb1b190625c9adb5a9513e72c4dedafc1cb2d4c5236c9a6957ec7dfd5a9. Since the configuration JSON that gets hashed references hashes of each layer in the image, this formulation of the ImageID makes images - content-addresable. + content-addressable.
Tag diff --git a/components/engine/image/spec/v1.2.md b/components/engine/image/spec/v1.2.md index c014bf9a09..6c641cafec 100644 --- a/components/engine/image/spec/v1.2.md +++ b/components/engine/image/spec/v1.2.md @@ -79,7 +79,7 @@ This specification uses the following terms: sha256:a9561eb1b190625c9adb5a9513e72c4dedafc1cb2d4c5236c9a6957ec7dfd5a9. Since the configuration JSON that gets hashed references hashes of each layer in the image, this formulation of the ImageID makes images - content-addresable. + content-addressable.
Tag diff --git a/components/engine/integration-cli/docker_cli_cp_test.go b/components/engine/integration-cli/docker_cli_cp_test.go index 4e907f62cc..4e5c39e998 100644 --- a/components/engine/integration-cli/docker_cli_cp_test.go +++ b/components/engine/integration-cli/docker_cli_cp_test.go @@ -268,7 +268,7 @@ func (s *DockerSuite) TestCpToSymlinkToDirectory(c *check.C) { containerID := strings.TrimSpace(out) - // Create a temp directory to hold a test file nested in a direcotry. + // Create a temp directory to hold a test file nested in a directory. testDir, err := ioutil.TempDir("", "test-cp-to-symlink-to-dir-") c.Assert(err, checker.IsNil) defer os.RemoveAll(testDir) diff --git a/components/engine/integration-cli/docker_cli_run_test.go b/components/engine/integration-cli/docker_cli_run_test.go index 8ecc35cc02..d1aaeda58a 100644 --- a/components/engine/integration-cli/docker_cli_run_test.go +++ b/components/engine/integration-cli/docker_cli_run_test.go @@ -4201,7 +4201,7 @@ func (s *DockerSuite) TestRunVolumesMountedAsSlave(c *check.C) { } // Prepare a source directory with file in it. We will bind mount this - // direcotry and see if file shows up. + // directory and see if file shows up. tmpDir2, err := ioutil.TempDir("", "volume-source2") if err != nil { c.Fatal(err) diff --git a/components/engine/man/docker-create.1.md b/components/engine/man/docker-create.1.md index 08e8665903..21cbd9f9d6 100644 --- a/components/engine/man/docker-create.1.md +++ b/components/engine/man/docker-create.1.md @@ -151,7 +151,7 @@ two memory nodes. Limit the containers Real Time CPU usage. This flag tells the kernel to limit the amount of time in a given CPU period Real Time tasks may consume. Ex: Period of 1,000,000us and Runtime of 950,000us means that this container could consume 95% of available CPU and leave the remaining 5% to normal priority tasks. - The sum of all runtimes across containers cannot exceed the amount alotted to the parent cgroup. + The sum of all runtimes across containers cannot exceed the amount allotted to the parent cgroup. **--device**=[] Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm) diff --git a/components/engine/man/docker-run.1.md b/components/engine/man/docker-run.1.md index 8cbd26242c..0a46f29110 100644 --- a/components/engine/man/docker-run.1.md +++ b/components/engine/man/docker-run.1.md @@ -205,7 +205,7 @@ to the quota you specify. Limit the containers Real Time CPU usage. This flag tells the kernel to limit the amount of time in a given CPU period Real Time tasks may consume. Ex: Period of 1,000,000us and Runtime of 950,000us means that this container could consume 95% of available CPU and leave the remaining 5% to normal priority tasks. - The sum of all runtimes across containers cannot exceed the amount alotted to the parent cgroup. + The sum of all runtimes across containers cannot exceed the amount allotted to the parent cgroup. **-d**, **--detach**=*true*|*false* Detached mode: run the container in the background and print the new container ID. The default is *false*. diff --git a/components/engine/man/docker-update.1.md b/components/engine/man/docker-update.1.md index 7ae7099344..85f3dd07c1 100644 --- a/components/engine/man/docker-update.1.md +++ b/components/engine/man/docker-update.1.md @@ -62,7 +62,7 @@ a running container with kernel memory initialized. Limit the containers Real Time CPU usage. This flag tells the kernel to limit the amount of time in a given CPU period Real Time tasks may consume. Ex: Period of 1,000,000us and Runtime of 950,000us means that this container could consume 95% of available CPU and leave the remaining 5% to normal priority tasks. - The sum of all runtimes across containers cannot exceed the amount alotted to the parent cgroup. + The sum of all runtimes across containers cannot exceed the amount allotted to the parent cgroup. **--cpuset-cpus**="" CPUs in which to allow execution (0-3, 0,1) diff --git a/components/engine/pkg/archive/archive.go b/components/engine/pkg/archive/archive.go index 46edecfee2..a19e473528 100644 --- a/components/engine/pkg/archive/archive.go +++ b/components/engine/pkg/archive/archive.go @@ -308,7 +308,7 @@ func (ta *tarAppender) addTarFile(path, name string) error { } // if it's not a directory and has more than 1 link, - // it's hardlinked, so set the type flag accordingly + // it's hard linked, so set the type flag accordingly if !fi.IsDir() && hasHardlinks(fi) { // a link should have a name that it links too // and that linked name should be first in the tar archive