New upstream version 1.42.2 upstream/1.42.2

12 files changed, 128 insertions, 18 deletions

diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml
index 00f2a708..d824fbad 100644
--- a/docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml
+++ b/docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml
@@ -30,6 +30,7 @@
 <link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip6Config">Ip6Config</link>       readable   o
 <link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Dhcp6Config">Dhcp6Config</link>     readable   o
 <link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Vpn">Vpn</link>             readable   b
+<link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Controller">Controller</link>      readable   o
 <link linkend="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Master">Master</link>          readable   o
 </synopsis>
   </refsect1>
@@ -253,6 +254,17 @@ Vpn  readable   b
 Whether this active connection is also a VPN connection.
 </para>
 </refsect2>
+<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Controller">
+  <title>The "Controller" property</title>
+  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Controller"><primary sortas="ActiveConnection:Controller">org.freedesktop.NetworkManager.Connection.Active:Controller</primary></indexterm>
+<programlisting>
+Controller  readable   o
+</programlisting>
+<para>
+The path to the controller device if the connection is a port. This
+property replaces the deprecated 'Master' property.
+</para>
+</refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Master">
   <title>The "Master" property</title>
   <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Master"><primary sortas="ActiveConnection:Master">org.freedesktop.NetworkManager.Connection.Active:Master</primary></indexterm>
@@ -260,7 +272,10 @@ Whether this active connection is also a VPN connection.
 Master  readable   o
 </programlisting>
 <para>
-The path to the master device if the connection is a slave.
+The path to the controller device if the connection is a port.
+</para><para>
+This property is deprecated in favor of the 'Controller'
+property since 1.44 and 1.42.2.
 </para>
 </refsect2>
 </refsect1>
diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index 1f1a58c1..33b73bdf 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -434,6 +434,7 @@
     <keyword type="property" name="The &quot;Ip6Config&quot; property" link="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip6Config"/>
     <keyword type="property" name="The &quot;Dhcp6Config&quot; property" link="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Dhcp6Config"/>
     <keyword type="property" name="The &quot;Vpn&quot; property" link="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Vpn"/>
+    <keyword type="property" name="The &quot;Controller&quot; property" link="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Controller"/>
     <keyword type="property" name="The &quot;Master&quot; property" link="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Master"/>
     <keyword type="signal" name="The &quot;VpnStateChanged&quot; signal" link="gdbus-org.freedesktop.NetworkManager.VPN.Connection.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Connection.VpnStateChanged"/>
     <keyword type="property" name="The &quot;VpnState&quot; property" link="gdbus-org.freedesktop.NetworkManager.VPN.Connection.html#gdbus-property-org-freedesktop-NetworkManager-VPN-Connection.VpnState"/>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
index f6e96ea6..afd8aea2 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
@@ -58,6 +58,7 @@
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip6Config" title='The "Ip6Config" property'>Ip6Config</a>       readable   o
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Dhcp6Config" title='The "Dhcp6Config" property'>Dhcp6Config</a>     readable   o
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Vpn" title='The "Vpn" property'>Vpn</a>             readable   b
+<a class="link" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Controller" title='The "Controller" property'>Controller</a>      readable   o
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Master" title='The "Master" property'>Master</a>          readable   o
 </pre>
 </div>
@@ -289,12 +290,27 @@ Whether this active connection is also a VPN connection.
 </div>
 <hr>
 <div class="refsect2">
+<a name="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Controller"></a><h3>The "Controller" property</h3>
+<pre class="programlisting">
+Controller  readable   o
+</pre>
+<p>
+The path to the controller device if the connection is a port. This
+property replaces the deprecated 'Master' property.
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Master"></a><h3>The "Master" property</h3>
 <pre class="programlisting">
 Master  readable   o
 </pre>
 <p>
-The path to the master device if the connection is a slave.
+The path to the controller device if the connection is a port.
+</p>
+<p>
+This property is deprecated in favor of the 'Controller'
+property since 1.44 and 1.42.2.
 </p>
 </div>
 </div>
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index f9ac99a9..24562d5c 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -16,7 +16,7 @@
 <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">
-      for NetworkManager 1.42.0
+      for NetworkManager 1.42.2
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://networkmanager.dev/docs/api/latest/" target="_top">https://networkmanager.dev/docs/api/latest/</a>.
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index 01dd7cd9..e087c18a 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -519,6 +519,8 @@
 </dt>
 <dt id="ientry-id-1.4.9.2.7.2.2">org.freedesktop.NetworkManager.Connection.Active:Connection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Connection">The "Connection" property</a>
 </dt>
+<dt id="ientry-id-1.4.9.2.7.17.2">org.freedesktop.NetworkManager.Connection.Active:Controller, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Controller">The "Controller" property</a>
+</dt>
 <dt id="ientry-id-1.4.9.2.7.10.2">org.freedesktop.NetworkManager.Connection.Active:Default, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Default">The "Default" property</a>
 </dt>
 <dt id="ientry-id-1.4.9.2.7.13.2">org.freedesktop.NetworkManager.Connection.Active:Default6, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Default6">The "Default6" property</a>
