starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-27 01:40:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22863 from Saser/replace-unicode-single-quote

Browse Source 
Replace occurrences of U+2018 and U+2019 with U+0027 in manpages
Upstream-commit: 4afc4edd74a49fe35b4e19f9fc813523387d85c0
Component: engine
This commit is contained in:
Vincent Demeester
2016-05-21 07:42:26 +02:00
parent ed6e5fbdf6 8b67707840
commit bd09171248
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/man/docker-events.1.md
+1 -1
View File
@@ -47,7 +47,7 @@ Docker networks report the following events:
The `--since` and `--until` parameters can be Unix timestamps, date formatted
timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed
relative to the client machine’s time. If you do not provide the `--since` option,
relative to the client machine's time. If you do not provide the `--since` option,
the command returns only new and/or live events. Supported formats for date
formatted time stamps include RFC3339Nano, RFC3339, `2006-01-02T15:04:05`,
`2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local
components/engine/man/docker-logs.1.md
+2 -2
View File
@@ -21,7 +21,7 @@ any logs at the time you execute docker logs).
The **docker logs --follow** command combines commands **docker logs** and
**docker attach**. It will first return all logs from the beginning and
then continue streaming new output from the container’s stdout and stderr.
then continue streaming new output from the container's stdout and stderr.
**Warning**: This command works only for the **json-file** or **journald**
logging drivers.
@@ -46,7 +46,7 @@ logging drivers.
Output the specified number of lines at the end of logs (defaults to all logs)
The `--since` option can be Unix timestamps, date formatted timestamps, or Go
duration strings (e.g. `10m`, `1h30m`) computed relative to the client machine’s
duration strings (e.g. `10m`, `1h30m`) computed relative to the client machine's
time. Supported formats for date formatted time stamps include RFC3339Nano,
RFC3339, `2006-01-02T15:04:05`, `2006-01-02T15:04:05.999999999`,
`2006-01-02Z07:00`, and `2006-01-02`. The local timezone on the client will be
components/engine/man/docker-run.1.md
+3 -3
View File
@@ -103,7 +103,7 @@ pull** IMAGE, before it starts the container from that image.
In foreground mode (the default when **-d**
is not specified), **docker run** can start the process in the container
and attach the console to the process’s standard input, output, and standard
and attach the console to the process's standard input, output, and standard
error. It can even pretend to be a TTY (this is what most commandline
executables expect) and pass along signals. The **-a** option can be set for
each of stdin, stdout, and stderr.
@@ -735,7 +735,7 @@ This should list the message sent to logger.
If you do not specify -a then Docker will attach everything (stdin,stdout,stderr)
. You can specify to which of the three standard streams (stdin, stdout, stderr)
you’d like to connect instead, as in:
you'd like to connect instead, as in:
# docker run -a stdin -a stdout -i -t fedora /bin/bash
@@ -849,7 +849,7 @@ If a container is connected to the default bridge network and `linked`
with other containers, then the container's `/etc/hosts` file is updated
with the linked container's name.
> **Note** Since Docker may live update the container’s `/etc/hosts` file, there
> **Note** Since Docker may live update the container's `/etc/hosts` file, there
may be situations when processes inside the container can end up reading an
empty or incomplete `/etc/hosts` file. In most cases, retrying the read again
should fix the problem.