mirror of https://github.com/docker/docs.git
Merge pull request #13622 from jogo/spelling
Fix spelling mistakes in documentation
This commit is contained in:
commit
4caa9392f8
|
@ -317,7 +317,7 @@ maintainer to make a difference on the project!
|
||||||
|
|
||||||
### IRC meetings
|
### 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.
|
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.
|
If you feel the conversation is going off-topic, feel free to point it out.
|
||||||
|
|
|
@ -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)
|
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
|
||||||
based on docker.com source material and internal work.
|
based on docker.com source material and internal work.
|
||||||
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
|
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
|
||||||
Janurary 2015, updated by Joseph Kern (josephakern at gmail dot com)
|
January 2015, updated by Joseph Kern (josephakern at gmail dot com)
|
||||||
|
|
|
@ -35,7 +35,7 @@ publishing all Official Repositories content. This team works in collaboration
|
||||||
with upstream software maintainers, security experts, and the broader Docker
|
with upstream software maintainers, security experts, and the broader Docker
|
||||||
community.
|
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
|
corresponding Official Repositories, this is not a strict requirement. Creating
|
||||||
and maintaining images for Official Repositories is a public process. It takes
|
and maintaining images for Official Repositories is a public process. It takes
|
||||||
place openly on GitHub where participation is encouraged. Anyone can provide
|
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
|
community, whereas an obscure text adventure game written in Python last week is
|
||||||
not.
|
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
|
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
|
documentation on Docker Hub. Updates to the Official Repository follow the same
|
||||||
pull request process, though with less review. The Official Repositories team
|
pull request process, though with less review. The Official Repositories team
|
||||||
ultimately acts as a gatekeeper for all changes, which helps mitigate the risk
|
ultimately acts as a gatekeeper for all changes, which helps mitigate the risk
|
||||||
|
|
|
@ -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
|
--memory-swap="" Total memory (memory + swap), `-1` to disable swap
|
||||||
-c, --cpu-shares CPU Shares (relative weight)
|
-c, --cpu-shares CPU Shares (relative weight)
|
||||||
--cpuset-mems="" MEMs in which to allow execution, e.g. `0-3`, `0,1`
|
--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
|
--cgroup-parent="" Optional parent cgroup for the container
|
||||||
|
|
||||||
Builds Docker images from a Dockerfile and a "context". A build's context is
|
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:**
|
> **Note:**
|
||||||
> Currently only the "run" phase of the build can be canceled until pull
|
> Currently only the "run" phase of the build can be canceled until pull
|
||||||
> cancelation is implemented).
|
> cancellation is implemented).
|
||||||
|
|
||||||
### Return code
|
### Return code
|
||||||
|
|
||||||
|
|
|
@ -176,7 +176,7 @@ Here is an example image JSON file:
|
||||||
should be omitted. A collection of images may share many of the same
|
should be omitted. A collection of images may share many of the same
|
||||||
ancestor layers. This organizational structure is strictly a tree with
|
ancestor layers. This organizational structure is strictly a tree with
|
||||||
any one layer having either no parent or a single parent and zero or
|
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
|
should be careful to avoid creating them or iterating through a cycle
|
||||||
indefinitely.
|
indefinitely.
|
||||||
</dd>
|
</dd>
|
||||||
|
|
Loading…
Reference in New Issue