@@ -535,7 +537,7 @@
 </dt>
 <dt id="ientry-id-1.4.9.2.7.14.2">org.freedesktop.NetworkManager.Connection.Active:Ip6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip6Config">The "Ip6Config" property</a>
 </dt>
-<dt id="ientry-id-1.4.9.2.7.17.2">org.freedesktop.NetworkManager.Connection.Active:Master, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Master">The "Master" property</a>
+<dt id="ientry-id-1.4.9.2.7.18.2">org.freedesktop.NetworkManager.Connection.Active:Master, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Master">The "Master" property</a>
 </dt>
 <dt id="ientry-id-1.4.9.2.7.3.2">org.freedesktop.NetworkManager.Connection.Active:SpecificObject, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.SpecificObject">The "SpecificObject" property</a>
 </dt>
@@ -1413,21 +1415,23 @@
 </dt>
 <dt id="ientry-id-1.3.3.19.2.2.1.1.2.12.1.1.1">remote, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
+<dt id="ientry-id-1.3.3.17.2.2.1.1.2.26.1.1.1">replace-local-rule, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+</dt>
 <dt id="ientry-id-1.3.3.29.2.2.1.1.2.17.1.1.1">require-mppe, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
 <dt id="ientry-id-1.3.3.29.2.2.1.1.2.18.1.1.1">require-mppe-128, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-id-1.3.3.17.2.2.1.1.2.26.1.1.1">required-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-id-1.3.3.17.2.2.1.1.2.27.1.1.1">required-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-id-1.3.3.17.2.2.1.1.2.27.1.1.1">route-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-id-1.3.3.17.2.2.1.1.2.28.1.1.1">route-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-id-1.3.3.17.2.2.1.1.2.28.1.1.1">route-metric, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-id-1.3.3.17.2.2.1.1.2.29.1.1.1">route-metric, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-id-1.3.3.17.2.2.1.1.2.29.1.1.1">route-table, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-id-1.3.3.17.2.2.1.1.2.30.1.1.1">route-table, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-id-1.3.3.17.2.2.1.1.2.30.1.1.1">routes, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-id-1.3.3.17.2.2.1.1.2.31.1.1.1">routes, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-id-1.3.3.17.2.2.1.1.2.31.1.1.1">routing-rules, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-id-1.3.3.17.2.2.1.1.2.32.1.1.1">routing-rules, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
 <dt id="ientry-id-1.3.3.42.2.2.1.1.2.12.1.1.1">rsc, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
@@ -1527,7 +1531,7 @@
 </dt>
 <dt id="ientry-id-1.3.3.2.2.2.1.1.2.23.1.1.1">timestamp, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-id-1.3.3.18.2.2.1.1.2.33.1.1.1">token, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-id-1.3.3.18.2.2.1.1.2.34.1.1.1">token, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
 <dt id="ientry-id-1.3.3.19.2.2.1.1.2.13.1.1.1">tos, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html
index 96bd6976..1ce7840d 100644
--- a/docs/api/html/nm-settings-dbus.html
+++ b/docs/api/html/nm-settings-dbus.html
@@ -1726,7 +1726,13 @@ When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0),
 <a name="nm-settings-dbus.property.ipv4.dhcp-iaid"></a>dhcp-iaid</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.</td>
+<td>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or or as colon separated hexadecimal numbers). Alternatively it can be set to the special values "mac", "perm-mac", "ifname" or "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname".
+
+For DHCPv4, the IAID is only used with "ipv4.dhcp-client-id" values "duid" and "ipv6-duid" to generate the client-id.
+
+For DHCPv6, note that at the moment this property is only supported by the "internal" DHCPv6 plugin. The "dhclient" DHCPv6 plugin always derives the IAID from the MAC address.
+
+The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device.</td>
 </tr>
 <tr>
 <td align="left">
@@ -1888,6 +1894,13 @@ For IPv4 method "shared", the IP subnet can be configured by adding one manual I
 </tr>
 <tr>
 <td align="left">
+<a name="nm-settings-dbus.property.ipv4.replace-local-rule"></a>replace-local-rule</td>
+<td align="left">NMTernary (int32)</td>
+<td align="left"> </td>
+<td>Connections will default to keep the autogenerated priority 0 local rule unless this setting is set to TRUE.</td>
+</tr>
+<tr>
+<td align="left">
 <a name="nm-settings-dbus.property.ipv4.required-timeout"></a>required-timeout</td>
 <td align="left">int32</td>
 <td align="left">-1</td>
@@ -2050,7 +2063,13 @@ When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0),
 <a name="nm-settings-dbus.property.ipv6.dhcp-iaid"></a>dhcp-iaid</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.</td>
+<td>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or or as colon separated hexadecimal numbers). Alternatively it can be set to the special values "mac", "perm-mac", "ifname" or "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname".
+
+For DHCPv4, the IAID is only used with "ipv4.dhcp-client-id" values "duid" and "ipv6-duid" to generate the client-id.
+
+For DHCPv6, note that at the moment this property is only supported by the "internal" DHCPv6 plugin. The "dhclient" DHCPv6 plugin always derives the IAID from the MAC address.
+
+The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device.</td>
 </tr>
 <tr>
 <td align="left">
