From d6201f5d8daada3d64a0a3e0038e14eebec683ce Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 3 Aug 2016 22:59:23 +0200
Subject: Imported Upstream version 1.2.4

---
 docs/api/html/NetworkManager.html | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'docs/api/html/NetworkManager.html')

diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html
index 835a7e66..5467a3a8 100644
--- a/docs/api/html/NetworkManager.html
+++ b/docs/api/html/NetworkManager.html
@@ -436,26 +436,47 @@
           The signal causes a reload of NetworkManager's configuration.
           Note that not all configuration parameters can be changed at
           runtime and therefore some changes may be applied only after
-          the next restart of the daemon. The signal also forces a
-          rewrite of DNS configuration.
+          the next restart of the daemon.
+          A SIGHUP also involves further reloading actions, like doing
+          a DNS update and restarting the DNS plugin. The latter can be
+          useful for example when using the dnsmasq plugin and changing
+          its configuration in /etc/NetworkManager/dnsmasq.d. However,
+          it also means this will shortly interrupt name resolution.
+          In the future, there may be further actions added.
+          A SIGHUP means to update NetworkManager configuration and reload
+          everything that is supported. Note that this does not reload
+          connections from disk. For that there is a D-Bus API and
+          nmcli's reload action
           </p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="varname">SIGUSR1</code></span></p></td>
 <td><p>
-            The signal forces a rewrite of DNS configuration.
+            The signal forces a rewrite of DNS configuration. Contrary to
+            SIGHUP, this does not restart the DNS plugin and will not interrupt
+            name resolution.
+            In the future, further actions may be added. A SIGUSR1
+            means to write out data like resolv.conf, or refresh a cache.
+            It is a subset of what is done for SIGHUP without reloading
+            configuration from disk.
           </p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="varname">SIGUSR2</code></span></p></td>
 <td><p>
-            The signal has no effect at the moment.
+            The signal has no effect at the moment but is reserved for future
+            use.
           </p></td>
 </tr>
 </tbody>
 </table></div>
 <p>
     </p>
+<p>
+      An alternative to a signal to reload configuration is the Reload D-Bus call.
+      It allows for more fine-grained selection of what to reload, it only returns
+      after the reload is complete, and it is guarded by PolicyKit.
+    </p>
 </div>
 <div class="refsect1">
 <a name="id-1.2.10.10"></a><h2>DEBUGGING</h2>
-- 
cgit 1.3.0-6-gf8a5