From 54df0949b0ef6f88acf3a68479f3dd7a2cef534f Mon Sep 17 00:00:00 2001 From: allencloud Date: Sun, 8 May 2016 09:36:10 +0800 Subject: [PATCH] fix typos Signed-off-by: allencloud --- docs/reference/commandline/attach.md | 2 +- docs/reference/commandline/dockerd.md | 4 ++-- docs/reference/commandline/pull.md | 2 +- man/docker-attach.1.md | 2 +- man/docker-inspect.1.md | 2 +- man/docker-run.1.md | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) 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/dockerd.md b/docs/reference/commandline/dockerd.md index 2dfbb68002..8eab487773 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -587,9 +587,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 101204e095..0ed3839f4a 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/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 fb810d32f9..2d02b7cbfb 100644 --- a/man/docker-run.1.md +++ b/man/docker-run.1.md @@ -219,7 +219,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)