Browse code

Merge pull request #23193 from allencloud/fix-typos

use grep to find all a/an typos
(cherry picked from commit 98c245c9e63793cf8ca03c5500e0820447c1861c)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sven Dowideit authored on 2016/06/03 10:45:08
Showing 23 changed files
... ...
@@ -1686,7 +1686,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
1686 1686
 + Add -rm to docker run for removing a container on exit
1687 1687
 - Remove error messages which are not actually errors
1688 1688
 - Fix `docker rm` with volumes
1689
-- Fix some error cases where a HTTP body might not be closed
1689
+- Fix some error cases where an HTTP body might not be closed
1690 1690
 - Fix panic with wrong dockercfg file
1691 1691
 - Fix the attach behavior with -i
1692 1692
 * Record termination time in state.
... ...
@@ -152,9 +152,9 @@ However, there might be a way to implement that feature *on top of* Docker.
152 152
       <a href="https://groups.google.com/forum/#!forum/docker-user" target="_blank">Docker-user</a>
153 153
       is for people using Docker containers.
154 154
       The <a href="https://groups.google.com/forum/#!forum/docker-dev" target="_blank">docker-dev</a>
155
-      group is for contributors and other people contributing to the Docker
156
-      project.
157
-      You can join them without an google account by sending an email to e.g. "docker-user+subscribe@googlegroups.com".
155
+      group is for contributors and other people contributing to the Docker project.
156
+      You can join them without a google account by sending an email to 
157
+      <a href="mailto:docker-dev+subscribe@googlegroups.com">docker-dev+subscribe@googlegroups.com</a>.
158 158
       After receiving the join-request message, you can simply reply to that to confirm the subscribtion.
159 159
     </td>
160 160
   </tr>
... ...
@@ -48,7 +48,7 @@ Some of the daemon's options are:
48 48
 | `--tls=false`         | Enable or disable TLS. By default, this is false.         |
49 49
 
50 50
 
51
-Here is a an example of running the `docker` daemon with configuration options:
51
+Here is an example of running the `docker` daemon with configuration options:
52 52
 
53 53
     $ docker daemon -D --tls=true --tlscert=/var/docker/server.pem --tlskey=/var/docker/serverkey.pem -H tcp://192.168.59.3:2376
54 54
 
