From 650ddc1f817ae7f07dcc8adce60c298c198ee0ee Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@users.noreply.github.com>
Date: Thu, 2 Jun 2016 18:45:08 -0700
Subject: [PATCH] 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>
---
 CHANGELOG.md                                  | 2 +-
 CONTRIBUTING.md                               | 6 +++---
 docs/admin/configuring.md                     | 2 +-
 docs/admin/logging/fluentd.md                 | 2 +-
 docs/admin/systemd.md                         | 2 +-
 docs/examples/running_redis_service.md        | 2 +-
 docs/installation/linux/fedora.md             | 2 +-
 docs/installation/windows.md                  | 2 +-
 docs/reference/api/docker_remote_api_v1.20.md | 2 +-
 docs/reference/api/docker_remote_api_v1.21.md | 2 +-
 docs/reference/api/docker_remote_api_v1.22.md | 2 +-
 docs/reference/api/docker_remote_api_v1.23.md | 2 +-
 docs/reference/commandline/attach.md          | 2 +-
 docs/reference/commandline/daemon.md          | 4 ++--
 docs/reference/commandline/pull.md            | 2 +-
 docs/security/https.md                        | 2 +-
 docs/security/trust/content_trust.md          | 2 +-
 docs/security/trust/trust_delegation.md       | 2 +-
 docs/security/trust/trust_key_mng.md          | 2 +-
 docs/userguide/intro.md                       | 2 +-
 man/docker-attach.1.md                        | 2 +-
 man/docker-inspect.1.md                       | 2 +-
 man/docker-run.1.md                           | 2 +-
 23 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed87168992..561f169d98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1686,7 +1686,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
 + Add -rm to docker run for removing a container on exit
 - Remove error messages which are not actually errors
 - Fix `docker rm` with volumes
-- Fix some error cases where a HTTP body might not be closed
+- Fix some error cases where an HTTP body might not be closed
 - Fix panic with wrong dockercfg file
 - Fix the attach behavior with -i
 * Record termination time in state.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6b875d6901..385833720d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -152,9 +152,9 @@ However, there might be a way to implement that feature *on top of* Docker.
       <a href="https://groups.google.com/forum/#!forum/docker-user" target="_blank">Docker-user</a>
       is for people using Docker containers.
       The <a href="https://groups.google.com/forum/#!forum/docker-dev" target="_blank">docker-dev</a>
-      group is for contributors and other people contributing to the Docker
-      project.
-      You can join them without an google account by sending an email to e.g. "docker-user+subscribe@googlegroups.com".
+      group is for contributors and other people contributing to the Docker project.
+      You can join them without a google account by sending an email to 
+      <a href="mailto:docker-dev+subscribe@googlegroups.com">docker-dev+subscribe@googlegroups.com</a>.
       After receiving the join-request message, you can simply reply to that to confirm the subscribtion.
     </td>
   </tr>
diff --git a/docs/admin/configuring.md b/docs/admin/configuring.md
index e7556ab729..b91ed8203e 100644
--- a/docs/admin/configuring.md
+++ b/docs/admin/configuring.md
@@ -48,7 +48,7 @@ Some of the daemon's options are:
 | `--tls=false`         | Enable or disable TLS. By default, this is false.         |
 
 
-Here is a an example of running the `docker` daemon with configuration options:
+Here is an example of running the `docker` daemon with configuration options:
 
     $ docker daemon -D --tls=true --tlscert=/var/docker/server.pem --tlskey=/var/docker/serverkey.pem -H tcp://192.168.59.3:2376
 