@@ -2225,6 +2244,13 @@ Set to 2147483647 (MAXINT32) for infinity.</td>
 </tr>
 <tr>
 <td align="left">
+<a name="nm-settings-dbus.property.ipv6.replace-local-rule"></a>replace-local-rule</td>
+<td align="left">NMTernary (int32)</td>
+<td align="left"> </td>
+<td>Connections will default to keep the autogenerated priority 0 local rule unless this setting is set to TRUE.</td>
+</tr>
+<tr>
+<td align="left">
 <a name="nm-settings-dbus.property.ipv6.required-timeout"></a>required-timeout</td>
 <td align="left">int32</td>
 <td align="left">-1</td>
diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html
index d05f8335..a63ae165 100644
--- a/docs/api/html/nm-settings-ifcfg-rh.html
+++ b/docs/api/html/nm-settings-ifcfg-rh.html
@@ -2048,6 +2048,13 @@ Example: </strong></span>IPV4_DNS_PRIORITY=20</td>
 <td align="left">VPN connections will default to add the route automatically unless this setting is set to %FALSE. For other connection types, adding such an automatic route is currently not supported and setting this to %TRUE has no effect.</td>
 </tr>
 <tr>
+<td align="left">replace-local-rule</td>
+<td align="left">IPV4_REPLACE_LOCAL_RULE<span class="emphasis"><em>(+)</em></span>
+</td>
+<td align="left">no</td>
+<td align="left">Connections will default to keep the autogenerated priority 0 local rule unless this setting is set to %TRUE.</td>
+</tr>
+<tr>
 <td align="left">dhcp-client-id</td>
 <td align="left">DHCP_CLIENT_ID<span class="emphasis"><em>(+)</em></span>
 </td>
@@ -2257,6 +2264,13 @@ Example: </strong></span>IPV6_RES_OPTIONS=ndots:2 timeout:3</td>
 <td align="left">VPN connections will default to add the route automatically unless this setting is set to %FALSE. For other connection types, adding such an automatic route is currently not supported and setting this to %TRUE has no effect.</td>
 </tr>
 <tr>
+<td align="left">replace-local-rule</td>
+<td align="left">IPV6_REPLACE_LOCAL_RULE<span class="emphasis"><em>(+)</em></span>
+</td>
+<td align="left">no</td>
+<td align="left">Connections will default to keep the autogenerated priority 0 local rule unless this setting is set to %TRUE.</td>
+</tr>
+<tr>
 <td align="left">ip6-privacy</td>
 <td align="left">IPV6_PRIVACY, IPV6_PRIVACY_PREFER_PUBLIC_IP<span class="emphasis"><em>(+)</em></span>
 </td>
diff --git a/docs/api/html/nm-settings-nmcli.html b/docs/api/html/nm-settings-nmcli.html
index 2c7ef708..1a4f4495 100644
--- a/docs/api/html/nm-settings-nmcli.html
+++ b/docs/api/html/nm-settings-nmcli.html
@@ -2086,7 +2086,10 @@
 <tr>
 <td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.ipv4.dhcp-iaid"></a>dhcp-iaid</code></span></p></td>
 <td>
-<p>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.</p>
+<p>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or or as colon separated hexadecimal numbers). Alternatively it can be set to the special values "mac", "perm-mac", "ifname" or "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname".</p>
+<p>For DHCPv4, the IAID is only used with "ipv4.dhcp-client-id" values "duid" and "ipv6-duid" to generate the client-id.</p>
+<p>For DHCPv6, note that at the moment this property is only supported by the "internal" DHCPv6 plugin. The "dhclient" DHCPv6 plugin always derives the IAID from the MAC address.</p>
+<p>The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device.</p>
 <p>
             Format: string</p>
 </td>
@@ -2238,6 +2241,14 @@
 </td>
 </tr>
 <tr>
+<td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.ipv4.replace-local-rule"></a>replace-local-rule</code></span></p></td>
+<td>
+<p>Connections will default to keep the autogenerated priority 0 local rule unless this setting is set to TRUE.</p>
+<p>
+            Format: NMTernary (int32)</p>
+</td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.ipv4.required-timeout"></a>required-timeout</code></span></p></td>
 <td>
 <p>The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds.</p>
@@ -2426,7 +2437,10 @@ Example: <code class="literal">priority 5 from 192.167.4.0/24 table 45</code>
 <tr>
 <td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.ipv6.dhcp-iaid"></a>dhcp-iaid</code></span></p></td>
 <td>
-<p>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.</p>
+<p>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or or as colon separated hexadecimal numbers). Alternatively it can be set to the special values "mac", "perm-mac", "ifname" or "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname".</p>
+<p>For DHCPv4, the IAID is only used with "ipv4.dhcp-client-id" values "duid" and "ipv6-duid" to generate the client-id.</p>
+<p>For DHCPv6, note that at the moment this property is only supported by the "internal" DHCPv6 plugin. The "dhclient" DHCPv6 plugin always derives the IAID from the MAC address.</p>
+<p>The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device.</p>
 <p>
             Format: string</p>
 </td>
