Merge pull request #6431 from mika/mika/typos

Fix several typos
This commit is contained in:
Sven Dowideit 2014-06-15 07:51:48 +10:00
commit c4327f7146
8 changed files with 10 additions and 10 deletions

View File

@ -160,7 +160,7 @@ Four different options affect container domain name services.
when a bare unqualified hostname is used inside of the container, by when a bare unqualified hostname is used inside of the container, by
writing `search` lines into the containers `/etc/resolv.conf`. writing `search` lines into the containers `/etc/resolv.conf`.
When a container process attempts to access `host` and the search When a container process attempts to access `host` and the search
domain `exmaple.com` is set, for instance, the DNS logic will not domain `example.com` is set, for instance, the DNS logic will not
only look up `host` but also `host.example.com`. only look up `host` but also `host.example.com`.
Note that Docker, in the absence of either of the last two options Note that Docker, in the absence of either of the last two options
@ -683,7 +683,7 @@ the previous section to go something like this:
$ sudo ip netns exec 3004 ip route add 10.1.1.1/32 dev B $ sudo ip netns exec 3004 ip route add 10.1.1.1/32 dev B
The two containers should now be able to ping each other and make The two containers should now be able to ping each other and make
connections sucessfully. Point-to-point links like this do not depend connections successfully. Point-to-point links like this do not depend
on a subnet nor a netmask, but on the bare assertion made by `ip route` on a subnet nor a netmask, but on the bare assertion made by `ip route`
that some other single IP address is connected to a particular network that some other single IP address is connected to a particular network
interface. interface.

View File

@ -112,7 +112,7 @@ use traditional UNIX permission checks to limit access to the control
socket. socket.
You can also expose the REST API over HTTP if you explicitly decide so. You can also expose the REST API over HTTP if you explicitly decide so.
However, if you do that, being aware of the abovementioned security However, if you do that, being aware of the above mentioned security
implication, you should ensure that it will be reachable only from a implication, you should ensure that it will be reachable only from a
trusted network or VPN; or protected with e.g. `stunnel` trusted network or VPN; or protected with e.g. `stunnel`
and client SSL certificates. and client SSL certificates.

View File

@ -17,7 +17,7 @@ Docker consists of:
* The Docker Engine - our lightweight and powerful open source container * The Docker Engine - our lightweight and powerful open source container
virtualization technology combined with a work flow for building virtualization technology combined with a work flow for building
and containerizing your applications. and containerizing your applications.
* [Docker Hub](https://hub.docker.com) - our SAAS service for * [Docker Hub](https://hub.docker.com) - our SaaS service for
sharing and managing your application stacks. sharing and managing your application stacks.
## Why Docker? ## Why Docker?

View File

@ -117,7 +117,7 @@ an Authorization Code.
## 3.2 Get an Access Token ## 3.2 Get an Access Token
Once the user has authorized your application, a request will be made to Once the user has authorized your application, a request will be made to
your application'sspecified `redirect_uri` which your application's specified `redirect_uri` which
includes a `code` parameter that you must then use includes a `code` parameter that you must then use
to get an Access Token. to get an Access Token.

View File

@ -94,7 +94,7 @@ You can now use the force parameter to force delete of an
`DELETE /containers/(id)` `DELETE /containers/(id)`
**New!** **New!**
You can now use the force paramter to force delete a You can now use the force parameter to force delete a
container, even if it is currently running container, even if it is currently running
## v1.9 ## v1.9

View File

@ -525,7 +525,7 @@ GET /v1/users
The Registry does not know anything about users. Even though The Registry does not know anything about users. Even though
repositories are under usernames, it's just a namespace for the repositories are under usernames, it's just a namespace for the
registry. Allowing us to implement organizations or different namespaces registry. Allowing us to implement organizations or different namespaces
per user later, without modifying the Registry'sAPI. per user later, without modifying the Registry's API.
The following naming restrictions apply: The following naming restrictions apply:

View File

@ -448,7 +448,7 @@ To see how the `docker:latest` image was built:
The default `docker images` will show all top level The default `docker images` will show all top level
images, their repository and tags, and their virtual size. images, their repository and tags, and their virtual size.
Docker images have intermediate layers that increase reuseability, Docker images have intermediate layers that increase reusability,
decrease disk usage, and speed up `docker build` by decrease disk usage, and speed up `docker build` by
allowing each step to be cached. These intermediate layers are not shown allowing each step to be cached. These intermediate layers are not shown
by default. by default.
@ -873,7 +873,7 @@ removed before the image is removed.
'bridge': creates a new network stack for the container on the docker bridge 'bridge': creates a new network stack for the container on the docker bridge
'none': no networking for this container 'none': no networking for this container
'container:<name|id>': reuses another container network stack 'container:<name|id>': reuses another container network stack
'host': use the host network stack inside the contaner 'host': use the host network stack inside the container
-p, --publish=[] Publish a container's port to the host -p, --publish=[] Publish a container's port to the host
format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort
(use 'docker port' to see the actual mapping) (use 'docker port' to see the actual mapping)

View File

@ -137,7 +137,7 @@ PID files):
'bridge': creates a new network stack for the container on the docker bridge 'bridge': creates a new network stack for the container on the docker bridge
'none': no networking for this container 'none': no networking for this container
'container:<name|id>': reuses another container network stack 'container:<name|id>': reuses another container network stack
'host': use the host network stack inside the contaner 'host': use the host network stack inside the container
By default, all containers have networking enabled and they can make any By default, all containers have networking enabled and they can make any
outgoing connections. The operator can completely disable networking outgoing connections. The operator can completely disable networking