diff --git a/docs/sources/articles/networking.md b/docs/sources/articles/networking.md index a4640f3665..95c1234553 100644 --- a/docs/sources/articles/networking.md +++ b/docs/sources/articles/networking.md @@ -160,7 +160,7 @@ Four different options affect container domain name services. when a bare unqualified hostname is used inside of the container, by writing `search` lines into the container’s `/etc/resolv.conf`. 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`. 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 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` that some other single IP address is connected to a particular network interface. diff --git a/docs/sources/articles/security.md b/docs/sources/articles/security.md index eef2577304..cdf5fdddd0 100644 --- a/docs/sources/articles/security.md +++ b/docs/sources/articles/security.md @@ -112,7 +112,7 @@ use traditional UNIX permission checks to limit access to the control socket. 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 trusted network or VPN; or protected with e.g. `stunnel` and client SSL certificates. diff --git a/docs/sources/index.md b/docs/sources/index.md index 0c7ad8488e..06e1ac6d57 100644 --- a/docs/sources/index.md +++ b/docs/sources/index.md @@ -17,7 +17,7 @@ Docker consists of: * The Docker Engine - our lightweight and powerful open source container virtualization technology combined with a work flow for building 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. ## Why Docker? diff --git a/docs/sources/reference/api/docker_io_oauth_api.md b/docs/sources/reference/api/docker_io_oauth_api.md index dd2f6d75ec..c5d07720b8 100644 --- a/docs/sources/reference/api/docker_io_oauth_api.md +++ b/docs/sources/reference/api/docker_io_oauth_api.md @@ -117,7 +117,7 @@ an Authorization Code. ## 3.2 Get an Access Token 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 to get an Access Token. diff --git a/docs/sources/reference/api/docker_remote_api.md b/docs/sources/reference/api/docker_remote_api.md index b55d3b8817..38cfc244e1 100644 --- a/docs/sources/reference/api/docker_remote_api.md +++ b/docs/sources/reference/api/docker_remote_api.md @@ -94,7 +94,7 @@ You can now use the force parameter to force delete of an `DELETE /containers/(id)` **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 ## v1.9 diff --git a/docs/sources/reference/api/hub_registry_spec.md b/docs/sources/reference/api/hub_registry_spec.md index dc8c66a6e0..bb0e4ec7e3 100644 --- a/docs/sources/reference/api/hub_registry_spec.md +++ b/docs/sources/reference/api/hub_registry_spec.md @@ -525,7 +525,7 @@ GET /v1/users The Registry does not know anything about users. Even though repositories are under usernames, it's just a namespace for the 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: diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md index acc590454c..90976d3d19 100644 --- a/docs/sources/reference/commandline/cli.md +++ b/docs/sources/reference/commandline/cli.md @@ -448,7 +448,7 @@ To see how the `docker:latest` image was built: The default `docker images` will show all top level 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 allowing each step to be cached. These intermediate layers are not shown 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 'none': no networking for this container 'container:': 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 format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort (use 'docker port' to see the actual mapping) diff --git a/docs/sources/reference/run.md b/docs/sources/reference/run.md index 7d5fcbc51f..665eac0e29 100644 --- a/docs/sources/reference/run.md +++ b/docs/sources/reference/run.md @@ -137,7 +137,7 @@ PID files): 'bridge': creates a new network stack for the container on the docker bridge 'none': no networking for this container 'container:': 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 outgoing connections. The operator can completely disable networking