diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-cgtop.xml | 93 | ||||
| -rw-r--r-- | man/systemd.netdev.xml | 13 | ||||
| -rw-r--r-- | man/systemd.network.xml | 17 |
3 files changed, 100 insertions, 23 deletions
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml index e4bc22f278..0e0ea3ba7a 100644 --- a/man/systemd-cgtop.xml +++ b/man/systemd-cgtop.xml @@ -165,15 +165,39 @@ <listitem><para>Controls whether the CPU usage is shown as percentage or time. By default the CPU usage is shown as - percentage.</para></listitem> + percentage. This setting may also be toggled at runtime by + pressing the <keycap>%</keycap> key.</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>-k</option></term> + + <listitem><para>Include kernel threads when counting tasks in + control groups. By default, kernel threads are not included in + the count. This setting may also be toggled at runtime by + pressing the <keycap>k</keycap> key.</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--recursive=</option></term> + + <listitem><para>Controls whether the number of tasks shown for + a control group shall include all tasks that are contained in + any of the child control groups as well. Takes a boolean + argument, defaults to <literal>yes</literal>. If enabled the + tasks in child control groups are included, if disabled only + the tasks in the control group itself are counted. This + setting may also be toggled at runtime by pressing the + <keycap>r</keycap> key.</para></listitem> </varlistentry> <varlistentry> <term><option>-n</option></term> <term><option>--iterations=</option></term> - <listitem><para>Perform only this many iterations. A value of 0 - indicates that the program should run indefinitely.</para></listitem> + <listitem><para>Perform only this many iterations. A value of + 0 indicates that the program should run + indefinitely.</para></listitem> </varlistentry> <varlistentry> @@ -181,10 +205,11 @@ <term><option>--delay=</option></term> <listitem><para>Specify refresh delay in seconds (or if one of - <literal>ms</literal>, - <literal>us</literal>, + <literal>ms</literal>, <literal>us</literal>, <literal>min</literal> is specified as unit in this time - unit).</para></listitem> + unit). This setting may also be increased and decreased at + runtime by pressing the <keycap>+</keycap> and + <keycap>-</keycap> keys.</para></listitem> </varlistentry> <varlistentry> @@ -204,7 +229,6 @@ </refsect1> - <refsect1> <title>Keys</title> @@ -213,49 +237,72 @@ <variablelist> <varlistentry> - <term>h</term> + <term><keycap>h</keycap></term> <listitem><para>Shows a short help text.</para></listitem> </varlistentry> <varlistentry> - <term>SPACE</term> + <term><keycap function="space"/></term> <listitem><para>Immediately refresh output.</para></listitem> </varlistentry> <varlistentry> - <term>q</term> + <term><keycap>q</keycap></term> <listitem><para>Terminate the program.</para></listitem> </varlistentry> - <varlistentry> - <term>p</term> - <term>t</term> - <term>c</term> - <term>m</term> - <term>i</term> + <term><keycap>p</keycap></term> + <term><keycap>t</keycap></term> + <term><keycap>c</keycap></term> + <term><keycap>m</keycap></term> + <term><keycap>i</keycap></term> <listitem><para>Sort the control groups by path, number of - tasks, CPU load, memory usage, or IO load, respectively. - </para></listitem> + tasks, CPU load, memory usage, or IO load, respectively. This + setting may also be controlled using the + <option>--order=</option> command line + switch.</para></listitem> </varlistentry> <varlistentry> - <term>%</term> + <term><keycap>%</keycap></term> <listitem><para>Toggle between showing CPU time as time or - percentage.</para></listitem> + percentage. This setting may also be controlled using the + <option>--cpu=</option> command line switch.</para></listitem> </varlistentry> <varlistentry> - <term>+</term> - <term>-</term> + <term><keycap>+</keycap></term> + <term><keycap>-</keycap></term> <listitem><para>Increase or decrease refresh delay, - respectively.</para></listitem> + respectively. This setting may also be controlled using the + <option>--delay=</option> command line + switch.</para></listitem> + </varlistentry> + + <varlistentry> + <term><keycap>k</keycap></term> + + <listitem><para>Toggle between including or excluding kernel + threads in control group task counts. This setting may also be + controlled using the <option>-k</option> command line + switch.</para></listitem> + </varlistentry> + + <varlistentry> + <term><keycap>r</keycap></term> + + <listitem><para>Toggle between recursively including or + excluding tasks in child control groups in control group task + counts. This setting may also be controlled using the + <option>--recursive=</option> command line + switch.</para></listitem> </varlistentry> </variablelist> diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 2680627a78..05bbad7f65 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -535,6 +535,19 @@ </listitem> </varlistentry> <varlistentry> + <term><varname>EncapsulationLimit=</varname></term> + <listitem> + <para>The Tunnel Encapsulation Limit option specifies how many additional + levels of encapsulation are permitted to be prepended to the packet. + For example, a Tunnel Encapsulation Limit option containing a limit + value of zero means that a packet carrying that option may not enter + another tunnel before exiting the current tunnel. + (see <ulink url="https://tools.ietf.org/html/rfc2473#section-4.1.1"> RFC 2473</ulink>). + The valid range is 0-255 and <literal>none</literal>. Defaults to 4. + </para> + </listitem> + </varlistentry> + <varlistentry> <term><varname>Mode=</varname></term> <listitem> <para>An <literal>ip6tnl</literal> tunnels can have three diff --git a/man/systemd.network.xml b/man/systemd.network.xml index ded2c0ceff..2fb4733494 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -684,6 +684,23 @@ <variablelist class='network-directives'> <varlistentry> + <term><varname>PoolOffset=</varname></term> + <term><varname>PoolSize=</varname></term> + + <listitem><para>Configures the pool of addresses to hand out. The pool + is a contiguous sequence of IP addresses in the subnet configured for + the server address, which does not include the subnet nor the broadcast + address. <varname>PoolOffset=</varname> takes the offset of the pool + from the start of subnet, or zero to use the default value. + <varname>PoolSize=</varname> takes the number of IP addresses in the + pool or zero to use the default value. By default the pool starts at + the first address after the subnet address and takes up the rest of + the subnet, excluding the broadcast address. If the pool includes + the server address (the default), this is reserved and not handed + out to clients.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>DefaultLeaseTimeSec=</varname></term> <term><varname>MaxLeaseTimeSec=</varname></term> |