diff options
| author | Michael Biebl <biebl@debian.org> | 2017-07-12 17:58:09 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-07-12 17:58:09 +0200 |
| commit | 1c106aa806930113c6773992fa4ddce13e295ead (patch) | |
| tree | 2242b717e4060d33794b94d9c45f81e4007e3a3f /man/NetworkManager.conf.xml | |
| parent | eb2473a843f46fae54f981c822fcace18d8f6fdf (diff) | |
| parent | b9f0451fa35393ceedf6d9d20b78c43578ebea5d (diff) | |
Updated version 1.8.2 from 'upstream/1.8.2'
with Debian dir 0d04ce142632bf08356d8d906289b6fc2de9e7c1
Diffstat (limited to 'man/NetworkManager.conf.xml')
| -rw-r--r-- | man/NetworkManager.conf.xml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 658fd7c2..9e0ad9ba 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -409,6 +409,19 @@ no-auto-default=* </listitem> </varlistentry> + <varlistentry> + <term><varname>slaves-order</varname></term> + <listitem> + <para> + This key specifies in which order slave connections are + auto-activated on boot or when the master activates + them. Allowed values are <literal>name</literal> (order + connection by interface name, the default), or + <literal>index</literal> (order slaves by their kernel + index). + </para> + </listitem> + </varlistentry> </variablelist> </refsect1> @@ -642,7 +655,7 @@ ipv6.ip6-privacy=0 </varlistentry> <varlistentry> <term><varname>ethernet.mtu</varname></term> - <listitem><para>If configured explicitly to 0, the MTU is not reconfigured during device activation unless it is required due to IPv6 constraints. If left unspecified, a DHCP/IPv6 SLAAC provided value is used or a default of 1500.</para></listitem> + <listitem><para>If configured explicitly to 0, the MTU is not reconfigured during device activation unless it is required due to IPv6 constraints. If left unspecified, a DHCP/IPv6 SLAAC provided value is used or the MTU is not reconfigured during activation.</para></listitem> </varlistentry> <varlistentry> <term><varname>ethernet.wake-on-lan</varname></term> |