@@ -2579,6 +2593,14 @@ Example: <code class="literal">priority 5 from 192.167.4.0/24 table 45</code>
 </td>
 </tr>
 <tr>
+<td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.ipv6.replace-local-rule"></a>replace-local-rule</code></span></p></td>
+<td>
+<p>Connections will default to keep the autogenerated priority 0 local rule unless this setting is set to TRUE.</p>
+<p>
+            Format: NMTernary (int32)</p>
+</td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.ipv6.required-timeout"></a>required-timeout</code></span></p></td>
 <td>
 <p>The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds.</p>
diff --git a/docs/api/html/settings-ipv4.html b/docs/api/html/settings-ipv4.html
index 4de460ed..24361ef7 100644
--- a/docs/api/html/settings-ipv4.html
+++ b/docs/api/html/settings-ipv4.html
@@ -204,6 +204,12 @@
 <td> </td>
 </tr>
 <tr>
+<td><pre class="screen">replace-local-rule</pre></td>
+<td><pre class="screen">NMTernary (int32)</pre></td>
+<td><pre class="screen"></pre></td>
+<td> </td>
+</tr>
+<tr>
 <td><pre class="screen">required-timeout</pre></td>
 <td><pre class="screen">int32</pre></td>
 <td><pre class="screen">-1</pre></td>
diff --git a/docs/api/html/settings-ipv6.html b/docs/api/html/settings-ipv6.html
index ed0f3010..776d231e 100644
--- a/docs/api/html/settings-ipv6.html
+++ b/docs/api/html/settings-ipv6.html
@@ -210,6 +210,12 @@
 <td> </td>
 </tr>
 <tr>
+<td><pre class="screen">replace-local-rule</pre></td>
+<td><pre class="screen">NMTernary (int32)</pre></td>
+<td><pre class="screen"></pre></td>
+<td> </td>
+</tr>
+<tr>
 <td><pre class="screen">required-timeout</pre></td>
 <td><pre class="screen">int32</pre></td>
 <td><pre class="screen">-1</pre></td>
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index c455a622..e12bab3c 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -32,9 +32,9 @@
             Properties
         </title><para><table><tgroup cols="4"><thead><row><entry>Key Name</entry><entry>Value Type</entry><entry>Default Value</entry><entry>Value Description</entry></row></thead><tbody><row><entry><screen>mac-address<indexterm zone="settings-infiniband"><primary sortas="mac-address">mac-address</primary></indexterm></screen></entry><entry><screen>byte array</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>mtu<indexterm zone="settings-infiniband"><primary sortas="mtu">mtu</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>p-key<indexterm zone="settings-infiniband"><primary sortas="p-key">p-key</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry/></row><row><entry><screen>parent<indexterm zone="settings-infiniband"><primary sortas="parent">parent</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>transport-mode<indexterm zone="settings-infiniband"><primary sortas="transport-mode">transport-mode</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row></tbody></tgroup></table></para></refsect1></refentry><refentry id="settings-ipv4"><refnamediv><refname>ipv4</refname><refpurpose>IPv4 Settings</refpurpose></refnamediv><refsect1 role="properties"><title id="settings-ipv4.properties">
             Properties
-        </title><para><table><tgroup cols="4"><thead><row><entry>Key Name</entry><entry>Value Type</entry><entry>Default Value</entry><entry>Value Description</entry></row></thead><tbody><row><entry><screen>address-data<indexterm zone="settings-ipv4"><primary sortas="address-data">address-data</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>addresses<indexterm zone="settings-ipv4"><primary sortas="addresses">addresses</primary></indexterm></screen></entry><entry><screen>array of array of uint32</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>auto-route-ext-gw<indexterm zone="settings-ipv4"><primary sortas="auto-route-ext-gw">auto-route-ext-gw</primary></indexterm></screen></entry><entry><screen>NMTernary (int32)</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dad-timeout<indexterm zone="settings-ipv4"><primary sortas="dad-timeout">dad-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry/></row><row><entry><screen>dhcp-client-id<indexterm zone="settings-ipv4"><primary sortas="dhcp-client-id">dhcp-client-id</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-fqdn<indexterm zone="settings-ipv4"><primary sortas="dhcp-fqdn">dhcp-fqdn</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-hostname<indexterm zone="settings-ipv4"><primary sortas="dhcp-hostname">dhcp-hostname</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-hostname-flags<indexterm zone="settings-ipv4"><primary sortas="dhcp-hostname-flags">dhcp-hostname-flags</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>dhcp-iaid<indexterm zone="settings-ipv4"><primary sortas="dhcp-iaid">dhcp-iaid</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-reject-servers<indexterm zone="settings-ipv4"><primary sortas="dhcp-reject-servers">dhcp-reject-servers</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-send-hostname<indexterm zone="settings-ipv4"><primary sortas="dhcp-send-hostname">dhcp-send-hostname</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry/></row><row><entry><screen>dhcp-timeout<indexterm zone="settings-ipv4"><primary sortas="dhcp-timeout">dhcp-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>dhcp-vendor-class-identifier<indexterm zone="settings-ipv4"><primary sortas="dhcp-vendor-class-identifier">dhcp-vendor-class-identifier</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns<indexterm zone="settings-ipv4"><primary sortas="dns">dns</primary></indexterm></screen></entry><entry><screen>array of uint32</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns-data<indexterm zone="settings-ipv4"><primary sortas="dns-data">dns-data</primary></indexterm></screen></entry><entry><screen>array of strings</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns-options<indexterm zone="settings-ipv4"><primary sortas="dns-options">dns-options</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns-priority<indexterm zone="settings-ipv4"><primary sortas="dns-priority">dns-priority</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>dns-search<indexterm zone="settings-ipv4"><primary sortas="dns-search">dns-search</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>gateway<indexterm zone="settings-ipv4"><primary sortas="gateway">gateway</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>ignore-auto-dns<indexterm zone="settings-ipv4"><primary sortas="ignore-auto-dns">ignore-auto-dns</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry/></row><row><entry><screen>ignore-auto-routes<indexterm zone="settings-ipv4"><primary sortas="ignore-auto-routes">ignore-auto-routes</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry/></row><row><entry><screen>link-local<indexterm zone="settings-ipv4"><primary sortas="link-local">link-local</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>may-fail<indexterm zone="settings-ipv4"><primary sortas="may-fail">may-fail</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry/></row><row><entry><screen>method<indexterm zone="settings-ipv4"><primary sortas="method">method</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>never-default<indexterm zone="settings-ipv4"><primary sortas="never-default">never-default</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry/></row><row><entry><screen>required-timeout<indexterm zone="settings-ipv4"><primary sortas="required-timeout">required-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry/></row><row><entry><screen>route-data<indexterm zone="settings-ipv4"><primary sortas="route-data">route-data</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>route-metric<indexterm zone="settings-ipv4"><primary sortas="route-metric">route-metric</primary></indexterm></screen></entry><entry><screen>int64</screen></entry><entry><screen>-1</screen></entry><entry/></row><row><entry><screen>route-table<indexterm zone="settings-ipv4"><primary sortas="route-table">route-table</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>routes<indexterm zone="settings-ipv4"><primary sortas="routes">routes</primary></indexterm></screen></entry><entry><screen>array of array of uint32</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>routing-rules<indexterm zone="settings-ipv4"><primary sortas="routing-rules">routing-rules</primary></indexterm></screen></entry><entry><screen>array of 'a{sv}'</screen></entry><entry><screen/></entry><entry/></row></tbody></tgroup></table></para></refsect1></refentry><refentry id="settings-ipv6"><refnamediv><refname>ipv6</refname><refpurpose>IPv6 Settings</refpurpose></refnamediv><refsect1 role="properties"><title id="settings-ipv6.properties">
+        </title><para><table><tgroup cols="4"><thead><row><entry>Key Name</entry><entry>Value Type</entry><entry>Default Value</entry><entry>Value Description</entry></row></thead><tbody><row><entry><screen>address-data<indexterm zone="settings-ipv4"><primary sortas="address-data">address-data</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>addresses<indexterm zone="settings-ipv4"><primary sortas="addresses">addresses</primary></indexterm></screen></entry><entry><screen>array of array of uint32</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>auto-route-ext-gw<indexterm zone="settings-ipv4"><primary sortas="auto-route-ext-gw">auto-route-ext-gw</primary></indexterm></screen></entry><entry><screen>NMTernary (int32)</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dad-timeout<indexterm zone="settings-ipv4"><primary sortas="dad-timeout">dad-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry/></row><row><entry><screen>dhcp-client-id<indexterm zone="settings-ipv4"><primary sortas="dhcp-client-id">dhcp-client-id</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-fqdn<indexterm zone="settings-ipv4"><primary sortas="dhcp-fqdn">dhcp-fqdn</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-hostname<indexterm zone="settings-ipv4"><primary sortas="dhcp-hostname">dhcp-hostname</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-hostname-flags<indexterm zone="settings-ipv4"><primary sortas="dhcp-hostname-flags">dhcp-hostname-flags</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>dhcp-iaid<indexterm zone="settings-ipv4"><primary sortas="dhcp-iaid">dhcp-iaid</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-reject-servers<indexterm zone="settings-ipv4"><primary sortas="dhcp-reject-servers">dhcp-reject-servers</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-send-hostname<indexterm zone="settings-ipv4"><primary sortas="dhcp-send-hostname">dhcp-send-hostname</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry/></row><row><entry><screen>dhcp-timeout<indexterm zone="settings-ipv4"><primary sortas="dhcp-timeout">dhcp-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>dhcp-vendor-class-identifier<indexterm zone="settings-ipv4"><primary sortas="dhcp-vendor-class-identifier">dhcp-vendor-class-identifier</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns<indexterm zone="settings-ipv4"><primary sortas="dns">dns</primary></indexterm></screen></entry><entry><screen>array of uint32</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns-data<indexterm zone="settings-ipv4"><primary sortas="dns-data">dns-data</primary></indexterm></screen></entry><entry><screen>array of strings</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns-options<indexterm zone="settings-ipv4"><primary sortas="dns-options">dns-options</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns-priority<indexterm zone="settings-ipv4"><primary sortas="dns-priority">dns-priority</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>dns-search<indexterm zone="settings-ipv4"><primary sortas="dns-search">dns-search</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>gateway<indexterm zone="settings-ipv4"><primary sortas="gateway">gateway</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>ignore-auto-dns<indexterm zone="settings-ipv4"><primary sortas="ignore-auto-dns">ignore-auto-dns</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry/></row><row><entry><screen>ignore-auto-routes<indexterm zone="settings-ipv4"><primary sortas="ignore-auto-routes">ignore-auto-routes</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry/></row><row><entry><screen>link-local<indexterm zone="settings-ipv4"><primary sortas="link-local">link-local</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>may-fail<indexterm zone="settings-ipv4"><primary sortas="may-fail">may-fail</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry/></row><row><entry><screen>method<indexterm zone="settings-ipv4"><primary sortas="method">method</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>never-default<indexterm zone="settings-ipv4"><primary sortas="never-default">never-default</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry/></row><row><entry><screen>replace-local-rule<indexterm zone="settings-ipv4"><primary sortas="replace-local-rule">replace-local-rule</primary></indexterm></screen></entry><entry><screen>NMTernary (int32)</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>required-timeout<indexterm zone="settings-ipv4"><primary sortas="required-timeout">required-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry/></row><row><entry><screen>route-data<indexterm zone="settings-ipv4"><primary sortas="route-data">route-data</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>route-metric<indexterm zone="settings-ipv4"><primary sortas="route-metric">route-metric</primary></indexterm></screen></entry><entry><screen>int64</screen></entry><entry><screen>-1</screen></entry><entry/></row><row><entry><screen>route-table<indexterm zone="settings-ipv4"><primary sortas="route-table">route-table</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>routes<indexterm zone="settings-ipv4"><primary sortas="routes">routes</primary></indexterm></screen></entry><entry><screen>array of array of uint32</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>routing-rules<indexterm zone="settings-ipv4"><primary sortas="routing-rules">routing-rules</primary></indexterm></screen></entry><entry><screen>array of 'a{sv}'</screen></entry><entry><screen/></entry><entry/></row></tbody></tgroup></table></para></refsect1></refentry><refentry id="settings-ipv6"><refnamediv><refname>ipv6</refname><refpurpose>IPv6 Settings</refpurpose></refnamediv><refsect1 role="properties"><title id="settings-ipv6.properties">
             Properties
-        </title><para><table><tgroup cols="4"><thead><row><entry>Key Name</entry><entry>Value Type</entry><entry>Default Value</entry><entry>Value Description</entry></row></thead><tbody><row><entry><screen>addr-gen-mode<indexterm zone="settings-ipv6"><primary sortas="addr-gen-mode">addr-gen-mode</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>3</screen></entry><entry/></row><row><entry><screen>address-data<indexterm zone="settings-ipv6"><primary sortas="address-data">address-data</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>addresses<indexterm zone="settings-ipv6"><primary sortas="addresses">addresses</primary></indexterm></screen></entry><entry><screen>array of legacy IPv6 address struct (a(ayuay))</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>auto-route-ext-gw<indexterm zone="settings-ipv6"><primary sortas="auto-route-ext-gw">auto-route-ext-gw</primary></indexterm></screen></entry><entry><screen>NMTernary (int32)</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dad-timeout<indexterm zone="settings-ipv6"><primary sortas="dad-timeout">dad-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry/></row><row><entry><screen>dhcp-duid<indexterm zone="settings-ipv6"><primary sortas="dhcp-duid">dhcp-duid</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-hostname<indexterm zone="settings-ipv6"><primary sortas="dhcp-hostname">dhcp-hostname</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-hostname-flags<indexterm zone="settings-ipv6"><primary sortas="dhcp-hostname-flags">dhcp-hostname-flags</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>dhcp-iaid<indexterm zone="settings-ipv6"><primary sortas="dhcp-iaid">dhcp-iaid</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-reject-servers<indexterm zone="settings-ipv6"><primary sortas="dhcp-reject-servers">dhcp-reject-servers</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-send-hostname<indexterm zone="settings-ipv6"><primary sortas="dhcp-send-hostname">dhcp-send-hostname</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry/></row><row><entry><screen>dhcp-timeout<indexterm zone="settings-ipv6"><primary sortas="dhcp-timeout">dhcp-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>dns<indexterm zone="settings-ipv6"><primary sortas="dns">dns</primary></indexterm></screen></entry><entry><screen>array of byte array</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns-data<indexterm zone="settings-ipv6"><primary sortas="dns-data">dns-data</primary></indexterm></screen></entry><entry><screen>array of strings</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns-options<indexterm zone="settings-ipv6"><primary sortas="dns-options">dns-options</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns-priority<indexterm zone="settings-ipv6"><primary sortas="dns-priority">dns-priority</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>dns-search<indexterm zone="settings-ipv6"><primary sortas="dns-search">dns-search</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>gateway<indexterm zone="settings-ipv6"><primary sortas="gateway">gateway</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>ignore-auto-dns<indexterm zone="settings-ipv6"><primary sortas="ignore-auto-dns">ignore-auto-dns</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry/></row><row><entry><screen>ignore-auto-routes<indexterm zone="settings-ipv6"><primary sortas="ignore-auto-routes">ignore-auto-routes</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry/></row><row><entry><screen>ip6-privacy<indexterm zone="settings-ipv6"><primary sortas="ip6-privacy">ip6-privacy</primary></indexterm></screen></entry><entry><screen>NMSettingIP6ConfigPrivacy (int32)</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>may-fail<indexterm zone="settings-ipv6"><primary sortas="may-fail">may-fail</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry/></row><row><entry><screen>method<indexterm zone="settings-ipv6"><primary sortas="method">method</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>mtu<indexterm zone="settings-ipv6"><primary sortas="mtu">mtu</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>never-default<indexterm zone="settings-ipv6"><primary sortas="never-default">never-default</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry/></row><row><entry><screen>ra-timeout<indexterm zone="settings-ipv6"><primary sortas="ra-timeout">ra-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>required-timeout<indexterm zone="settings-ipv6"><primary sortas="required-timeout">required-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry/></row><row><entry><screen>route-data<indexterm zone="settings-ipv6"><primary sortas="route-data">route-data</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>route-metric<indexterm zone="settings-ipv6"><primary sortas="route-metric">route-metric</primary></indexterm></screen></entry><entry><screen>int64</screen></entry><entry><screen>-1</screen></entry><entry/></row><row><entry><screen>route-table<indexterm zone="settings-ipv6"><primary sortas="route-table">route-table</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>routes<indexterm zone="settings-ipv6"><primary sortas="routes">routes</primary></indexterm></screen></entry><entry><screen>array of legacy IPv6 route struct (a(ayuayu))</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>routing-rules<indexterm zone="settings-ipv6"><primary sortas="routing-rules">routing-rules</primary></indexterm></screen></entry><entry><screen>array of 'a{sv}'</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>token<indexterm zone="settings-ipv6"><primary sortas="token">token</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row></tbody></tgroup></table></para></refsect1></refentry><refentry id="settings-ip-tunnel"><refnamediv><refname>ip-tunnel</refname><refpurpose>IP Tunneling Settings</refpurpose></refnamediv><refsect1 role="properties"><title id="settings-ip-tunnel.properties">
+        </title><para><table><tgroup cols="4"><thead><row><entry>Key Name</entry><entry>Value Type</entry><entry>Default Value</entry><entry>Value Description</entry></row></thead><tbody><row><entry><screen>addr-gen-mode<indexterm zone="settings-ipv6"><primary sortas="addr-gen-mode">addr-gen-mode</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>3</screen></entry><entry/></row><row><entry><screen>address-data<indexterm zone="settings-ipv6"><primary sortas="address-data">address-data</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>addresses<indexterm zone="settings-ipv6"><primary sortas="addresses">addresses</primary></indexterm></screen></entry><entry><screen>array of legacy IPv6 address struct (a(ayuay))</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>auto-route-ext-gw<indexterm zone="settings-ipv6"><primary sortas="auto-route-ext-gw">auto-route-ext-gw</primary></indexterm></screen></entry><entry><screen>NMTernary (int32)</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dad-timeout<indexterm zone="settings-ipv6"><primary sortas="dad-timeout">dad-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry/></row><row><entry><screen>dhcp-duid<indexterm zone="settings-ipv6"><primary sortas="dhcp-duid">dhcp-duid</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-hostname<indexterm zone="settings-ipv6"><primary sortas="dhcp-hostname">dhcp-hostname</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-hostname-flags<indexterm zone="settings-ipv6"><primary sortas="dhcp-hostname-flags">dhcp-hostname-flags</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>dhcp-iaid<indexterm zone="settings-ipv6"><primary sortas="dhcp-iaid">dhcp-iaid</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-reject-servers<indexterm zone="settings-ipv6"><primary sortas="dhcp-reject-servers">dhcp-reject-servers</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dhcp-send-hostname<indexterm zone="settings-ipv6"><primary sortas="dhcp-send-hostname">dhcp-send-hostname</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry/></row><row><entry><screen>dhcp-timeout<indexterm zone="settings-ipv6"><primary sortas="dhcp-timeout">dhcp-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>dns<indexterm zone="settings-ipv6"><primary sortas="dns">dns</primary></indexterm></screen></entry><entry><screen>array of byte array</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns-data<indexterm zone="settings-ipv6"><primary sortas="dns-data">dns-data</primary></indexterm></screen></entry><entry><screen>array of strings</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns-options<indexterm zone="settings-ipv6"><primary sortas="dns-options">dns-options</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>dns-priority<indexterm zone="settings-ipv6"><primary sortas="dns-priority">dns-priority</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>dns-search<indexterm zone="settings-ipv6"><primary sortas="dns-search">dns-search</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>gateway<indexterm zone="settings-ipv6"><primary sortas="gateway">gateway</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>ignore-auto-dns<indexterm zone="settings-ipv6"><primary sortas="ignore-auto-dns">ignore-auto-dns</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry/></row><row><entry><screen>ignore-auto-routes<indexterm zone="settings-ipv6"><primary sortas="ignore-auto-routes">ignore-auto-routes</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry/></row><row><entry><screen>ip6-privacy<indexterm zone="settings-ipv6"><primary sortas="ip6-privacy">ip6-privacy</primary></indexterm></screen></entry><entry><screen>NMSettingIP6ConfigPrivacy (int32)</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>may-fail<indexterm zone="settings-ipv6"><primary sortas="may-fail">may-fail</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry/></row><row><entry><screen>method<indexterm zone="settings-ipv6"><primary sortas="method">method</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>mtu<indexterm zone="settings-ipv6"><primary sortas="mtu">mtu</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>never-default<indexterm zone="settings-ipv6"><primary sortas="never-default">never-default</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry/></row><row><entry><screen>ra-timeout<indexterm zone="settings-ipv6"><primary sortas="ra-timeout">ra-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>replace-local-rule<indexterm zone="settings-ipv6"><primary sortas="replace-local-rule">replace-local-rule</primary></indexterm></screen></entry><entry><screen>NMTernary (int32)</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>required-timeout<indexterm zone="settings-ipv6"><primary sortas="required-timeout">required-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry/></row><row><entry><screen>route-data<indexterm zone="settings-ipv6"><primary sortas="route-data">route-data</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>route-metric<indexterm zone="settings-ipv6"><primary sortas="route-metric">route-metric</primary></indexterm></screen></entry><entry><screen>int64</screen></entry><entry><screen>-1</screen></entry><entry/></row><row><entry><screen>route-table<indexterm zone="settings-ipv6"><primary sortas="route-table">route-table</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>routes<indexterm zone="settings-ipv6"><primary sortas="routes">routes</primary></indexterm></screen></entry><entry><screen>array of legacy IPv6 route struct (a(ayuayu))</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>routing-rules<indexterm zone="settings-ipv6"><primary sortas="routing-rules">routing-rules</primary></indexterm></screen></entry><entry><screen>array of 'a{sv}'</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>token<indexterm zone="settings-ipv6"><primary sortas="token">token</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row></tbody></tgroup></table></para></refsect1></refentry><refentry id="settings-ip-tunnel"><refnamediv><refname>ip-tunnel</refname><refpurpose>IP Tunneling Settings</refpurpose></refnamediv><refsect1 role="properties"><title id="settings-ip-tunnel.properties">
             Properties
         </title><para><table><tgroup cols="4"><thead><row><entry>Key Name</entry><entry>Value Type</entry><entry>Default Value</entry><entry>Value Description</entry></row></thead><tbody><row><entry><screen>encapsulation-limit<indexterm zone="settings-ip-tunnel"><primary sortas="encapsulation-limit">encapsulation-limit</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>flags<indexterm zone="settings-ip-tunnel"><primary sortas="flags">flags</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>flow-label<indexterm zone="settings-ip-tunnel"><primary sortas="flow-label">flow-label</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>fwmark<indexterm zone="settings-ip-tunnel"><primary sortas="fwmark">fwmark</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>input-key<indexterm zone="settings-ip-tunnel"><primary sortas="input-key">input-key</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>local<indexterm zone="settings-ip-tunnel"><primary sortas="local">local</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>mode<indexterm zone="settings-ip-tunnel"><primary sortas="mode">mode</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>mtu<indexterm zone="settings-ip-tunnel"><primary sortas="mtu">mtu</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>output-key<indexterm zone="settings-ip-tunnel"><primary sortas="output-key">output-key</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>parent<indexterm zone="settings-ip-tunnel"><primary sortas="parent">parent</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>path-mtu-discovery<indexterm zone="settings-ip-tunnel"><primary sortas="path-mtu-discovery">path-mtu-discovery</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry/></row><row><entry><screen>remote<indexterm zone="settings-ip-tunnel"><primary sortas="remote">remote</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry/></row><row><entry><screen>tos<indexterm zone="settings-ip-tunnel"><primary sortas="tos">tos</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row><row><entry><screen>ttl<indexterm zone="settings-ip-tunnel"><primary sortas="ttl">ttl</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry/></row></tbody></tgroup></table></para></refsect1></refentry><refentry id="settings-macsec"><refnamediv><refname>macsec</refname><refpurpose>MACSec Settings</refpurpose></refnamediv><refsect1 role="properties"><title id="settings-macsec.properties">
             Properties
diff --git a/docs/api/version.xml b/docs/api/version.xml
index a50908ca..2259c77c 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.42.0
+1.42.2