diff options
Diffstat (limited to 'man/systemd.netdev.xml')
| -rw-r--r-- | man/systemd.netdev.xml | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index b100f96b85..6287a00f9d 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -80,11 +80,9 @@ <filename>/run</filename> take precedence over files with the same name in <filename>/usr/lib</filename>. This can be used to override a system-supplied configuration file with a local file if - needed; a symlink in <filename>/etc</filename> with the same name - as a configuration file in <filename>/usr/lib</filename>, pointing - to <filename>/dev/null</filename>, disables the configuration file - entirely.</para> - + needed. As a special case, an empty file (file size 0) or symlink + with the same name pointing to <filename>/dev/null</filename>, + disable the configuration file entirely (it is "masked").</para> </refsect1> <refsect1> @@ -500,17 +498,18 @@ A Flow Label of zero is used to indicate packets that have not been labeled. Takes following values. When <literal>inherit</literal> it uses the original flowlabel, - or can be configured to any value betwen 0 to 0xFFFFF.</para> + or can be configured to any value between 0 to 0xFFFFF.</para> </listitem> </varlistentry> <varlistentry> - <term><varname>DiffServiceCodePoint=</varname></term> + <term><varname>CopyDSCP=</varname></term> <listitem> - <para>A boolean. When true, inherits the Differentiated - Service Code Point (DSCP) field between inner and outer - header for ip6_tunnel. DSCP is a field in an IP packet - that enables different levels of service to be assigned - to network traffic. Defaults to <literal>no</literal>. + <para>A boolean. When true, the Differentiated Service Code + Point (DSCP) field will be copied to the inner header from + outer header during the decapsulation of an IPv6 tunnel + packet. DSCP is a field in an IP packet that enables different + levels of service to be assigned to network traffic. + Defaults to <literal>no</literal>. </para> </listitem> </varlistentry> @@ -678,7 +677,7 @@ <listitem> <para>Specifies the frequency that Media Independent Interface link monitoring will occur. A value of zero - disables MII link monitoring. This values is rounded down to + disables MII link monitoring. This value is rounded down to the nearest millisecond. The default value is 0.</para> </listitem> </varlistentry> @@ -822,7 +821,7 @@ <listitem> <para> Specify the number of packets to transmit through a slave before moving to the next one. When set to 0 then a slave is chosen at - random.The valid range is (0 - 65535). Defaults to 1. This option + random. The valid range is (0 - 65535). Defaults to 1. This option has effect only in balance-rr mode. </para> </listitem> |