diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemctl.xml | 12 | ||||
| -rw-r--r-- | man/systemd-socket-proxyd.xml | 2 | ||||
| -rw-r--r-- | man/systemd.exec.xml | 8 | ||||
| -rw-r--r-- | man/systemd.socket.xml | 8 |
4 files changed, 19 insertions, 11 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml index acf975138a..1440d71925 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -760,18 +760,18 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <term><command>restart <replaceable>PATTERN</replaceable>…</command></term> <listitem> - <para>Restart one or more units specified on the command - line. If the units are not running yet, they will be - started.</para> + <para>Stop and then start one or more units specified on the + command line. If the units are not running yet, they will + be started.</para> </listitem> </varlistentry> <varlistentry> <term><command>try-restart <replaceable>PATTERN</replaceable>…</command></term> <listitem> - <para>Restart one or more units specified on the command - line if the units are running. This does nothing if units are not - running.</para> + <para>Stop and then start one or more units specified on the + command line if the units are running. This does nothing + if units are not running.</para> <!-- Note that we don't document condrestart here, as that is just compatibility support, and we generally don't document that. --> </listitem> diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml index 74d9e1c124..a86b13daa8 100644 --- a/man/systemd-socket-proxyd.xml +++ b/man/systemd-socket-proxyd.xml @@ -86,7 +86,7 @@ <xi:include href="standard-options.xml" xpointer="help" /> <xi:include href="standard-options.xml" xpointer="version" /> <varlistentry> - <term><option>--max-connections=</option></term> + <term><option>--connections-max=</option></term> <term><option>-c</option></term> <listitem><para>Sets the maximum number of simultaneous connections, defaults to 256. diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index fa3e6afe77..7bdac1c1d5 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -1179,12 +1179,12 @@ <listitem><para>Takes a mount propagation flag: <option>shared</option>, <option>slave</option> or <option>private</option>, which control whether mounts in the file system namespace set up for this unit's - processes will receive or propagate mounts or unmounts. See <citerefentry + processes will receive or propagate mounts and unmounts. See <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>2</manvolnum></citerefentry> for details. Defaults to <option>shared</option>. Use <option>shared</option> to ensure that mounts and unmounts - are propagated from the host to the container and vice versa. Use <option>slave</option> to run processes so - that none of their mounts and unmounts will propagate to the host. Use <option>private</option> to also ensure - that no mounts and unmounts from the host will propagate into the unit processes' namespace. + are propagated from systemd's namespace to the service's namespace and vice versa. Use <option>slave</option> + to run processes so that none of their mounts and unmounts will propagate to the host. Use <option>private</option> + to also ensure that no mounts and unmounts from the host will propagate into the unit processes' namespace. If this is set to <option>slave</option> or <option>private</option>, any mounts created by spawned processes will be unmounted after the completion of the current command line of <varname>ExecStartPre=</varname>, <varname>ExecStartPost=</varname>, <varname>ExecStart=</varname>, diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 0ce1203cfb..1d20a8f7f7 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -216,6 +216,14 @@ <varname>BindIPv6Only=</varname> setting (see below). </para> + <para>If the address string is a string in the format + <literal>vsock:x:y</literal>, it is read as CID <literal>x</literal> on + a port <literal>y</literal> address in the + <constant>AF_VSOCK</constant> family. The CID is a unique 32-bit + integer identifier in <constant>AF_VSOCK</constant> analogous to an IP + address. Specifying the CID is optional, and may be set to the empty + string.</para> + <para>Note that <constant>SOCK_SEQPACKET</constant> (i.e. <varname>ListenSequentialPacket=</varname>) is only available for <constant>AF_UNIX</constant> sockets. |