From 650ddc1f817ae7f07dcc8adce60c298c198ee0ee Mon Sep 17 00:00:00 2001 From: Sven Dowideit 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 --- 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. Docker-user is for people using Docker containers. The docker-dev - 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 + docker-dev+subscribe@googlegroups.com. After receiving the join-request message, you can simply reply to that to confirm the subscribtion. 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 @@