Imported Upstream version 1.2.4 upstream/1.2.4

15 files changed, 148 insertions, 14 deletions

diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in
index 7407f4fa..bc388a41 100644
--- a/docs/api/Makefile.in
+++ b/docs/api/Makefile.in
@@ -274,6 +274,7 @@ NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
+NM_CONFIG_DEFAULT_DNS_RC_MANAGER = @NM_CONFIG_DEFAULT_DNS_RC_MANAGER@
 NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@
 NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index 0c05211a..828776ff 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -64,6 +64,10 @@
     This file is not intended to be modified by the user, but it is read last and can shadow
     user configuration from <code class="literal">NetworkManager.conf</code>.
     </p>
+<p>
+    Certain settings from the configuration can be reloaded at runtime either by sending SIGHUP signal or via
+    D-Bus' Reload call.
+    </p>
 </div>
 <div class="refsect1">
 <a name="id-1.2.5.6"></a><h2>File Format</h2>
@@ -296,7 +300,8 @@ no-auto-default=*
         configuration with DNSSEC support. The /etc/resolv.conf
         will be managed by dnssec-trigger daemon.</p>
 <p><code class="literal">none</code>: NetworkManager will not
-        modify resolv.conf.</p>
+        modify resolv.conf. This implies <code class="varname">rc-manager</code>
+        <code class="literal">unmanaged</code></p>
 </td>
 </tr>
 <tr>
@@ -304,17 +309,25 @@ no-auto-default=*
 <td>
 <p>Set the <code class="filename">resolv.conf</code>
         management mode. The default value depends on how NetworkManager
-        was built. Regardless of this setting, NetworkManager will
+        was built, whereas this version of NetworkManager was build with
+        a default of "<code class="literal">symlink</code>".
+        Regardless of this setting, NetworkManager will
         always write resolv.conf to its runtime state directory.</p>
-<p><code class="literal">none</code>: NetworkManager will symlink
+<p><code class="literal">symlink</code>: NetworkManager will symlink
         <code class="filename">/etc/resolv.conf</code> to its private
         resolv.conf file in the runtime state directory.</p>
 <p><code class="literal">file</code>: NetworkManager will write
-        <code class="filename">/etc/resolv.conf</code> as file.</p>
+        <code class="filename">/etc/resolv.conf</code> as file. If it finds
+        a symlink, it will follow the symlink and update the target
+        instead.</p>
 <p><code class="literal">resolvconf</code>: NetworkManager will run
         resolvconf to update the DNS configuration.</p>
 <p><code class="literal">netconfig</code>: NetworkManager will run
         netconfig to update the DNS configuration.</p>
+<p><code class="literal">unmanaged</code>: don't touch
+        <code class="filename">resolv.conf</code>.</p>
+<p><code class="literal">none</code>: deprecated alias for
+        <code class="literal">symlink</code>.</p>
 </td>
 </tr>
 <tr>
@@ -363,7 +376,7 @@ no-auto-default=*
 <tr>
 <td><p><span class="term"><code class="varname">path</code></span></p></td>
 <td><p>The location where keyfiles are read and stored.
-            This defaults to "<code class="filename">/etc/NetworkManager/conf.d</code>".
+            This defaults to "<code class="filename">${prefix}/etc/NetworkManager/conf.d</code>".
             </p></td>
 </tr>
 <tr>
@@ -649,8 +662,10 @@ ipv6.ip6-privacy=1
           considered even if the property in question is not present. In
           the example above, if <code class="literal">[connection-wifi-wlan0]</code> would
           have <code class="literal">stop-match</code> set to <code class="literal">yes</code>,
-          its <code class="literal">ipv6.ip6-privacy</code> value would be
-          unspecified.
+          the device <code class="literal">wlan0</code> would have <code class="literal">ipv6.ip6-privacy</code>
+          property unspecified. That is, the search for the property would not continue
+          in the connection sections <code class="literal">[connection-wifi-other]</code>
+          or <code class="literal">[connection]</code>.
           </p></td>
 </tr>
 </tbody>
diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index 850ff2e2..c0e6a7af 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -61,6 +61,7 @@
     <sub name="License" link="license.html"/>
   </chapters>
   <functions>
+    <keyword type="method" name="The Reload() method" link="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.Reload"/>
     <keyword type="method" name="The GetDevices() method" link="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetDevices"/>
     <keyword type="method" name="The GetAllDevices() method" link="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetAllDevices"/>
     <keyword type="method" name="The GetDeviceByIpIface() method" link="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetDeviceByIpIface"/>
@@ -317,6 +318,7 @@
     <keyword type="property" name="The &quot;Domains&quot; property" link="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Domains"/>
     <keyword type="property" name="The &quot;Searches&quot; property" link="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Searches"/>
     <keyword type="property" name="The &quot;DnsOptions&quot; property" link="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsOptions"/>
+    <keyword type="property" name="The &quot;DnsPriority&quot; property" link="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority"/>
     <keyword type="property" name="The &quot;WinsServers&quot; property" link="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServers"/>
     <keyword type="signal" name="The &quot;PropertiesChanged&quot; signal" link="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-signal-org-freedesktop-NetworkManager-IP6Config.PropertiesChanged"/>
     <keyword type="property" name="The &quot;Addresses&quot; property" link="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Addresses"/>
@@ -328,6 +330,7 @@
     <keyword type="property" name="The &quot;Domains&quot; property" link="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Domains"/>
     <keyword type="property" name="The &quot;Searches&quot; property" link="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Searches"/>
     <keyword type="property" name="The &quot;DnsOptions&quot; property" link="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsOptions"/>
+    <keyword type="property" name="The &quot;DnsPriority&quot; property" link="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority"/>
     <keyword type="method" name="The Connect() method" link="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Connect"/>
     <keyword type="method" name="The ConnectInteractive() method" link="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.ConnectInteractive"/>
     <keyword type="method" name="The NeedSecrets() method" link="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NeedSecrets"/>
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>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html
index fd291730..5f2615cf 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html
@@ -51,6 +51,7 @@
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Domains" title='The "Domains" property'>Domains</a>      readable   as
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Searches" title='The "Searches" property'>Searches</a>     readable   as
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsOptions" title='The "DnsOptions" property'>DnsOptions</a>   readable   as
+<a class="link" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority" title='The "DnsPriority" property'>DnsPriority</a>  readable   i
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServers" title='The "WinsServers" property'>WinsServers</a>  readable   au
 </pre>
 </div>
@@ -173,6 +174,15 @@ DnsOptions  readable   as
 </div>
 <hr>
 <div class="refsect2">
+<a name="gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority"></a><h3>The "DnsPriority" property</h3>
+<pre class="programlisting">
+DnsPriority  readable   i
+</pre>
+<p>        The relative priority of DNS servers.
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServers"></a><h3>The "WinsServers" property</h3>
 <pre class="programlisting">
 WinsServers  readable   au
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
index 9bd4562a..65995603 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
@@ -51,6 +51,7 @@
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Domains" title='The "Domains" property'>Domains</a>      readable   as
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Searches" title='The "Searches" property'>Searches</a>     readable   as
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsOptions" title='The "DnsOptions" property'>DnsOptions</a>   readable   as
+<a class="link" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority" title='The "DnsPriority" property'>DnsPriority</a>  readable   i
 </pre>
 </div>
 <div class="refsect1">
@@ -165,6 +166,15 @@ DnsOptions  readable   as
         resolv.conf(5) manual page for the list of supported options.
 </p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority"></a><h3>The "DnsPriority" property</h3>
+<pre class="programlisting">
+DnsPriority  readable   i
+</pre>
+<p>        The relative priority of DNS servers.
+</p>
+</div>
 </div>
 </div>
 <div class="footer">
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
index c72f1e26..f97d5301 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
@@ -36,6 +36,7 @@
 <div class="refsynopsisdiv">
 <h2>Methods</h2>
 <pre class="synopsis">
+<a class="link" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.Reload" title="The Reload() method">Reload</a>                   (IN  u         flags);
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetDevices" title="The GetDevices() method">GetDevices</a>               (OUT ao        devices);
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetAllDevices" title="The GetAllDevices() method">GetAllDevices</a>            (OUT ao        devices);
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetDeviceByIpIface" title="The GetDeviceByIpIface() method">GetDeviceByIpIface</a>       (IN  s         iface,
@@ -102,6 +103,43 @@
 <div class="refsect1">
 <a name="gdbus-methods-org.freedesktop.NetworkManager"></a><h2>Method Details</h2>
 <div class="refsect2">
+<a name="gdbus-method-org-freedesktop-NetworkManager.Reload"></a><h3>The Reload() method</h3>
+<pre class="programlisting">
+Reload (IN  u flags);
+</pre>
+<p>        Reload NetworkManager's configuration and perform certain updates, like flushing a cache or
+        rewriting external state to disk. This is similar to sending SIGHUP to NetworkManager but it
+        allows for more fine-grained control over what to reload (see <em class="parameter"><code>flags</code></em>). It also allows
+        non-root access via PolicyKit and contrary to signals it is synchronous.
+</p>
+<p>        No flags (0x00) means to reload everything that is supported which is identical to
+        sending a SIGHUP.
+        (0x01) means to reload the NetworkManager.conf configuration from disk. Note that this
+        does not include connections, which can be reloaded via Setting's ReloadConnections.
+        (0x02) means to update DNS configuration, which usually involves writing /etc/resolv.conf
+        anew.
+        (0x04) means to restart the DNS plugin. This is for example useful when using
+        dnsmasq plugin, which uses additional configuration in /etc/NetworkManager/dnsmasq.d.
+        If you edit those files, you can restart the DNS plugin. This action shortly interrupts
+        rename resolution.
+        Note that flags may affect each other. For example, restarting the DNS plugin (0x04)
+        implicitly updates DNS too (0x02). Or when reloading the configuration (0x01), changes
+        to DNS setting also cause a DNS update (0x02). However, (0x01) does not involve restarting
+        the DNS plugin (0x02), unless an entirely different plugin is selected.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody><tr>
+<td><p><span class="term"><code class="literal">IN u <em class="parameter"><code>flags</code></em></code>:</span></p></td>
+<td><p>optional flags to specify which parts shall be reloaded.</p></td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="gdbus-method-org-freedesktop-NetworkManager.GetDevices"></a><h3>The GetDevices() method</h3>
 <pre class="programlisting">
 GetDevices (OUT ao devices);
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index 15870791..59c5412e 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -14,7 +14,7 @@
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">Version 1.2.2
+<div><p class="releaseinfo">Version 1.2.4
 </p></div>
 <div><p class="copyright">Copyright © 2012, 2013, 2014, 2015, 2016 The NetworkManager Authors</p></div>
 <div><div class="legalnotice">
diff --git a/docs/api/html/index.sgml b/docs/api/html/index.sgml
index 49e4a4c1..3ffc813b 100644
--- a/docs/api/html/index.sgml
+++ b/docs/api/html/index.sgml
@@ -53,6 +53,7 @@
 <ANCHOR id="gdbus-org.freedesktop.NetworkManager" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.html">
 <ANCHOR id="gdbus-interface-org-freedesktop-NetworkManager" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.html#gdbus-interface-org-freedesktop-NetworkManager">
 <ANCHOR id="gdbus-methods-org.freedesktop.NetworkManager" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.html#gdbus-methods-org.freedesktop.NetworkManager">
+<ANCHOR id="gdbus-method-org-freedesktop-NetworkManager.Reload" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.Reload">
 <ANCHOR id="gdbus-method-org-freedesktop-NetworkManager.GetDevices" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetDevices">
 <ANCHOR id="gdbus-method-org-freedesktop-NetworkManager.GetAllDevices" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetAllDevices">
 <ANCHOR id="gdbus-method-org-freedesktop-NetworkManager.GetDeviceByIpIface" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetDeviceByIpIface">
