Merge pull request #24287 from ottok/fix-spelling

Fix spelling in comments, strings and documentation
Upstream-commit: 1763474a84770e8af96a065551bc328124222f13
Component: engine
This commit is contained in:
Vincent Demeester
2016-07-03 22:34:00 +02:00
committed by GitHub
20 changed files with 24 additions and 24 deletions

View File

@ -34,7 +34,7 @@ Otherwise, the user must specify which project to log to using the `--gcp-projec
log option and Docker will attempt to obtain credentials from the
<a href="https://developers.google.com/identity/protocols/application-default-credentials" target="_blank">Google Application Default Credential</a>.
The `--gcp-project` takes precedence over information discovered from the metadata server
so a Docker daemon running in a Google Cloud Project can be overriden to log to a different
so a Docker daemon running in a Google Cloud Project can be overridden to log to a different
Google Cloud Project using `--gcp-project`.
## gcplogs options

View File

@ -155,7 +155,7 @@ option is ignored if the address protocol is not `tcp+tls`.
is ignored if the address protocol is not `tcp+tls`.
`syslog-tls-skip-verify` configures the TLS verification. This verification is
enabled by default, but it can be overriden by setting this option to `true`.
enabled by default, but it can be overridden by setting this option to `true`.
This option is ignored if the address protocol is not `tcp+tls`.
`tag` configures a string that is appended to the APP-NAME in the syslog