diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d9068d1d95f1b6d1ee36766edcfe2a8dbdc78d4b..bd16f98d813e7ec5588cc1625404867dce82e2f9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -317,7 +317,7 @@ maintainer to make a difference on the project! ### IRC meetings -There are two monthly meetings taking place on #docker-dev IRC to accomodate all +There are two monthly meetings taking place on #docker-dev IRC to accommodate all timezones. Anybody can propose a topic for discussion prior to the meeting. If you feel the conversation is going off-topic, feel free to point it out. diff --git a/docs/man/docker-export.1.md b/docs/man/docker-export.1.md index df69bc37d80553ea252fbbcdab632c9c48395763..0bc71ad89f221d64162bf5f232245f3359a9a329 100644 --- a/docs/man/docker-export.1.md +++ b/docs/man/docker-export.1.md @@ -41,4 +41,4 @@ and import the contents of the tarball into it, then optionally tag it. April 2014, Originally compiled by William Henry (whenry at redhat dot com) based on docker.com source material and internal work. June 2014, updated by Sven Dowideit -Janurary 2015, updated by Joseph Kern (josephakern at gmail dot com) +January 2015, updated by Joseph Kern (josephakern at gmail dot com) diff --git a/docs/sources/docker-hub/official_repos.md b/docs/sources/docker-hub/official_repos.md index 98c33c6436f712538a271092a424ca8811585b8a..7ca8ba2f42716fcb6ace91e0fba3de157aac549c 100644 --- a/docs/sources/docker-hub/official_repos.md +++ b/docs/sources/docker-hub/official_repos.md @@ -35,7 +35,7 @@ publishing all Official Repositories content. This team works in collaboration with upstream software maintainers, security experts, and the broader Docker community. -While it is preferrable to have upstream software authors maintaining their +While it is preferable to have upstream software authors maintaining their corresponding Official Repositories, this is not a strict requirement. Creating and maintaining images for Official Repositories is a public process. It takes place openly on GitHub where participation is encouraged. Anyone can provide @@ -92,9 +92,9 @@ Official Repository is "generally useful" to the large Python developer community, whereas an obscure text adventure game written in Python last week is not. -When a new proposal is accepted, the author becomes responsibile for keeping +When a new proposal is accepted, the author becomes responsible for keeping their images up-to-date and responding to user feedback. The Official -Repositories team becomes responsibile for publishing the images and +Repositories team becomes responsible for publishing the images and documentation on Docker Hub. Updates to the Official Repository follow the same pull request process, though with less review. The Official Repositories team ultimately acts as a gatekeeper for all changes, which helps mitigate the risk diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md index 770d2d3527c680d3a4885b11dd07dd3a12a463e9..5fdb17cbe51d3f6323e66584145239bfcfd2dc82 100644 --- a/docs/sources/reference/commandline/cli.md +++ b/docs/sources/reference/commandline/cli.md @@ -689,7 +689,7 @@ process is returned by the `docker attach` command to its caller too: --memory-swap="" Total memory (memory + swap), `-1` to disable swap -c, --cpu-shares CPU Shares (relative weight) --cpuset-mems="" MEMs in which to allow execution, e.g. `0-3`, `0,1` - --cpuset-cpus="" CPUs in which to allow exection, e.g. `0-3`, `0,1` + --cpuset-cpus="" CPUs in which to allow execution, e.g. `0-3`, `0,1` --cgroup-parent="" Optional parent cgroup for the container Builds Docker images from a Dockerfile and a "context". A build's context is @@ -759,7 +759,7 @@ client is killed for any reason. > **Note:** > Currently only the "run" phase of the build can be canceled until pull -> cancelation is implemented). +> cancellation is implemented). ### Return code diff --git a/image/spec/v1.md b/image/spec/v1.md index b428cbb202e077e13ab315822b66b43c90c08583..52d6334c19786e10d28c67c41f66cac70236582e 100644 --- a/image/spec/v1.md +++ b/image/spec/v1.md @@ -176,7 +176,7 @@ Here is an example image JSON file: should be omitted. A collection of images may share many of the same ancestor layers. This organizational structure is strictly a tree with any one layer having either no parent or a single parent and zero or - more decendent layers. Cycles are not allowed and implementations + more descendent layers. Cycles are not allowed and implementations should be careful to avoid creating them or iterating through a cycle indefinitely.