1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

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

Replace occurrences of U+2018 and U+2019 with U+0027 in manpages
This commit is contained in:
Vincent Demeester 2016-05-21 07:42:26 +02:00
commit 4afc4edd74
3 changed files with 6 additions and 6 deletions

View file

@ -47,7 +47,7 @@ Docker networks report the following events:
The `--since` and `--until` parameters can be Unix timestamps, date formatted The `--since` and `--until` parameters can be Unix timestamps, date formatted
timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed
relative to the client machines 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 the command returns only new and/or live events. Supported formats for date
formatted time stamps include RFC3339Nano, RFC3339, `2006-01-02T15:04:05`, 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 `2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local

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 The **docker logs --follow** command combines commands **docker logs** and
**docker attach**. It will first return all logs from the beginning and **docker attach**. It will first return all logs from the beginning and
then continue streaming new output from the containers 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** **Warning**: This command works only for the **json-file** or **journald**
logging drivers. logging drivers.
@ -46,7 +46,7 @@ logging drivers.
Output the specified number of lines at the end of logs (defaults to all logs) 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 The `--since` option can be Unix timestamps, date formatted timestamps, or Go
duration strings (e.g. `10m`, `1h30m`) computed relative to the client machines duration strings (e.g. `10m`, `1h30m`) computed relative to the client machine's
time. Supported formats for date formatted time stamps include RFC3339Nano, time. Supported formats for date formatted time stamps include RFC3339Nano,
RFC3339, `2006-01-02T15:04:05`, `2006-01-02T15:04:05.999999999`, 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 `2006-01-02Z07:00`, and `2006-01-02`. The local timezone on the client will be

View file

@ -103,7 +103,7 @@ pull** IMAGE, before it starts the container from that image.
In foreground mode (the default when **-d** In foreground mode (the default when **-d**
is not specified), **docker run** can start the process in the container is not specified), **docker run** can start the process in the container
and attach the console to the processs 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 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 executables expect) and pass along signals. The **-a** option can be set for
each of stdin, stdout, and stderr. 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) 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 can specify to which of the three standard streams (stdin, stdout, stderr)
youd 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 # 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 other containers, then the container's `/etc/hosts` file is updated
with the linked container's name. with the linked container's name.
> **Note** Since Docker may live update the containers `/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 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 empty or incomplete `/etc/hosts` file. In most cases, retrying the read again
should fix the problem. should fix the problem.