diff --git a/docs/admin/logging/fluentd.md b/docs/admin/logging/fluentd.md
index 21d4b74c56..238bd06a40 100644
--- a/docs/admin/logging/fluentd.md
+++ b/docs/admin/logging/fluentd.md
@@ -89,7 +89,7 @@ and [its documents](http://docs.fluentd.org/).
 To use this logging driver, start the `fluentd` daemon on a host. We recommend
 that you use [the Fluentd docker
 image](https://hub.docker.com/r/fluent/fluentd/). This image is
-especially useful if you want to aggregate multiple container logs on a each
+especially useful if you want to aggregate multiple container logs on each
 host then, later, transfer the logs to another Fluentd node to create an
 aggregate store.
 
diff --git a/docs/admin/systemd.md b/docs/admin/systemd.md
index ef44e8e9ee..03283cce8d 100644
--- a/docs/admin/systemd.md
+++ b/docs/admin/systemd.md
@@ -123,7 +123,7 @@ If you fail to specify an empty configuration, Docker reports an error such as:
 
 This example overrides the default `docker.service` file.
 
-If you are behind a HTTP proxy server, for example in corporate settings,
+If you are behind an HTTP proxy server, for example in corporate settings,
 you will need to add this configuration in the Docker systemd service file.
 
 First, create a systemd drop-in directory for the docker service:
diff --git a/docs/examples/running_redis_service.md b/docs/examples/running_redis_service.md
index 82daaa7830..66d852206e 100644
--- a/docs/examples/running_redis_service.md
+++ b/docs/examples/running_redis_service.md
@@ -1,7 +1,7 @@
 <!--[metadata]>
 +++
 title = "Dockerizing a Redis service"
-description = "Installing and running an redis service"
+description = "Installing and running a redis service"
 keywords = ["docker, example, package installation, networking,  redis"]
 [menu.main]
 parent = "engine_dockerize"
diff --git a/docs/installation/linux/fedora.md b/docs/installation/linux/fedora.md
index 8d297b4750..12d1de77f7 100644
--- a/docs/installation/linux/fedora.md
+++ b/docs/installation/linux/fedora.md
@@ -26,7 +26,7 @@ version, open a terminal and use `uname -r` to display your kernel version:
     $ uname -r
     3.19.5-100.fc21.x86_64
 
-If your kernel is at a older version, you must update it.
+If your kernel is at an older version, you must update it.
 
 Finally, is it recommended that you fully update your system. Please keep in
 mind that your system should be fully patched to fix any potential kernel bugs. Any
diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 696ee3394a..d30c066df3 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -85,7 +85,7 @@ Docker container using standard localhost addressing such as `localhost:8000` or
 
 ![Linux Architecture Diagram](images/linux_docker_host.svg)
 
-In an Windows installation, the `docker` daemon is running inside a Linux virtual
+In a Windows installation, the `docker` daemon is running inside a Linux virtual
 machine. You use the Windows Docker client to talk to the Docker host VM. Your
 Docker containers run inside this host.
 
diff --git a/docs/reference/api/docker_remote_api_v1.20.md b/docs/reference/api/docker_remote_api_v1.20.md
index b669ce22c4..5c4c5af9b3 100644
--- a/docs/reference/api/docker_remote_api_v1.20.md
+++ b/docs/reference/api/docker_remote_api_v1.20.md
@@ -1127,7 +1127,7 @@ following section.
 
 `GET /containers/(id or name)/archive`
 
-Get an tar archive of a resource in the filesystem of container `id`.
+Get a tar archive of a resource in the filesystem of container `id`.
 
 Query Parameters:
 
diff --git a/docs/reference/api/docker_remote_api_v1.21.md b/docs/reference/api/docker_remote_api_v1.21.md
index 8a463bad65..6f6baf9456 100644
--- a/docs/reference/api/docker_remote_api_v1.21.md
+++ b/docs/reference/api/docker_remote_api_v1.21.md
@@ -1210,7 +1210,7 @@ following section.
 
 `GET /containers/(id or name)/archive`
 
-Get an tar archive of a resource in the filesystem of container `id`.
+Get a tar archive of a resource in the filesystem of container `id`.
 
 Query Parameters:
 
diff --git a/docs/reference/api/docker_remote_api_v1.22.md b/docs/reference/api/docker_remote_api_v1.22.md
index 3c6ec0e989..602da448c8 100644
--- a/docs/reference/api/docker_remote_api_v1.22.md
+++ b/docs/reference/api/docker_remote_api_v1.22.md
@@ -1389,7 +1389,7 @@ following section.
 
 `GET /containers/(id or name)/archive`
 
-Get an tar archive of a resource in the filesystem of container `id`.
+Get a tar archive of a resource in the filesystem of container `id`.
 
 Query Parameters:
 
diff --git a/docs/reference/api/docker_remote_api_v1.23.md b/docs/reference/api/docker_remote_api_v1.23.md
index cff4bcedc6..099dad3e76 100644
--- a/docs/reference/api/docker_remote_api_v1.23.md
+++ b/docs/reference/api/docker_remote_api_v1.23.md
@@ -1419,7 +1419,7 @@ following section.
 
 `GET /containers/(id or name)/archive`
 
-Get an tar archive of a resource in the filesystem of container `id`.
+Get a tar archive of a resource in the filesystem of container `id`.
 
 Query Parameters:
 
diff --git a/docs/reference/commandline/attach.md b/docs/reference/commandline/attach.md
index 799fe1d176..7158e40974 100644
--- a/docs/reference/commandline/attach.md
+++ b/docs/reference/commandline/attach.md
@@ -51,7 +51,7 @@ foreground over a slow client connection. Instead, users should use the
 
 ## Override the detach sequence
 
-If you want, you can configure a override the Docker key sequence for detach.
+If you want, you can configure an override the Docker key sequence for detach.
 This is is useful if the Docker default sequence conflicts with key squence you
 use for other applications. There are two ways to defines a your own detach key
 sequence, as a per-container override or as a configuration property on  your
diff --git a/docs/reference/commandline/daemon.md b/docs/reference/commandline/daemon.md
index e61eb8390e..a823aab4f2 100644
--- a/docs/reference/commandline/daemon.md
+++ b/docs/reference/commandline/daemon.md
@@ -569,9 +569,9 @@ system's list of trusted CAs instead of enabling `--insecure-registry`.
 
 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.
 
-## Running a Docker daemon behind a HTTPS_PROXY
+## Running a Docker daemon behind an HTTPS_PROXY
 
-When running inside a LAN that uses a `HTTPS` proxy, the Docker Hub
+When running inside a LAN that uses an `HTTPS` proxy, the Docker Hub
 certificates will be replaced by the proxy's certificates. These certificates
 need to be added to your Docker host's configuration:
 
diff --git a/docs/reference/commandline/pull.md b/docs/reference/commandline/pull.md
index 0231422918..f2021ca6d9 100644
--- a/docs/reference/commandline/pull.md
+++ b/docs/reference/commandline/pull.md
@@ -29,7 +29,7 @@ use `docker pull`.
 
 ## Proxy configuration
 
-If you are behind a HTTP proxy server, for example in corporate settings,
+If you are behind an HTTP proxy server, for example in corporate settings,
 before open a connect to registry, you may need to configure the Docker
 daemon's proxy settings, using the `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY`
 environment variables. To set these environment variables on a host using
diff --git a/docs/security/https.md b/docs/security/https.md
index 1b2619cb21..04f72b32ea 100644
--- a/docs/security/https.md
+++ b/docs/security/https.md
@@ -12,7 +12,7 @@ parent = "smn_secure_docker"
 # Protect the Docker daemon socket
 
 By default, Docker runs via a non-networked Unix socket. It can also
-optionally communicate using a HTTP socket.
+optionally communicate using an HTTP socket.
 
 If you need Docker to be reachable via the network in a safe manner, you can
 enable TLS by specifying the `tlsverify` flag and pointing Docker's
diff --git a/docs/security/trust/content_trust.md b/docs/security/trust/content_trust.md
index 98b06fdd77..a475dd306b 100644
--- a/docs/security/trust/content_trust.md
+++ b/docs/security/trust/content_trust.md
@@ -107,7 +107,7 @@ Trust for an image tag is managed through the use of signing keys. A key set is
 created when an operation using content trust is first invoked. A key set consists
 of the following classes of keys:
 
-- an offline key that is the root of content trust for a image tag
+- an offline key that is the root of content trust for an image tag
 - repository or tagging keys that sign tags
 - server-managed keys such as the timestamp key, which provides freshness
 	security guarantees for your repository
diff --git a/docs/security/trust/trust_delegation.md b/docs/security/trust/trust_delegation.md
index 050d14e67e..07cf94821f 100644
--- a/docs/security/trust/trust_delegation.md
+++ b/docs/security/trust/trust_delegation.md
@@ -67,7 +67,7 @@ e is 65537 (0x10001)
 They should keep `delegation.key` private - this is what they will use to sign
 tags.
 
-Then they need to generate a x509 certificate containing the public key, which is
+Then they need to generate an x509 certificate containing the public key, which is
 what they will give to you.  Here is the command to generate a CSR (certificate
 signing request):
 
diff --git a/docs/security/trust/trust_key_mng.md b/docs/security/trust/trust_key_mng.md
index b74feadebf..9f7ed3b649 100644
--- a/docs/security/trust/trust_key_mng.md
+++ b/docs/security/trust/trust_key_mng.md
@@ -15,7 +15,7 @@ trust makes use of five different types of keys:
 
 | Key                 | Description                                                                                                                                                                                                                                                                                                                                                                         |
 |---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| 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. |
+| 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. |
 | 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. |
 | snapshot         | This key signs the current collection of image tags, preventing mix and match attacks.
 | timestamp        | This key allows Docker image repositories to have freshness security guarantees without requiring periodic content refreshes on the client's side. |
diff --git a/docs/userguide/intro.md b/docs/userguide/intro.md
index 18b688ce79..45084fb41a 100644
--- a/docs/userguide/intro.md
+++ b/docs/userguide/intro.md
@@ -87,7 +87,7 @@ Go to [Docker Machine user guide](https://docs.docker.com/machine/).
 
 ### Docker Compose
 
-Docker Compose allows you to define a application's components -- their containers,
+Docker Compose allows you to define an application's components -- their containers,
 configuration, links and volumes -- in a single file. Then a single command
 will set everything up and start your application running.
 
diff --git a/man/docker-attach.1.md b/man/docker-attach.1.md
index c78f4fbb1b..5ddf96f68b 100644
--- a/man/docker-attach.1.md
+++ b/man/docker-attach.1.md
@@ -43,7 +43,7 @@ attaching to a tty-enabled container (i.e.: launched with `-t`).
 
 # Override the detach sequence
 
-If you want, you can configure a override the Docker key sequence for detach.
+If you want, you can configure an override the Docker key sequence for detach.
 This is is useful if the Docker default sequence conflicts with key squence you
 use for other applications. There are two ways to defines a your own detach key
 sequence, as a per-container override or as a configuration property on  your
diff --git a/man/docker-inspect.1.md b/man/docker-inspect.1.md
index 1bc2cf0b9c..6d7a54ad3b 100644
--- a/man/docker-inspect.1.md
+++ b/man/docker-inspect.1.md
@@ -223,7 +223,7 @@ output:
 You can get more information about how to write a Go template from:
 https://golang.org/pkg/text/template/.
 
-## Getting size information on an container
+## Getting size information on a container
 
     $ docker inspect -s d2cc496561d6
     [
diff --git a/man/docker-run.1.md b/man/docker-run.1.md
index 57808f33a0..d40c2e5589 100644
--- a/man/docker-run.1.md
+++ b/man/docker-run.1.md
@@ -217,7 +217,7 @@ See **config-json(5)** for documentation on using a configuration file.
    Limit write rate to a device (e.g. --device-write-bps=/dev/sda:1mb)
 
 **--device-write-iops**=[]
-   Limit write rate a a device (e.g. --device-write-iops=/dev/sda:1000)
+   Limit write rate to a device (e.g. --device-write-iops=/dev/sda:1000)
 
 **--dns-search**=[]
    Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain)