From b9f0451fa35393ceedf6d9d20b78c43578ebea5d Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 12 Jul 2017 17:57:30 +0200
Subject: New upstream version 1.8.2

---
 man/NetworkManager.conf.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'man/NetworkManager.conf.xml')

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>
-- 
cgit 1.3.0-6-gf8a5