... ...
@@ -89,7 +89,7 @@ and [its documents](http://docs.fluentd.org/).
89 89
 To use this logging driver, start the `fluentd` daemon on a host. We recommend
90 90
 that you use [the Fluentd docker
91 91
 image](https://hub.docker.com/r/fluent/fluentd/). This image is
92
-especially useful if you want to aggregate multiple container logs on a each
92
+especially useful if you want to aggregate multiple container logs on each
93 93
 host then, later, transfer the logs to another Fluentd node to create an
94 94
 aggregate store.
95 95
 
... ...
@@ -123,7 +123,7 @@ If you fail to specify an empty configuration, Docker reports an error such as:
123 123
 
124 124
 This example overrides the default `docker.service` file.
125 125
 
126
-If you are behind a HTTP proxy server, for example in corporate settings,
126
+If you are behind an HTTP proxy server, for example in corporate settings,
127 127
 you will need to add this configuration in the Docker systemd service file.
128 128
 
129 129
 First, create a systemd drop-in directory for the docker service:
... ...
@@ -1,7 +1,7 @@
1 1
 <!--[metadata]>
2 2
 +++
3 3
 title = "Dockerizing a Redis service"
4
-description = "Installing and running an redis service"
4
+description = "Installing and running a redis service"
5 5
 keywords = ["docker, example, package installation, networking,  redis"]
6 6
 [menu.main]
7 7
 parent = "engine_dockerize"
... ...
@@ -26,7 +26,7 @@ version, open a terminal and use `uname -r` to display your kernel version:
26 26
     $ uname -r
27 27
     3.19.5-100.fc21.x86_64
28 28
 
29
-If your kernel is at a older version, you must update it.
29
+If your kernel is at an older version, you must update it.
30 30
 
31 31
 Finally, is it recommended that you fully update your system. Please keep in
32 32
 mind that your system should be fully patched to fix any potential kernel bugs. Any
... ...
@@ -85,7 +85,7 @@ Docker container using standard localhost addressing such as `localhost:8000` or
85 85
 
86 86
 ![Linux Architecture Diagram](images/linux_docker_host.svg)
87 87
 
88
-In an Windows installation, the `docker` daemon is running inside a Linux virtual
88
+In a Windows installation, the `docker` daemon is running inside a Linux virtual
89 89
 machine. You use the Windows Docker client to talk to the Docker host VM. Your
90 90
 Docker containers run inside this host.
91 91
 
... ...
@@ -1127,7 +1127,7 @@ following section.
1127 1127
 
1128 1128
 `GET /containers/(id or name)/archive`
1129 1129
 
1130
-Get an tar archive of a resource in the filesystem of container `id`.
1130
+Get a tar archive of a resource in the filesystem of container `id`.
1131 1131
 
1132 1132
 Query Parameters:
1133 1133
 
... ...
@@ -1210,7 +1210,7 @@ following section.
1210 1210
 
1211 1211
 `GET /containers/(id or name)/archive`
1212 1212
 
1213
-Get an tar archive of a resource in the filesystem of container `id`.
1213
+Get a tar archive of a resource in the filesystem of container `id`.
1214 1214
 
1215 1215
 Query Parameters:
1216 1216
 
... ...
@@ -1389,7 +1389,7 @@ following section.
1389 1389
 
1390 1390
 `GET /containers/(id or name)/archive`
1391 1391
 
1392
-Get an tar archive of a resource in the filesystem of container `id`.
1392
+Get a tar archive of a resource in the filesystem of container `id`.
1393 1393
 
1394 1394
 Query Parameters:
1395 1395
 
... ...
@@ -1419,7 +1419,7 @@ following section.
1419 1419
 
1420 1420
 `GET /containers/(id or name)/archive`
1421 1421
 
1422
-Get an tar archive of a resource in the filesystem of container `id`.
1422
+Get a tar archive of a resource in the filesystem of container `id`.
1423 1423
 
1424 1424
 Query Parameters:
1425 1425
 
... ...
@@ -51,7 +51,7 @@ foreground over a slow client connection. Instead, users should use the
51 51
 
52 52
 ## Override the detach sequence
53 53
 
54
-If you want, you can configure a override the Docker key sequence for detach.
54
+If you want, you can configure an override the Docker key sequence for detach.
55 55
 This is is useful if the Docker default sequence conflicts with key squence you
56 56
 use for other applications. There are two ways to defines a your own detach key
57 57
 sequence, as a per-container override or as a configuration property on  your
... ...
@@ -569,9 +569,9 @@ system's list of trusted CAs instead of enabling `--insecure-registry`.
569 569
 
570 570
 Enabling `--disable-legacy-registry` forces a docker daemon to only interact with registries which support the V2 protocol.  Specifically, the daemon will not attempt `push`, `pull` and `login` to v1 registries.  The exception to this is `search` which can still be performed on v1 registries.
571 571
 
572
-## Running a Docker daemon behind a HTTPS_PROXY
572
+## Running a Docker daemon behind an HTTPS_PROXY
573 573
 
574
-When running inside a LAN that uses a `HTTPS` proxy, the Docker Hub
574
+When running inside a LAN that uses an `HTTPS` proxy, the Docker Hub
575 575
 certificates will be replaced by the proxy's certificates. These certificates
576 576
 need to be added to your Docker host's configuration:
577 577
 
... ...
@@ -29,7 +29,7 @@ use `docker pull`.
29 29
 
30 30
 ## Proxy configuration
31 31
 
32
-If you are behind a HTTP proxy server, for example in corporate settings,
32
+If you are behind an HTTP proxy server, for example in corporate settings,
33 33
 before open a connect to registry, you may need to configure the Docker
34 34
 daemon's proxy settings, using the `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY`
35 35
 environment variables. To set these environment variables on a host using
... ...
@@ -12,7 +12,7 @@ parent = "smn_secure_docker"
12 12
 # Protect the Docker daemon socket
13 13
 
14 14
 By default, Docker runs via a non-networked Unix socket. It can also
15
-optionally communicate using a HTTP socket.
15
+optionally communicate using an HTTP socket.
16 16
 
17 17
 If you need Docker to be reachable via the network in a safe manner, you can
18 18
 enable TLS by specifying the `tlsverify` flag and pointing Docker's
... ...
@@ -107,7 +107,7 @@ Trust for an image tag is managed through the use of signing keys. A key set is
107 107
 created when an operation using content trust is first invoked. A key set consists
108 108
 of the following classes of keys:
109 109
 
110
-- an offline key that is the root of content trust for a image tag
110
+- an offline key that is the root of content trust for an image tag
111 111
 - repository or tagging keys that sign tags
112 112
 - server-managed keys such as the timestamp key, which provides freshness
113 113
 	security guarantees for your repository
... ...
@@ -67,7 +67,7 @@ e is 65537 (0x10001)
67 67
 They should keep `delegation.key` private - this is what they will use to sign
68 68
 tags.
69 69
 
70
-Then they need to generate a x509 certificate containing the public key, which is
70
+Then they need to generate an x509 certificate containing the public key, which is
71 71
 what they will give to you.  Here is the command to generate a CSR (certificate
72 72
 signing request):
73 73
 
... ...
@@ -15,7 +15,7 @@ trust makes use of five different types of keys:
15 15
 
16 16
 | Key                 | Description                                                                                                                                                                                                                                                                                                                                                                         |
17 17
 |---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------|
18
-| root key         | Root of content trust for a image tag. When content trust is enabled, you create the root key once. Also known as the offline key, because it should be kept offline. |
18
+| root key         | Root of content trust for an image tag. When content trust is enabled, you create the root key once. Also known as the offline key, because it should be kept offline. |
19 19
 | targets          | This key allows you to sign image tags, to manage delegations including delegated keys or permitted delegation paths. Also known as the repository key, since this key determines what tags can be signed into an image repository. |
20 20
 | snapshot         | This key signs the current collection of image tags, preventing mix and match attacks.
21 21
 | timestamp        | This key allows Docker image repositories to have freshness security guarantees without requiring periodic content refreshes on the client's side. |
... ...
@@ -87,7 +87,7 @@ Go to [Docker Machine user guide](https://docs.docker.com/machine/).
87 87
 
88 88
 ### Docker Compose
89 89
 
90
-Docker Compose allows you to define a application's components -- their containers,
90
+Docker Compose allows you to define an application's components -- their containers,
91 91
 configuration, links and volumes -- in a single file. Then a single command
92 92
 will set everything up and start your application running.
93 93
 
... ...
@@ -43,7 +43,7 @@ attaching to a tty-enabled container (i.e.: launched with `-t`).
43 43
 
44 44
 # Override the detach sequence
45 45
 
46
-If you want, you can configure a override the Docker key sequence for detach.
46
+If you want, you can configure an override the Docker key sequence for detach.
47 47
 This is is useful if the Docker default sequence conflicts with key squence you
48 48
 use for other applications. There are two ways to defines a your own detach key
49 49
 sequence, as a per-container override or as a configuration property on  your
... ...
@@ -223,7 +223,7 @@ output:
223 223
 You can get more information about how to write a Go template from:
224 224
 https://golang.org/pkg/text/template/.
225 225
 
226
-## Getting size information on an container
226
+## Getting size information on a container
227 227
 
228 228
     $ docker inspect -s d2cc496561d6
229 229
     [
... ...
@@ -217,7 +217,7 @@ See **config-json(5)** for documentation on using a configuration file.
217 217
    Limit write rate to a device (e.g. --device-write-bps=/dev/sda:1mb)
218 218
 
219 219
 **--device-write-iops**=[]
220
-   Limit write rate a a device (e.g. --device-write-iops=/dev/sda:1000)
220
+   Limit write rate to a device (e.g. --device-write-iops=/dev/sda:1000)
221 221
 
222 222
 **--dns-search**=[]
223 223
    Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain)