Merge pull request #15804 from epc/epc-2015236

Copy edits for typos
This commit is contained in:
Sebastiaan van Stijn 2015-08-25 08:04:53 +02:00
commit ee2c476f22
5 changed files with 9 additions and 9 deletions

View File

@ -11,7 +11,7 @@ weight = 7
# Using certificates for repository client verification
The orginal content was deprecated. For information about configuring
cerficates, see [deploying a registry
The original content was deprecated. For information about configuring
certificates, see [deploying a registry
server](http://docs.docker.com/registry/deploying/). To reach an older version
of this content, refer to an older version of the documentation.

View File

@ -11,7 +11,7 @@ weight = 8
# Run a local registry mirror
The orginal content was deprecated. [An archived
The original content was deprecated. [An archived
version](https://docs.docker.com/v1.6/articles/registry_mirror) is available in
the 1.7 documentation. For information about configuring mirrors with the latest
Docker Registry version, please file a support request with [the Distribution

View File

@ -41,7 +41,7 @@ Your machine must be running Windows 7, 8/8.1 or newer to run Docker. Windows 10
upgrading your operating system in order to try out Docker.
2. Make sure your CPU supports [virtualization technology](https://en.wikipedia.org/wiki/X86_virtualization)
and virtualzation support is enabled in BIOS and recognized by Windows.
and virtualization support is enabled in BIOS and recognized by Windows.
#### For Windows 8 or 8.1

View File

@ -668,8 +668,8 @@ limit and "K" the kernel limit. There are three possible ways to set limits:
<td class="no-wrap"><strong>U != 0, K &lt; U</strong></td>
<td>
Kernel memory is a subset of the user memory. This setup is useful in
deployments where the total amount of memory per-cgroup is overcommited.
Overcommiting kernel memory limits is definitely not recommended, since the
deployments where the total amount of memory per-cgroup is overcommitted.
Overcommitting kernel memory limits is definitely not recommended, since the
box can still run out of non-reclaimable memory.
In this case, the you can configure K so that the sum of all groups is
never greater than the total memory. Then, freely set U at the expense of
@ -679,7 +679,7 @@ limit and "K" the kernel limit. There are three possible ways to set limits:
<tr>
<td class="no-wrap"><strong>U != 0, K &gt; U</strong></td>
<td>
Since kernel memory charges are also fed to the user counter and reclaimation
Since kernel memory charges are also fed to the user counter and reclamation
is triggered for the container for both kinds of memory. This configuration
gives the admin a unified view of memory. It is also useful for people
who just want to track kernel memory usage.

View File

@ -89,7 +89,7 @@ So, you'll need an entry for both the servers in your local `/etc/hosts` file.
3. Create a `notarytest` directory then change into that.
$ mkdir notarytest
$ cd nostarytest
$ cd notarytest
4. Create a filed called `Dockerfile` with your favorite editor.
@ -191,7 +191,7 @@ root@0710762bb59a:/#
```
Mounting the `docker.sock` gives the `notarysandbox` access to the `docker`
deamon on your host, while storing all the keys and files inside the sandbox
daemon on your host, while storing all the keys and files inside the sandbox
container. When you destroy the container, you destroy the "play" keys.
### Test some trust operations