From 2bfb3eb7d0323e69affca154395f51d8b577414d Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 6 Apr 2016 00:46:19 +0200
Subject: Imported Upstream version 1.1.93

---
 man/NetworkManager.conf.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 597f373f..3427cd64 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -138,7 +138,13 @@ plugins-=remove-me
         the connection files at startup, and when explicitly requested
         via the ReloadConnections D-Bus call. If this key is set to
         '<literal>true</literal>', then NetworkManager will reload
-        connection files any time they changed.</para></listitem>
+        connection files any time they changed.
+        Automatic reloading is not advised because there are race conditions
+        involved and it depends on the way how the editor updates the file.
+        In some situations, NetworkManager might first delete and add the
+        connection anew, instead of updating the existing one. Also, NetworkManager
+        might pick up incomplete settings while the user is still editing the files.
+        </para></listitem>
       </varlistentry>
       <varlistentry>
         <term><varname>auth-polkit</varname></term>
@@ -1004,7 +1010,7 @@ interface-name:vboxnet*,except:interface-name:vboxnet2
     <para>
       <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-- 
cgit 1.3.0-6-gf8a5