diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-cgtop.xml | 23 | ||||
| -rw-r--r-- | man/systemd-udevd.service.xml | 2 | ||||
| -rw-r--r-- | man/systemd.link.xml | 4 | ||||
| -rw-r--r-- | man/systemd.network.xml | 7 | ||||
| -rw-r--r-- | man/udev.xml | 3 |
5 files changed, 26 insertions, 13 deletions
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml index b0c88001d4..d14564480d 100644 --- a/man/systemd-cgtop.xml +++ b/man/systemd-cgtop.xml @@ -65,10 +65,12 @@ groups of the local Linux control group hierarchy, ordered by their CPU, memory, or disk I/O load. The display is refreshed in regular intervals (by default every 1s), similar in style to - <citerefentry project='man-pages'><refentrytitle>top</refentrytitle><manvolnum>1</manvolnum></citerefentry>. - If <command>systemd-cgtop</command> is not connected to a tty, - only one iteration is performed and no columns headers are - printed. This mode is suitable for scripting.</para> + <citerefentry project='man-pages'><refentrytitle>top</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para> + + <para>If <command>systemd-cgtop</command> is not connected to a tty, no + column headers are printed and the default is to only run one iteration. + The <varname>--iterations</varname> argument, if given, is still honored. + This mode is suitable for scripting.</para> <para>Resource usage is only accounted for control groups in the relevant hierarchy, i.e. CPU usage is only accounted for control @@ -143,11 +145,20 @@ </varlistentry> <varlistentry> + <term><option>-r</option></term> + <term><option>--raw</option></term> + + <listitem><para>Format byte counts (as in memory usage and IO metrics) + with raw numeric values rather than human-readable + numbers.</para></listitem> + </varlistentry> + + <varlistentry> <term><option>-n</option></term> <term><option>--iterations=</option></term> - <listitem><para>Perform only this many iterations. - </para></listitem> + <listitem><para>Perform only this many iterations. A value of 0 + indicates that the program should run indefinitely.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml index c0d323033c..7a4b62aaf1 100644 --- a/man/systemd-udevd.service.xml +++ b/man/systemd-udevd.service.xml @@ -106,7 +106,7 @@ <term><option>--event-timeout=</option></term> <listitem> <para>Set the number of seconds to wait for events to finish. After - this time the event will be terminated. The default is 30 seconds.</para> + this time the event will be terminated. The default is 180 seconds.</para> </listitem> </varlistentry> diff --git a/man/systemd.link.xml b/man/systemd.link.xml index 5db06842bd..723364f4d1 100644 --- a/man/systemd.link.xml +++ b/man/systemd.link.xml @@ -232,7 +232,9 @@ <para>If the kernel is using a random MAC address, nothing is done. Otherwise, a new address is randomly generated each time the device appears, typically at - boot.</para> + boot. Either way the random address will have the + <literal>unicast</literal> and + <literal>locally administered</literal> bits set.</para> </listitem> </varlistentry> </variablelist> diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 54fef4c9c4..bd061c270a 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -366,8 +366,7 @@ the routing table. Takes either a boolean argument, or the values <literal>ipv4</literal> or <literal>ipv6</literal>, which only enables IP forwarding for the specified address - family, or <literal>kernel</literal>, which preserves existing sysctl settings. - This controls the + family. This controls the <filename>net.ipv4.conf.<interface>.forwarding</filename> and <filename>net.ipv6.conf.<interface>.forwarding</filename> @@ -376,8 +375,8 @@ for details about sysctl options). Defaults to <literal>no</literal>.</para> - <para>Note: unless this option is turned on, or set to <literal>kernel</literal>, - no IP forwarding is done on this interface, even if this is + <para>Note: unless this option is turned on, no IP + forwarding is done on this interface, even if this is globally turned on in the kernel, with the <filename>net.ipv4.ip_forward</filename> and <filename>net.ipv4.ip_forward</filename> sysctl diff --git a/man/udev.xml b/man/udev.xml index d5d8a17cdb..70f4f59c08 100644 --- a/man/udev.xml +++ b/man/udev.xml @@ -472,7 +472,8 @@ <varlistentry> <term><literal>program</literal></term> <listitem> - <para>Execute an external program specified as the assigned value and + <para>Execute an external program specified as the assigned + value and if it returns successfully import its output, which must be in environment key format. Path specification, command/argument separation, and quoting work like in <varname>RUN</varname>.</para> |