@@ -430,6 +431,7 @@
 <ANCHOR id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Domains" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Domains">
 <ANCHOR id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Searches" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Searches">
 <ANCHOR id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsOptions" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsOptions">
+<ANCHOR id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority">
 <ANCHOR id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServers" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServers">
 <ANCHOR id="gdbus-org.freedesktop.NetworkManager.IP6Config" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.IP6Config.html">
 <ANCHOR id="gdbus-interface-org-freedesktop-NetworkManager-IP6Config" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-interface-org-freedesktop-NetworkManager-IP6Config">
@@ -445,6 +447,7 @@
 <ANCHOR id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Domains" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Domains">
 <ANCHOR id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Searches" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Searches">
 <ANCHOR id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsOptions" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsOptions">
+<ANCHOR id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority">
 <ANCHOR id="gdbus-org.freedesktop.NetworkManager.VPN.Plugin" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html">
 <ANCHOR id="gdbus-interface-org-freedesktop-NetworkManager-VPN-Plugin" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-interface-org-freedesktop-NetworkManager-VPN-Plugin">
 <ANCHOR id="gdbus-methods-org.freedesktop.NetworkManager.VPN.Plugin" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-methods-org.freedesktop.NetworkManager.VPN.Plugin">
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index c74a0c5f..9b0fe805 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -350,6 +350,8 @@
 </dt>
 <dt>org.freedesktop.NetworkManager.IP4Config:DnsOptions, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsOptions">The "DnsOptions" property</a>
 </dt>
+<dt>org.freedesktop.NetworkManager.IP4Config:DnsPriority, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority">The "DnsPriority" property</a>
+</dt>
 <dt>org.freedesktop.NetworkManager.IP4Config:Domains, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Domains">The "Domains" property</a>
 </dt>
 <dt>org.freedesktop.NetworkManager.IP4Config:Gateway, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Gateway">The "Gateway" property</a>
@@ -374,6 +376,8 @@
 </dt>
 <dt>org.freedesktop.NetworkManager.IP6Config:DnsOptions, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsOptions">The "DnsOptions" property</a>
 </dt>
+<dt>org.freedesktop.NetworkManager.IP6Config:DnsPriority, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority">The "DnsPriority" property</a>
+</dt>
 <dt>org.freedesktop.NetworkManager.IP6Config:Domains, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Domains">The "Domains" property</a>
 </dt>
 <dt>org.freedesktop.NetworkManager.IP6Config:Gateway, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Gateway">The "Gateway" property</a>
@@ -573,6 +577,8 @@
 </dt>
 <dt>org.freedesktop.NetworkManager.GetPermissions(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetPermissions">The GetPermissions() method</a>
 </dt>
+<dt>org.freedesktop.NetworkManager.Reload(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.Reload">The Reload() method</a>
+</dt>
 <dt>org.freedesktop.NetworkManager.SetLogging(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.SetLogging">The SetLogging() method</a>
 </dt>
 <dt>org.freedesktop.NetworkManager.Sleep(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.Sleep">The Sleep() method</a>
diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html
index b677ece9..4b300bc7 100644
--- a/docs/api/html/nm-settings.html
+++ b/docs/api/html/nm-settings.html
@@ -1128,6 +1128,12 @@
 <td>Array of DNS options. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.</td>
 </tr>
 <tr>
+<td align="left">dns-priority</td>
+<td align="left">int32</td>
+<td align="left">0</td>
+<td>DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used.</td>
+</tr>
+<tr>
 <td align="left">dns-search</td>
 <td align="left">array of string</td>
 <td align="left">[]</td>
@@ -1267,6 +1273,12 @@
 <td>Array of DNS options. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.</td>
 </tr>
 <tr>
+<td align="left">dns-priority</td>
+<td align="left">int32</td>
+<td align="left">0</td>
+<td>DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used.</td>
+</tr>
+<tr>
 <td align="left">dns-search</td>
 <td align="left">array of string</td>
 <td align="left">[]</td>
diff --git a/docs/api/html/nmcli-examples.html b/docs/api/html/nmcli-examples.html
index 3e9d0b52..41c3cac7 100644
--- a/docs/api/html/nmcli-examples.html
+++ b/docs/api/html/nmcli-examples.html
@@ -127,7 +127,8 @@ org.freedesktop.NetworkManager.wifi.share.protected       yes
 org.freedesktop.NetworkManager.wifi.share.open            yes
 org.freedesktop.NetworkManager.settings.modify.system     yes
 org.freedesktop.NetworkManager.settings.modify.own        yes
-org.freedesktop.NetworkManager.settings.modify.hostname   auth</pre>
+org.freedesktop.NetworkManager.settings.modify.hostname   auth
+org.freedesktop.NetworkManager.reload                     no</pre>
 <p>
         This command shows configured polkit permissions for various NetworkManager
         operations. These permissions or actions (using polkit language) are configured
diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html
index ab610728..fe268fe0 100644
--- a/docs/api/html/ref-settings.html
+++ b/docs/api/html/ref-settings.html
@@ -1083,6 +1083,12 @@
 <td>Array of DNS options. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.</td>
 </tr>
 <tr>
+<td><pre class="screen">dns-priority</pre></td>
+<td><pre class="screen">int32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used.</td>
+</tr>
+<tr>
 <td><pre class="screen">dns-search</pre></td>
 <td><pre class="screen">array of string</pre></td>
 <td><pre class="screen">[]</pre></td>
@@ -1223,6 +1229,12 @@
 <td>Array of DNS options. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.</td>
 </tr>
 <tr>
+<td><pre class="screen">dns-priority</pre></td>
+<td><pre class="screen">int32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used.</td>
+</tr>
+<tr>
 <td><pre class="screen">dns-search</pre></td>
 <td><pre class="screen">array of string</pre></td>
 <td><pre class="screen">[]</pre></td>
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index 8bcbf25e..22398ad1 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -158,6 +158,7 @@
     <row><entry><screen>dhcp-timeout</screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>A timeout for a DHCP transaction in seconds.</entry></row>
     <row><entry><screen>dns</screen></entry><entry><screen>array of uint32</screen></entry><entry><screen>[]</screen></entry><entry>Array of IP addresses of DNS servers (as network-byte-order integers)</entry></row>
     <row><entry><screen>dns-options</screen></entry><entry><screen>array of string</screen></entry><entry><screen>[]</screen></entry><entry>Array of DNS options. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.</entry></row>
+    <row><entry><screen>dns-priority</screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used.</entry></row>
     <row><entry><screen>dns-search</screen></entry><entry><screen>array of string</screen></entry><entry><screen>[]</screen></entry><entry>Array of DNS search domains.</entry></row>
     <row><entry><screen>gateway</screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>The gateway associated with this configuration. This is only meaningful if "addresses" is also set.</entry></row>
     <row><entry><screen>ignore-auto-dns</screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry>When "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.</entry></row>
@@ -180,6 +181,7 @@
     <row><entry><screen>dhcp-timeout</screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>A timeout for a DHCP transaction in seconds.</entry></row>
     <row><entry><screen>dns</screen></entry><entry><screen>array of byte array</screen></entry><entry><screen>[]</screen></entry><entry>Array of IP addresses of DNS servers (in network byte order)</entry></row>
     <row><entry><screen>dns-options</screen></entry><entry><screen>array of string</screen></entry><entry><screen>[]</screen></entry><entry>Array of DNS options. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.</entry></row>
+    <row><entry><screen>dns-priority</screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used.</entry></row>
     <row><entry><screen>dns-search</screen></entry><entry><screen>array of string</screen></entry><entry><screen>[]</screen></entry><entry>Array of DNS search domains.</entry></row>
     <row><entry><screen>gateway</screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>The gateway associated with this configuration. This is only meaningful if "addresses" is also set.</entry></row>
     <row><entry><screen>ignore-auto-dns</screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry>When "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.</entry></row>
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 23aa8390..e8ea05db 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.2.2
+1.2.4