New upstream version 1.40.8 upstream/1.40.8

author: Michael Biebl <biebl@debian.org> 2022-12-18 21:31:39 +0100
committer: Michael Biebl <biebl@debian.org> 2022-12-18 21:31:39 +0100
commit: 2965dc70bb3cbfa8de2f279761812b84b87600cb (patch)
tree: 90d4a861f7cd7a05834e7328af7677e7c8acd17f
parent: 6e9d10e114f94799d54bb3dabc66e35ab4e3e8cd (diff)
111 files changed, 799 insertions, 728 deletions
diff --git a/NEWS b/NEWS
index 38f8b235..6ec9b358 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,22 @@
 ===============================================
+NetworkManager-1.40.8
+Overview of changes since NetworkManager-1.40.6
+===============================================
+
+* Fixed a bug that caused devices (MACsec in particular) to be stuck in
+  UNAVAILABLE state and not transition to DISCONNECTED if the carrier was
+  ready too early.
+* Improved interoperability of MACsec with some Aruba switches by allowing
+  CKN shorter than 64 characters.
+* Fixed an assertion failure when restarting NetworkManager with MACsec
+  links configured.
+* Fixed a possible DHCP helper crash when handling failure to connect to
+  D-Bus.
+* Corrected calculation of expiration time for items configured from IPv6
+  neighbor discovery messages.
+* Various fixes for platforms that don't allow unaligned memory access.
+
+===============================================
 NetworkManager-1.40.6
 Overview of changes since NetworkManager-1.40.4
 ===============================================
diff --git a/configure b/configure
index a8bef9b3..5f7abe4e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for NetworkManager 1.40.6.
+# Generated by GNU Autoconf 2.71 for NetworkManager 1.40.8.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -622,8 +622,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager'
 PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='1.40.6'
-PACKAGE_STRING='NetworkManager 1.40.6'
+PACKAGE_VERSION='1.40.8'
+PACKAGE_STRING='NetworkManager 1.40.8'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1744,7 +1744,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures NetworkManager 1.40.6 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.40.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1816,7 +1816,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.40.6:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.40.8:";;
    esac
   cat <<\_ACEOF
 
@@ -2171,7 +2171,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.40.6
+NetworkManager configure 1.40.8
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2892,7 +2892,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by NetworkManager $as_me 1.40.6, which was
+It was created by NetworkManager $as_me 1.40.8, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4388,7 +4388,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.40.6'
+ VERSION='1.40.8'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -19328,8 +19328,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 NM_MAJOR_VERSION=1
 NM_MINOR_VERSION=40
-NM_MICRO_VERSION=6
-NM_VERSION=1.40.6
+NM_MICRO_VERSION=8
+NM_VERSION=1.40.8
 
 
 
@@ -19337,7 +19337,7 @@ NM_VERSION=1.40.6
 
 
 
-NM_GIT_SHA=ba35cff250dada15250902d8197b7901c21434cb
+NM_GIT_SHA=56e29666629b4de98121acd50f0dc364f2066384
 
 if test """" != "no-config-h" ; then
 
@@ -32786,7 +32786,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by NetworkManager $as_me 1.40.6, which was
+This file was extended by NetworkManager $as_me 1.40.8, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -32854,7 +32854,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-NetworkManager config.status 1.40.6
+NetworkManager config.status 1.40.8
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index c71e34bf..27da3dcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ dnl    "shared/nm-version-macros.h.in"
 dnl  - update number in meson.build
 m4_define([nm_major_version], [1])
 m4_define([nm_minor_version], [40])
-m4_define([nm_micro_version], [6])
+m4_define([nm_micro_version], [8])
 m4_define([nm_version],
           [nm_major_version.nm_minor_version.nm_micro_version])
 
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index ad46bacb..6c1324c1 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.40.6
+      for NetworkManager 1.40.8
 
       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/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html
index d940c0f8..0580b439 100644
--- a/docs/api/html/nm-dbus-types.html
+++ b/docs/api/html/nm-dbus-types.html
@@ -3071,7 +3071,7 @@
 <hr>
 <div class="refsect2">
 <a name="NMMetered"></a><h3>enum NMMetered</h3>
-<p>The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the <a href="/usr/share/gtk-doc/html/libnm/NMDevice.html#NMDevice-struct">NMDevice</a> at a given moment.</p>
+<p>The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the NMDevice at a given moment.</p>
 <p>For the connection profile only NM_METERED_UNKNOWN, NM_METERED_NO and NM_METERED_YES are allowed.</p>
 <p>The device's metered state at runtime is determined by the profile which is currently active. If the profile explicitly specifies NM_METERED_NO or NM_METERED_YES, then the device's metered state is as such. If the connection profile leaves it undecided at NM_METERED_UNKNOWN (the default), then NetworkManager tries to guess the metered state, for example based on the device type or on DHCP options (like Android devices exposing a "ANDROID_METERED" DHCP vendor option). This then leads to either NM_METERED_GUESS_NO or NM_METERED_GUESS_YES.</p>
 <p>Most applications probably should treat the runtime state NM_METERED_GUESS_YES like NM_METERED_YES, and all other states as not metered.</p>
diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html
index 854ca8f0..fd1f0892 100644
--- a/docs/api/html/nm-settings-dbus.html
+++ b/docs/api/html/nm-settings-dbus.html
@@ -2372,7 +2372,7 @@
 <a name="nm-settings-dbus.property.macsec.mka-cak"></a>mka-cak</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</td>
+<td> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</td>
 </tr>
 <tr>
 <td align="left">
@@ -2386,7 +2386,7 @@
 <a name="nm-settings-dbus.property.macsec.mka-ckn"></a>mka-ckn</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</td>
+<td> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</td>
 </tr>
 <tr>
 <td align="left">
diff --git a/docs/api/html/nm-settings-nmcli.html b/docs/api/html/nm-settings-nmcli.html
index 17ef394f..e2f76d6a 100644
--- a/docs/api/html/nm-settings-nmcli.html
+++ b/docs/api/html/nm-settings-nmcli.html
@@ -2787,7 +2787,7 @@ Example: <code class="literal">priority 5 from 1:2:3::5/128 table 45</code>
 <td>
 <p>
             Alias: cak</p>
-<p> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</p>
+<p> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</p>
 <p>
             Format: string</p>
 </td>
@@ -2805,7 +2805,7 @@ Example: <code class="literal">priority 5 from 1:2:3::5/128 table 45</code>
 <td>
 <p>
             Alias: ckn</p>
-<p> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</p>
+<p> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</p>
 <p>
             Format: string</p>
 </td>
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 4adfc24b..19d25d0a 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.40.6
+1.40.8
diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html
index d174979d..cc8d8247 100644
--- a/docs/libnm/html/NMAccessPoint.html
+++ b/docs/libnm/html/NMAccessPoint.html
@@ -577,7 +577,7 @@ with this function.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p>an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> to
+<td class="parameter_description"><p>an array of <span class="type">NMConnections</span> to
 filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
@@ -587,7 +587,7 @@ filter. </p></td>
 <div class="refsect3">
 <a name="nm-access-point-filter-connections.returns"></a><h4>Returns</h4>
 <p>an array of
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>ap</code></em>
+<span class="type">NMConnections</span> that could be activated with the given <em class="parameter"><code>ap</code></em>
 .  The array should
 be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-unref"><code class="function">g_ptr_array_unref()</code></a> when it is no longer required.</p>
 <p>WARNING: the transfer annotation for this function may not work correctly
diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html
index 7c20ebdf..7cba2906 100644
--- a/docs/libnm/html/NMConnection.html
+++ b/docs/libnm/html/NMConnection.html
@@ -1318,7 +1318,7 @@ failed (tried to update secrets for a setting that doesn't exist, etc)</p>
 nm_connection_set_path (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
 <p>Sets the D-Bus path of the connection.  This property is not serialized, and
-is only for the reference of the caller.  Sets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection--path"><span class="type">“path”</span></a>
+is only for the reference of the caller.  Sets the <span class="type">“path”</span>
 property.</p>
 <div class="refsect3">
 <a name="nm-connection-set-path.parameters"></a><h4>Parameters</h4>
@@ -1409,7 +1409,7 @@ nm_connection_is_type (<em class="parameter"><code><a class="link" href="NMConne
                        <em class="parameter"><code>const <span class="type">char</span> *type</code></em>);</pre>
 <p>A convenience function to check if the given <em class="parameter"><code>connection</code></em>
  is a particular
-type (ie wired, Wi-Fi, ppp, etc). Checks the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--type"><span class="type">“type”</span></a>
+type (ie wired, Wi-Fi, ppp, etc). Checks the <span class="type">“type”</span>
 property of the connection and matches that against <em class="parameter"><code>type</code></em>
 .</p>
 <div class="refsect3">
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index e152c456..ac125f88 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -2673,7 +2673,7 @@ incompatible with the device. To get the full list of connections see
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p>an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> to filter. </p></td>
+<td class="parameter_description"><p>an array of <span class="type">NMConnections</span> to filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
 </tbody>
@@ -2682,7 +2682,7 @@ incompatible with the device. To get the full list of connections see
 <div class="refsect3">
 <a name="nm-device-filter-connections.returns"></a><h4>Returns</h4>
 <p>an array of
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>device</code></em>
+<span class="type">NMConnections</span> that could be activated with the given <em class="parameter"><code>device</code></em>
 .  The array
 should be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-unref"><code class="function">g_ptr_array_unref()</code></a> when it is no longer required.</p>
 <p>WARNING: the transfer annotation for this function may not work correctly
diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html
index c79db83f..f8759573 100644
--- a/docs/libnm/html/NMSetting8021x.html
+++ b/docs/libnm/html/NMSetting8021x.html
@@ -1106,7 +1106,7 @@ nm_setting_802_1x_get_eap_method (<em class="parameter"><code><a class="link" hr
 nm_setting_802_1x_add_eap_method (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                   <em class="parameter"><code>const <span class="type">char</span> *eap</code></em>);</pre>
 <p>Adds an allowed EAP method.  The setting is not valid until at least one
-EAP method has been added.  See <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--eap"><span class="type">“eap”</span></a> property for a list of
+EAP method has been added.  See <span class="type">“eap”</span> property for a list of
 allowed EAP methods.</p>
 <div class="refsect3">
 <a name="nm-setting-802-1x-add-eap-method.parameters"></a><h4>Parameters</h4>
@@ -1259,7 +1259,7 @@ nm_setting_802_1x_get_anonymous_identity
                                (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>Returns the anonymous identifier used by some EAP methods (like TTLS) to
 authenticate the user in the outer unencrypted "phase 1" authentication.  The
-inner "phase 2" authentication will use the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--identity"><span class="type">“identity”</span></a> in
+inner "phase 2" authentication will use the <span class="type">“identity”</span> in
 a secure form, if applicable for that EAP method.</p>
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-anonymous-identity.parameters"></a><h4>Parameters</h4>
@@ -1312,9 +1312,9 @@ nm_setting_802_1x_get_pac_file (<em class="parameter"><code><a class="link" href
 <a name="nm-setting-802-1x-get-system-ca-certs"></a><h3>nm_setting_802_1x_get_system_ca_certs ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_setting_802_1x_get_system_ca_certs (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<p>Sets the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--system-ca-certs"><span class="type">“system-ca-certs”</span></a> property. The
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--ca-path"><span class="type">“ca-path”</span></a> and <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-ca-path"><span class="type">“phase2-ca-path”</span></a>
-properties are ignored if the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--system-ca-certs"><span class="type">“system-ca-certs”</span></a> property is
+<p>Sets the <span class="type">“system-ca-certs”</span> property. The
+<span class="type">“ca-path”</span> and <span class="type">“phase2-ca-path”</span>
+properties are ignored if the <span class="type">“system-ca-certs”</span> property is
 <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, in which case a system-wide CA certificate directory specified at
 compile time (using the --system-ca-path configure option) is used in place
 of these properties.</p>
@@ -1346,7 +1346,7 @@ nm_setting_802_1x_get_ca_path (<em class="parameter"><code><a class="link" href=
 <p>Returns the path of the CA certificate directory if previously set.  Systems
 will often have a directory that contains multiple individual CA certificates
 which the supplicant can then add to the verification chain.  This may be
-used in addition to the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--ca-cert"><span class="type">“ca-cert”</span></a> property to add more CA
+used in addition to the <span class="type">“ca-cert”</span> property to add more CA
 certificates for verifying the network to client.</p>
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-ca-path.parameters"></a><h4>Parameters</h4>
@@ -1376,7 +1376,7 @@ nm_setting_802_1x_get_phase2_ca_path (<em class="parameter"><code><a class="link
 <p>Returns the path of the "phase 2" CA certificate directory if previously set.
 Systems will often have a directory that contains multiple individual CA
 certificates which the supplicant can then add to the verification chain.
-This may be used in addition to the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-ca-cert"><span class="type">“phase2-ca-cert”</span></a> property
+This may be used in addition to the <span class="type">“phase2-ca-cert”</span> property
 to add more CA certificates for verifying the network to client.</p>
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-phase2-ca-path.parameters"></a><h4>Parameters</h4>
@@ -1531,7 +1531,7 @@ nm_setting_802_1x_set_ca_cert (<em class="parameter"><code><a class="link" href=
                                <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
                                <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Reads a certificate from disk and sets the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--ca-cert"><span class="type">“ca-cert”</span></a> property
+<p>Reads a certificate from disk and sets the <span class="type">“ca-cert”</span> property
 with the raw certificate data if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>
 scheme, or with the path to the certificate file if using the
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.</p>
@@ -1606,7 +1606,7 @@ nm_setting_802_1x_get_ca_cert_password
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-ca-cert-password.returns"></a><h4>Returns</h4>
 <p> the password used to access the CA certificate stored in
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--ca-cert"><span class="type">“ca-cert”</span></a> property. Only makes sense if the certificate
+<span class="type">“ca-cert”</span> property. Only makes sense if the certificate
 is stored on a PKCS#11 token that requires a login.</p>
 </div>
 <p class="since">Since: 1.8</p>
@@ -1661,7 +1661,7 @@ nm_setting_802_1x_get_subject_match (<em class="parameter"><code><a class="link"
 </div>
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-subject-match.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--subject-match"><span class="type">“subject-match”</span></a> property. This is the
+<p> the <span class="type">“subject-match”</span> property. This is the
 substring to be matched against the subject of the authentication
 server certificate, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> no subject verification is to be
 performed.</p>
@@ -1674,7 +1674,7 @@ performed.</p>
 nm_setting_802_1x_get_num_altsubject_matches
                                (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>Returns the number of entries in the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--altsubject-matches"><span class="type">“altsubject-matches”</span></a> property of this setting.</p>
+<span class="type">“altsubject-matches”</span> property of this setting.</p>
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-num-altsubject-matches.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -2044,7 +2044,7 @@ nm_setting_802_1x_set_client_cert (<em class="parameter"><code><a class="link" h
                                    <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
                                    <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Reads a certificate from disk and sets the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--client-cert"><span class="type">“client-cert”</span></a>
+<p>Reads a certificate from disk and sets the <span class="type">“client-cert”</span>
 property with the raw certificate data if using the
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the certificate
 file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.</p>
@@ -2123,7 +2123,7 @@ nm_setting_802_1x_get_client_cert_password
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-client-cert-password.returns"></a><h4>Returns</h4>
 <p> the password used to access the client certificate stored in
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--client-cert"><span class="type">“client-cert”</span></a> property. Only makes sense if the certificate
+<span class="type">“client-cert”</span> property. Only makes sense if the certificate
 is stored on a PKCS#11 token that requires a login.</p>
 </div>
 <p class="since">Since: 1.8</p>
@@ -2179,7 +2179,7 @@ nm_setting_802_1x_get_phase1_peapver (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-phase1-peapver.returns"></a><h4>Returns</h4>
 <p> the "phase 1" PEAP version to be used when authenticating with
-EAP-PEAP as contained in the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase1-peapver"><span class="type">“phase1-peapver”</span></a> property.  Valid
+EAP-PEAP as contained in the <span class="type">“phase1-peapver”</span> property.  Valid
 values are <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> (unset), "0" (PEAP version 0), and "1" (PEAP version 1).</p>
 </div>
 </div>
@@ -2208,7 +2208,7 @@ nm_setting_802_1x_get_phase1_peaplabel
 <a name="nm-setting-802-1x-get-phase1-peaplabel.returns"></a><h4>Returns</h4>
 <p> whether the "phase 1" PEAP label is new-style or old-style, to be
 used when authenticating with EAP-PEAP, as contained in the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase1-peaplabel"><span class="type">“phase1-peaplabel”</span></a> property.  Valid values are <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> (unset),
+<span class="type">“phase1-peaplabel”</span> property.  Valid values are <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> (unset),
 "0" (use old-style label), and "1" (use new-style label).  See the
 wpa_supplicant documentation for more details.</p>
 </div>
@@ -2237,7 +2237,7 @@ nm_setting_802_1x_get_phase1_fast_provisioning
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-phase1-fast-provisioning.returns"></a><h4>Returns</h4>
 <p> whether "phase 1" PEAP fast provisioning should be used, as specified
-by the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning"><span class="type">“phase1-fast-provisioning”</span></a> property.  See the
+by the <span class="type">“phase1-fast-provisioning”</span> property.  See the
 wpa_supplicant documentation for more details.</p>
 </div>
 </div>
@@ -2264,7 +2264,7 @@ nm_setting_802_1x_get_phase2_auth (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-phase2-auth.returns"></a><h4>Returns</h4>
 <p> the "phase 2" non-EAP (ex MD5) allowed authentication method as
-specified by the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-auth"><span class="type">“phase2-auth”</span></a> property.</p>
+specified by the <span class="type">“phase2-auth”</span> property.</p>
 </div>
 </div>
 <hr>
@@ -2290,7 +2290,7 @@ nm_setting_802_1x_get_phase2_autheap (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-phase2-autheap.returns"></a><h4>Returns</h4>
 <p> the "phase 2" EAP-based (ex TLS) allowed authentication method as
-specified by the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-autheap"><span class="type">“phase2-autheap”</span></a> property.</p>
+specified by the <span class="type">“phase2-autheap”</span> property.</p>
 </div>
 </div>
 <hr>
@@ -2431,7 +2431,7 @@ nm_setting_802_1x_set_phase2_ca_cert (<em class="parameter"><code><a class="link
                                       <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
                                       <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                       <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Reads a certificate from disk and sets the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-ca-cert"><span class="type">“phase2-ca-cert”</span></a>
+<p>Reads a certificate from disk and sets the <span class="type">“phase2-ca-cert”</span>
 property with the raw certificate data if using the
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the certificate
 file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.</p>
@@ -2506,7 +2506,7 @@ nm_setting_802_1x_get_phase2_ca_cert_password
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-phase2-ca-cert-password.returns"></a><h4>Returns</h4>
 <p> the password used to access the "phase2" CA certificate stored in
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-ca-cert"><span class="type">“phase2-ca-cert”</span></a> property. Only makes sense if the certificate
+<span class="type">“phase2-ca-cert”</span> property. Only makes sense if the certificate
 is stored on a PKCS#11 token that requires a login.</p>
 </div>
 <p class="since">Since: 1.8</p>
@@ -2535,7 +2535,7 @@ nm_setting_802_1x_get_phase2_ca_cert_password_flags
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-phase2-ca-cert-password-flags.returns"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key-password"><span class="type">“phase2-private-key-password”</span></a></p>
+<span class="type">“phase2-private-key-password”</span></p>
 </div>
 <p class="since">Since: 1.8</p>
 </div>
@@ -2562,7 +2562,7 @@ nm_setting_802_1x_get_phase2_subject_match
 </div>
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-phase2-subject-match.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-subject-match"><span class="type">“phase2-subject-match”</span></a> property. This is
+<p> the <span class="type">“phase2-subject-match”</span> property. This is
 the substring to be matched against the subject of the "phase 2"
 authentication server certificate, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> no subject verification
 is to be performed.</p>
@@ -2575,7 +2575,7 @@ is to be performed.</p>
 nm_setting_802_1x_get_num_phase2_altsubject_matches
                                (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>Returns the number of entries in the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-altsubject-matches"><span class="type">“phase2-altsubject-matches”</span></a> property of this setting.</p>
+<span class="type">“phase2-altsubject-matches”</span> property of this setting.</p>
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-num-phase2-altsubject-matches.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -2952,7 +2952,7 @@ nm_setting_802_1x_set_phase2_client_cert
                                 <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
                                 <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Reads a certificate from disk and sets the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-client-cert"><span class="type">“phase2-client-cert”</span></a>
+<p>Reads a certificate from disk and sets the <span class="type">“phase2-client-cert”</span>
 property with the raw certificate data if using the
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the certificate
 file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.</p>
@@ -3031,7 +3031,7 @@ nm_setting_802_1x_get_phase2_client_cert_password
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-phase2-client-cert-password.returns"></a><h4>Returns</h4>
 <p> the password used to access the "phase2" client certificate stored in
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-client-cert"><span class="type">“phase2-client-cert”</span></a> property. Only makes sense if the certificate
+<span class="type">“phase2-client-cert”</span> property. Only makes sense if the certificate
 is stored on a PKCS#11 token that requires a login.</p>
 </div>
 <p class="since">Since: 1.8</p>
@@ -3087,7 +3087,7 @@ nm_setting_802_1x_get_password (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-password.returns"></a><h4>Returns</h4>
 <p> the password used by the authentication method, if any, as specified
-by the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--password"><span class="type">“password”</span></a> property</p>
+by the <span class="type">“password”</span> property</p>
 </div>
 </div>
 <hr>
@@ -3112,7 +3112,7 @@ nm_setting_802_1x_get_password_flags (<em class="parameter"><code><a class="link
 </div>
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-password-flags.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--password"><span class="type">“password”</span></a></p>
+<p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <span class="type">“password”</span></p>
 </div>
 </div>
 <hr>
@@ -3139,7 +3139,7 @@ nm_setting_802_1x_get_password_raw (<em class="parameter"><code><a class="link"
 <a name="nm-setting-802-1x-get-password-raw.returns"></a><h4>Returns</h4>
 <p>the password used by the authentication method as a
 UTF-8-encoded array of bytes, as specified by the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--password-raw"><span class="type">“password-raw”</span></a> property. </p>
+<span class="type">“password-raw”</span> property. </p>
 <p><span class="annotation">[<acronym title="The data is owned by the callee, which is responsible of freeing it."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -3167,7 +3167,7 @@ nm_setting_802_1x_get_password_raw_flags
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-password-raw-flags.returns"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--password-raw"><span class="type">“password-raw”</span></a></p>
+<span class="type">“password-raw”</span></p>
 </div>
 </div>
 <hr>
@@ -3193,7 +3193,7 @@ nm_setting_802_1x_get_pin (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-pin.returns"></a><h4>Returns</h4>
 <p> the PIN used by the authentication method, if any, as specified
-by the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--pin"><span class="type">“pin”</span></a> property</p>
+by the <span class="type">“pin”</span> property</p>
 </div>
 </div>
 <hr>
@@ -3219,7 +3219,7 @@ nm_setting_802_1x_get_pin_flags (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-pin-flags.returns"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--pin"><span class="type">“pin”</span></a></p>
+<span class="type">“pin”</span></p>
 </div>
 </div>
 <hr>
@@ -3363,14 +3363,14 @@ nm_setting_802_1x_set_private_key (<em class="parameter"><code><a class="link" h
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.</p>
 <p>This function reads a private key from disk and sets the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--private-key"><span class="type">“private-key”</span></a> property with the private key file data if using
+<span class="type">“private-key”</span> property with the private key file data if using
 the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the private
 key file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.</p>
 <p>If <em class="parameter"><code>password</code></em>
  is given, this function attempts to decrypt the private key to
 verify that <em class="parameter"><code>password</code></em>
  is correct, and if it is, updates the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--private-key-password"><span class="type">“private-key-password”</span></a> property with the given <em class="parameter"><code>password</code></em>
+<span class="type">“private-key-password”</span> property with the given <em class="parameter"><code>password</code></em>
 .  If
 the decryption is unsuccessful, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned, <em class="parameter"><code>error</code></em>
  is set, and no
@@ -3461,7 +3461,7 @@ nm_setting_802_1x_get_private_key_password
 <a name="nm-setting-802-1x-get-private-key-password.returns"></a><h4>Returns</h4>
 <p> the private key password used to decrypt the private key if
 previously set with <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a>, or the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--private-key-password"><span class="type">“private-key-password”</span></a> property.</p>
+<span class="type">“private-key-password”</span> property.</p>
 </div>
 </div>
 <hr>
@@ -3488,7 +3488,7 @@ nm_setting_802_1x_get_private_key_password_flags
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-private-key-password-flags.returns"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--private-key-password"><span class="type">“private-key-password”</span></a></p>
+<span class="type">“private-key-password”</span></p>
 </div>
 </div>
 <hr>
@@ -3515,7 +3515,7 @@ nm_setting_802_1x_get_private_key_format
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-private-key-format.returns"></a><h4>Returns</h4>
 <p> the data format of the private key data stored in the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--private-key"><span class="type">“private-key”</span></a> property</p>
+<span class="type">“private-key”</span> property</p>
 </div>
 </div>
 <hr>
@@ -3661,14 +3661,14 @@ nm_setting_802_1x_set_phase2_private_key
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.</p>
 <p>This function reads a private key from disk and sets the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key"><span class="type">“phase2-private-key”</span></a> property with the private key file data if
+<span class="type">“phase2-private-key”</span> property with the private key file data if
 using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the
 private key file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.</p>
 <p>If <em class="parameter"><code>password</code></em>
  is given, this function attempts to decrypt the private key to
 verify that <em class="parameter"><code>password</code></em>
  is correct, and if it is, updates the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key-password"><span class="type">“phase2-private-key-password”</span></a> property with the given
+<span class="type">“phase2-private-key-password”</span> property with the given
 <em class="parameter"><code>password</code></em>
 .  If the decryption is unsuccessful, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned, <em class="parameter"><code>error</code></em>
  is
@@ -3760,7 +3760,7 @@ nm_setting_802_1x_get_phase2_private_key_password
 <a name="nm-setting-802-1x-get-phase2-private-key-password.returns"></a><h4>Returns</h4>
 <p> the private key password used to decrypt the private key if
 previously set with <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()"><code class="function">nm_setting_802_1x_set_phase2_private_key()</code></a> or the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key-password"><span class="type">“phase2-private-key-password”</span></a> property.</p>
+<span class="type">“phase2-private-key-password”</span> property.</p>
 </div>
 </div>
 <hr>
@@ -3787,7 +3787,7 @@ nm_setting_802_1x_get_phase2_private_key_password_flags
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-phase2-private-key-password-flags.returns"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key-password"><span class="type">“phase2-private-key-password”</span></a></p>
+<span class="type">“phase2-private-key-password”</span></p>
 </div>
 </div>
 <hr>
@@ -3814,7 +3814,7 @@ nm_setting_802_1x_get_phase2_private_key_format
 <div class="refsect3">
 <a name="nm-setting-802-1x-get-phase2-private-key-format.returns"></a><h4>Returns</h4>
 <p> the data format of the "phase 2" private key data stored in the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key"><span class="type">“phase2-private-key”</span></a> property</p>
+<span class="type">“phase2-private-key”</span> property</p>
 </div>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMSettingAdsl.html b/docs/libnm/html/NMSettingAdsl.html
index 1aa75c7c..6ae00ebd 100644
--- a/docs/libnm/html/NMSettingAdsl.html
+++ b/docs/libnm/html/NMSettingAdsl.html
@@ -204,7 +204,7 @@ nm_setting_adsl_get_username (<em class="parameter"><code><a class="link" href="
 </div>
 <div class="refsect3">
 <a name="nm-setting-adsl-get-username.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--username"><span class="type">“username”</span></a> property of the setting</p>
+<p> the <span class="type">“username”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -229,7 +229,7 @@ nm_setting_adsl_get_password (<em class="parameter"><code><a class="link" href="
 </div>
 <div class="refsect3">
 <a name="nm-setting-adsl-get-password.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--password"><span class="type">“password”</span></a> property of the setting</p>
+<p> the <span class="type">“password”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -254,7 +254,7 @@ nm_setting_adsl_get_protocol (<em class="parameter"><code><a class="link" href="
 </div>
 <div class="refsect3">
 <a name="nm-setting-adsl-get-protocol.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--protocol"><span class="type">“protocol”</span></a> property of the setting</p>
+<p> the <span class="type">“protocol”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -279,7 +279,7 @@ nm_setting_adsl_get_encapsulation (<em class="parameter"><code><a class="link" h
 </div>
 <div class="refsect3">
 <a name="nm-setting-adsl-get-encapsulation.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--encapsulation"><span class="type">“encapsulation”</span></a> property of the setting</p>
+<p> the <span class="type">“encapsulation”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -304,7 +304,7 @@ nm_setting_adsl_get_vpi (<em class="parameter"><code><a class="link" href="NMSet
 </div>
 <div class="refsect3">
 <a name="nm-setting-adsl-get-vpi.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--vpi"><span class="type">“vpi”</span></a> property of the setting</p>
+<p> the <span class="type">“vpi”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -329,7 +329,7 @@ nm_setting_adsl_get_vci (<em class="parameter"><code><a class="link" href="NMSet
 </div>
 <div class="refsect3">
 <a name="nm-setting-adsl-get-vci.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--vci"><span class="type">“vci”</span></a> property of the setting</p>
+<p> the <span class="type">“vci”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -354,7 +354,7 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 </div>
 <div class="refsect3">
 <a name="nm-setting-adsl-get-password-flags.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--password"><span class="type">“password”</span></a></p>
+<p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <span class="type">“password”</span></p>
 </div>
 </div>
 </div>
diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html
index 7f850594..75ffeb87 100644
--- a/docs/libnm/html/NMSettingBond.html
+++ b/docs/libnm/html/NMSettingBond.html
@@ -577,7 +577,7 @@ nm_setting_bond_get_option_default (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="nm-setting-bond-get-option-default.returns"></a><h4>Returns</h4>
 <p> the value of the bond option if not overridden by an entry in
-the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBond.html#NMSettingBond--options"><span class="type">“options”</span></a> property.</p>
+the <span class="type">“options”</span> property.</p>
 </div>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html
index 4cd226a6..0accc9ab 100644
--- a/docs/libnm/html/NMSettingBridge.html
+++ b/docs/libnm/html/NMSettingBridge.html
@@ -592,7 +592,7 @@ nm_setting_bridge_get_mac_address (<em class="parameter"><code><a class="link" h
 </div>
 <div class="refsect3">
 <a name="nm-setting-bridge-get-mac-address.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--mac-address"><span class="type">“mac-address”</span></a> property of the setting</p>
+<p> the <span class="type">“mac-address”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -617,7 +617,7 @@ nm_setting_bridge_get_stp (<em class="parameter"><code><a class="link" href="NMS
 </div>
 <div class="refsect3">
 <a name="nm-setting-bridge-get-stp.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--stp"><span class="type">“stp”</span></a> property of the setting</p>
+<p> the <span class="type">“stp”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -642,7 +642,7 @@ nm_setting_bridge_get_priority (<em class="parameter"><code><a class="link" href
 </div>
 <div class="refsect3">
 <a name="nm-setting-bridge-get-priority.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--priority"><span class="type">“priority”</span></a> property of the setting</p>
+<p> the <span class="type">“priority”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -667,7 +667,7 @@ nm_setting_bridge_get_forward_delay (<em class="parameter"><code><a class="link"
 </div>
 <div class="refsect3">
 <a name="nm-setting-bridge-get-forward-delay.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--forward-delay"><span class="type">“forward-delay”</span></a> property of the setting</p>
+<p> the <span class="type">“forward-delay”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -692,7 +692,7 @@ nm_setting_bridge_get_hello_time (<em class="parameter"><code><a class="link" hr
 </div>
 <div class="refsect3">
 <a name="nm-setting-bridge-get-hello-time.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--hello-time"><span class="type">“hello-time”</span></a> property of the setting</p>
+<p> the <span class="type">“hello-time”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -717,7 +717,7 @@ nm_setting_bridge_get_max_age (<em class="parameter"><code><a class="link" href=
 </div>
 <div class="refsect3">
 <a name="nm-setting-bridge-get-max-age.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--max-age"><span class="type">“max-age”</span></a> property of the setting</p>
+<p> the <span class="type">“max-age”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -742,7 +742,7 @@ nm_setting_bridge_get_ageing_time (<em class="parameter"><code><a class="link" h
 </div>
 <div class="refsect3">
 <a name="nm-setting-bridge-get-ageing-time.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--ageing-time"><span class="type">“ageing-time”</span></a> property of the setting</p>
+<p> the <span class="type">“ageing-time”</span> property of the setting</p>
 </div>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html
index d6044d66..dfd522e0 100644
--- a/docs/libnm/html/NMSettingBridgePort.html
+++ b/docs/libnm/html/NMSettingBridgePort.html
@@ -193,7 +193,7 @@ nm_setting_bridge_port_get_priority (<em class="parameter"><code><a class="link"
 </div>
 <div class="refsect3">
 <a name="nm-setting-bridge-port-get-priority.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridgePort.html#NMSettingBridgePort--priority"><span class="type">“priority”</span></a> property of the setting</p>
+<p> the <span class="type">“priority”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -218,7 +218,7 @@ nm_setting_bridge_port_get_path_cost (<em class="parameter"><code><a class="link
 </div>
 <div class="refsect3">
 <a name="nm-setting-bridge-port-get-path-cost.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridgePort.html#NMSettingBridgePort--path-cost"><span class="type">“path-cost”</span></a> property of the setting</p>
+<p> the <span class="type">“path-cost”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -244,7 +244,7 @@ nm_setting_bridge_port_get_hairpin_mode
 </div>
 <div class="refsect3">
 <a name="nm-setting-bridge-port-get-hairpin-mode.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode"><span class="type">“hairpin-mode”</span></a> property of the setting</p>
+<p> the <span class="type">“hairpin-mode”</span> property of the setting</p>
 </div>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMSettingCdma.html b/docs/libnm/html/NMSettingCdma.html
index e0e96e90..4b7fa909 100644
--- a/docs/libnm/html/NMSettingCdma.html
+++ b/docs/libnm/html/NMSettingCdma.html
@@ -162,7 +162,7 @@ nm_setting_cdma_get_number (<em class="parameter"><code><a class="link" href="NM
 </div>
 <div class="refsect3">
 <a name="nm-setting-cdma-get-number.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingCdma.html#NMSettingCdma--number"><span class="type">“number”</span></a> property of the setting</p>
+<p> the <span class="type">“number”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -187,7 +187,7 @@ nm_setting_cdma_get_username (<em class="parameter"><code><a class="link" href="
 </div>
 <div class="refsect3">
 <a name="nm-setting-cdma-get-username.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingCdma.html#NMSettingCdma--username"><span class="type">“username”</span></a> property of the setting</p>
+<p> the <span class="type">“username”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -212,7 +212,7 @@ nm_setting_cdma_get_password (<em class="parameter"><code><a class="link" href="
 </div>
 <div class="refsect3">
 <a name="nm-setting-cdma-get-password.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingCdma.html#NMSettingCdma--password"><span class="type">“password”</span></a> property of the setting</p>
+<p> the <span class="type">“password”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -237,7 +237,7 @@ nm_setting_cdma_get_password_flags (<em class="parameter"><code><a class="link"
 </div>
 <div class="refsect3">
 <a name="nm-setting-cdma-get-password-flags.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingCdma.html#NMSettingCdma--password"><span class="type">“password”</span></a></p>
+<p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <span class="type">“password”</span></p>
 </div>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index 3db17611..dc916f63 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -538,7 +538,7 @@ nm_setting_connection_new (<em class="parameter"><code><span class="type">void</
 <a name="nm-setting-connection-get-id"></a><h3>nm_setting_connection_get_id ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_setting_connection_get_id (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
-<p>Returns the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--id"><span class="type">“id”</span></a> property of the connection.</p>
+<p>Returns the <span class="type">“id”</span> property of the connection.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-get-id.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -564,7 +564,7 @@ nm_setting_connection_get_id (<em class="parameter"><code><a class="link" href="
 <a name="nm-setting-connection-get-uuid"></a><h3>nm_setting_connection_get_uuid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_setting_connection_get_uuid (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
-<p>Returns the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--uuid"><span class="type">“uuid”</span></a> property of the connection.</p>
+<p>Returns the <span class="type">“uuid”</span> property of the connection.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-get-uuid.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -618,7 +618,7 @@ nm_setting_connection_get_stable_id (<em class="parameter"><code><a class="link"
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_setting_connection_get_interface_name
                                (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
-<p>Returns the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--interface-name"><span class="type">“interface-name”</span></a> property of the connection.</p>
+<p>Returns the <span class="type">“interface-name”</span> property of the connection.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-get-interface-name.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -645,7 +645,7 @@ nm_setting_connection_get_interface_name
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_setting_connection_get_connection_type
                                (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
-<p>Returns the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--type"><span class="type">“type”</span></a> property of the connection.</p>
+<p>Returns the <span class="type">“type”</span> property of the connection.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-get-connection-type.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -671,7 +671,7 @@ nm_setting_connection_get_connection_type
 <a name="nm-setting-connection-get-autoconnect"></a><h3>nm_setting_connection_get_autoconnect ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_setting_connection_get_autoconnect (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
-<p>Returns the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--autoconnect"><span class="type">“autoconnect”</span></a> property of the connection.</p>
+<p>Returns the <span class="type">“autoconnect”</span> property of the connection.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-get-autoconnect.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -781,7 +781,7 @@ nm_setting_connection_get_multi_connect
 <a name="nm-setting-connection-get-timestamp"></a><h3>nm_setting_connection_get_timestamp ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="returnvalue">guint64</span></a>
 nm_setting_connection_get_timestamp (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
-<p>Returns the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--timestamp"><span class="type">“timestamp”</span></a> property of the connection.</p>
+<p>Returns the <span class="type">“timestamp”</span> property of the connection.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-get-timestamp.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -807,7 +807,7 @@ nm_setting_connection_get_timestamp (<em class="parameter"><code><a class="link"
 <a name="nm-setting-connection-get-read-only"></a><h3>nm_setting_connection_get_read_only ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_setting_connection_get_read_only (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
-<p>Returns the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--read-only"><span class="type">“read-only”</span></a> property of the connection.</p>
+<p>Returns the <span class="type">“read-only”</span> property of the connection.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-get-read-only.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -834,7 +834,7 @@ nm_setting_connection_get_read_only (<em class="parameter"><code><a class="link"
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
 nm_setting_connection_get_num_permissions
                                (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
-<p>Returns the number of entries in the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--permissions"><span class="type">“permissions”</span></a>
+<p>Returns the number of entries in the <span class="type">“permissions”</span>
 property of this setting.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-get-num-permissions.parameters"></a><h4>Parameters</h4>
@@ -865,7 +865,7 @@ nm_setting_connection_get_permission (<em class="parameter"><code><a class="link
                                       <em class="parameter"><code>const <span class="type">char</span> **out_ptype</code></em>,
                                       <em class="parameter"><code>const <span class="type">char</span> **out_pitem</code></em>,
                                       <em class="parameter"><code>const <span class="type">char</span> **out_detail</code></em>);</pre>
-<p>Retrieve one of the entries of the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--permissions"><span class="type">“permissions”</span></a> property
+<p>Retrieve one of the entries of the <span class="type">“permissions”</span> property
 of this setting.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-get-permission.parameters"></a><h4>Parameters</h4>
@@ -896,7 +896,7 @@ unless the entry is invalid, in which case it returns "invalid".</p></td>
 <td class="parameter_name"><p>out_pitem</p></td>
 <td class="parameter_description"><p>on return, the permission item (formatted according to <em class="parameter"><code>ptype</code></em>
 , see
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--permissions"><span class="type">“permissions”</span></a> for more detail</p></td>
+<span class="type">“permissions”</span> for more detail</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -918,7 +918,7 @@ was invalid</p>
 <a name="nm-setting-connection-get-zone"></a><h3>nm_setting_connection_get_zone ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_setting_connection_get_zone (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
-<p>Returns the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--zone"><span class="type">“zone”</span></a> property of the connection.</p>
+<p>Returns the <span class="type">“zone”</span> property of the connection.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-get-zone.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -986,7 +986,7 @@ nm_setting_connection_add_permission (<em class="parameter"><code><a class="link
 <p>Adds a permission to the connection's permission list.  At this time, only
 the "user" permission type is supported, and <em class="parameter"><code>pitem</code></em>
  must be a username. See
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--permissions"><span class="type">“permissions”</span></a>: for more details.</p>
+<span class="type">“permissions”</span>: for more details.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-add-permission.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1075,7 +1075,7 @@ nm_setting_connection_remove_permission_by_value
 <p>Removes the permission from the connection.
 At this time, only the "user" permission type is supported, and <em class="parameter"><code>pitem</code></em>
  must
-be a username. See <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--permissions"><span class="type">“permissions”</span></a>: for more details.</p>
+be a username. See <span class="type">“permissions”</span>: for more details.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-remove-permission-by-value.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1119,7 +1119,7 @@ be a username. See <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnecti
 <a name="nm-setting-connection-get-master"></a><h3>nm_setting_connection_get_master ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_setting_connection_get_master (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
-<p>Returns the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--master"><span class="type">“master”</span></a> property of the connection.</p>
+<p>Returns the <span class="type">“master”</span> property of the connection.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-get-master.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1182,7 +1182,7 @@ against <em class="parameter"><code>setting</code></em>
 <a name="nm-setting-connection-get-slave-type"></a><h3>nm_setting_connection_get_slave_type ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_setting_connection_get_slave_type (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
-<p>Returns the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--slave-type"><span class="type">“slave-type”</span></a> property of the connection.</p>
+<p>Returns the <span class="type">“slave-type”</span> property of the connection.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-get-slave-type.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1422,7 +1422,7 @@ nm_setting_connection_get_gateway_ping_timeout
 </div>
 <div class="refsect3">
 <a name="nm-setting-connection-get-gateway-ping-timeout.returns"></a><h4>Returns</h4>
-<p> the value contained in the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--gateway-ping-timeout"><span class="type">“gateway-ping-timeout”</span></a>
+<p> the value contained in the <span class="type">“gateway-ping-timeout”</span>
 property.</p>
 </div>
 </div>
diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html
index 853854df..4370ce9d 100644
--- a/docs/libnm/html/NMSettingDcb.html
+++ b/docs/libnm/html/NMSettingDcb.html
@@ -354,7 +354,7 @@ nm_setting_dcb_get_app_fcoe_flags (<em class="parameter"><code><a class="link" h
 </div>
 <div class="refsect3">
 <a name="nm-setting-dcb-get-app-fcoe-flags.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-fcoe-flags"><span class="type">“app-fcoe-flags”</span></a> property of the setting</p>
+<p> the <span class="type">“app-fcoe-flags”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -379,7 +379,7 @@ nm_setting_dcb_get_app_fcoe_priority (<em class="parameter"><code><a class="link
 </div>
 <div class="refsect3">
 <a name="nm-setting-dcb-get-app-fcoe-priority.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-fcoe-priority"><span class="type">“app-fcoe-priority”</span></a> property of the setting</p>
+<p> the <span class="type">“app-fcoe-priority”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -404,7 +404,7 @@ nm_setting_dcb_get_app_fcoe_mode (<em class="parameter"><code><a class="link" hr
 </div>
 <div class="refsect3">
 <a name="nm-setting-dcb-get-app-fcoe-mode.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-fcoe-mode"><span class="type">“app-fcoe-mode”</span></a> property of the setting</p>
+<p> the <span class="type">“app-fcoe-mode”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -429,7 +429,7 @@ nm_setting_dcb_get_app_iscsi_flags (<em class="parameter"><code><a class="link"
 </div>
 <div class="refsect3">
 <a name="nm-setting-dcb-get-app-iscsi-flags.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-iscsi-flags"><span class="type">“app-iscsi-flags”</span></a> property of the setting</p>
+<p> the <span class="type">“app-iscsi-flags”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -454,7 +454,7 @@ nm_setting_dcb_get_app_iscsi_priority (<em class="parameter"><code><a class="lin
 </div>
 <div class="refsect3">
 <a name="nm-setting-dcb-get-app-iscsi-priority.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-iscsi-priority"><span class="type">“app-iscsi-priority”</span></a> property of the setting</p>
+<p> the <span class="type">“app-iscsi-priority”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -479,7 +479,7 @@ nm_setting_dcb_get_app_fip_flags (<em class="parameter"><code><a class="link" hr
 </div>
 <div class="refsect3">
 <a name="nm-setting-dcb-get-app-fip-flags.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-fip-flags"><span class="type">“app-fip-flags”</span></a> property of the setting</p>
+<p> the <span class="type">“app-fip-flags”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -504,7 +504,7 @@ nm_setting_dcb_get_app_fip_priority (<em class="parameter"><code><a class="link"
 </div>
 <div class="refsect3">
 <a name="nm-setting-dcb-get-app-fip-priority.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-fip-priority"><span class="type">“app-fip-priority”</span></a> property of the setting</p>
+<p> the <span class="type">“app-fip-priority”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -530,7 +530,7 @@ nm_setting_dcb_get_priority_flow_control_flags
 </div>
 <div class="refsect3">
 <a name="nm-setting-dcb-get-priority-flow-control-flags.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-flow-control-flags"><span class="type">“priority-flow-control-flags”</span></a> property of the setting</p>
+<p> the <span class="type">“priority-flow-control-flags”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -577,7 +577,7 @@ nm_setting_dcb_set_priority_flow_control
                                (<em class="parameter"><code><a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="type">NMSettingDcb</span></a> *setting</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> user_priority</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enabled</code></em>);</pre>
-<p>These values are only valid when <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-flow-control"><span class="type">“priority-flow-control”</span></a> includes
+<p>These values are only valid when <span class="type">“priority-flow-control”</span> includes
 the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 <div class="refsect3">
 <a name="nm-setting-dcb-set-priority-flow-control.parameters"></a><h4>Parameters</h4>
@@ -630,7 +630,7 @@ nm_setting_dcb_get_priority_group_flags
 </div>
 <div class="refsect3">
 <a name="nm-setting-dcb-get-priority-group-flags.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-group-flags"><span class="type">“priority-group-flags”</span></a> property of the setting</p>
+<p> the <span class="type">“priority-group-flags”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -665,7 +665,7 @@ nm_setting_dcb_get_priority_group_id (<em class="parameter"><code><a class="link
 <a name="nm-setting-dcb-get-priority-group-id.returns"></a><h4>Returns</h4>
 <p> the group number <em class="parameter"><code>user_priority</code></em>
 is assigned to.  These values are
-only valid when <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-group-flags"><span class="type">“priority-group-flags”</span></a> includes the
+only valid when <span class="type">“priority-group-flags”</span> includes the
 <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 </div>
 </div>
@@ -676,7 +676,7 @@ only valid when <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NM
 nm_setting_dcb_set_priority_group_id (<em class="parameter"><code><a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="type">NMSettingDcb</span></a> *setting</code></em>,
                                       <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> user_priority</code></em>,
                                       <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> group_id</code></em>);</pre>
-<p>These values are only valid when <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-group-flags"><span class="type">“priority-group-flags”</span></a> includes
+<p>These values are only valid when <span class="type">“priority-group-flags”</span> includes
 the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 <div class="refsect3">
 <a name="nm-setting-dcb-set-priority-group-id.parameters"></a><h4>Parameters</h4>
@@ -741,7 +741,7 @@ nm_setting_dcb_get_priority_group_bandwidth
 <a name="nm-setting-dcb-get-priority-group-bandwidth.returns"></a><h4>Returns</h4>
 <p> the bandwidth percentage assigned to <em class="parameter"><code>group_id</code></em>
 .  These values are
-only valid when <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-group-flags"><span class="type">“priority-group-flags”</span></a> includes the
+only valid when <span class="type">“priority-group-flags”</span> includes the
 <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 </div>
 </div>
@@ -753,7 +753,7 @@ nm_setting_dcb_set_priority_group_bandwidth
                                (<em class="parameter"><code><a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="type">NMSettingDcb</span></a> *setting</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> group_id</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> bandwidth_percent</code></em>);</pre>
-<p>These values are only valid when <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-group-flags"><span class="type">“priority-group-flags”</span></a> includes
+<p>These values are only valid when <span class="type">“priority-group-flags”</span> includes
 the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 <div class="refsect3">
 <a name="nm-setting-dcb-set-priority-group-bandwidth.parameters"></a><h4>Parameters</h4>
@@ -816,7 +816,7 @@ nm_setting_dcb_get_priority_bandwidth (<em class="parameter"><code><a class="lin
 <a name="nm-setting-dcb-get-priority-bandwidth.returns"></a><h4>Returns</h4>
 <p> the allowed bandwidth percentage of <em class="parameter"><code>user_priority</code></em>
 in its priority group.
-These values are only valid when <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-group-flags"><span class="type">“priority-group-flags”</span></a> includes the
+These values are only valid when <span class="type">“priority-group-flags”</span> includes the
 <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 </div>
 </div>
@@ -827,7 +827,7 @@ These values are only valid when <a href="/usr/share/gtk-doc/html/libnm-util/NMS
 nm_setting_dcb_set_priority_bandwidth (<em class="parameter"><code><a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="type">NMSettingDcb</span></a> *setting</code></em>,
                                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> user_priority</code></em>,
                                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> bandwidth_percent</code></em>);</pre>
-<p>These values are only valid when <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-group-flags"><span class="type">“priority-group-flags”</span></a> includes
+<p>These values are only valid when <span class="type">“priority-group-flags”</span> includes
 the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 <div class="refsect3">
 <a name="nm-setting-dcb-set-priority-bandwidth.parameters"></a><h4>Parameters</h4>
@@ -893,7 +893,7 @@ nm_setting_dcb_get_priority_strict_bandwidth
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>user_priority</code></em>
 may use all of the bandwidth allocated to its
 assigned group, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if not. These values are only valid when
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-group-flags"><span class="type">“priority-group-flags”</span></a> includes the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
+<span class="type">“priority-group-flags”</span> includes the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 </div>
 </div>
 <hr>
@@ -904,7 +904,7 @@ nm_setting_dcb_set_priority_strict_bandwidth
                                (<em class="parameter"><code><a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="type">NMSettingDcb</span></a> *setting</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> user_priority</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> strict</code></em>);</pre>
-<p>These values are only valid when <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-group-flags"><span class="type">“priority-group-flags”</span></a> includes
+<p>These values are only valid when <span class="type">“priority-group-flags”</span> includes
 the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 <div class="refsect3">
 <a name="nm-setting-dcb-set-priority-strict-bandwidth.parameters"></a><h4>Parameters</h4>
@@ -969,7 +969,7 @@ nm_setting_dcb_get_priority_traffic_class
 <a name="nm-setting-dcb-get-priority-traffic-class.returns"></a><h4>Returns</h4>
 <p> the traffic class assigned to <em class="parameter"><code>user_priority</code></em>
 . These values are only
-valid when <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-group-flags"><span class="type">“priority-group-flags”</span></a> includes the
+valid when <span class="type">“priority-group-flags”</span> includes the
 <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 </div>
 </div>
diff --git a/docs/libnm/html/NMSettingEthtool.html b/docs/libnm/html/NMSettingEthtool.html
index d7f53331..c99302eb 100644
--- a/docs/libnm/html/NMSettingEthtool.html
+++ b/docs/libnm/html/NMSettingEthtool.html
@@ -263,7 +263,7 @@ nm_setting_ethtool_get_optnames (<em class="parameter"><code><a class="link" hre
 <p>use <a class="link" href="NMSetting.html#nm-setting-option-get-all-names" title="nm_setting_option_get_all_names ()"><code class="function">nm_setting_option_get_all_names()</code></a> instead.</p>
 </div>
 <p>This returns all options names that are set. This includes the feature names
-like <a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-GRO:CAPS"><code class="literal">NM_ETHTOOL_OPTNAME_FEATURE_GRO</code></a>. See <a class="link" href="NMSettingEthtool.html#nm-ethtool-optname-is-feature" title="nm_ethtool_optname_is_feature ()"><code class="function">nm_ethtool_optname_is_feature()</code></a> to
+like <code class="literal">NM_ETHTOOL_OPTNAME_FEATURE_GRO</code>. See <a class="link" href="NMSettingEthtool.html#nm-ethtool-optname-is-feature" title="nm_ethtool_optname_is_feature ()"><code class="function">nm_ethtool_optname_is_feature()</code></a> to
 check whether the option name is valid for offload features.</p>
 <div class="refsect3">
 <a name="nm-setting-ethtool-get-optnames.parameters"></a><h4>Parameters</h4>
diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html
index 2a3b9d16..4a10561c 100644
--- a/docs/libnm/html/NMSettingGeneric.html
+++ b/docs/libnm/html/NMSettingGeneric.html
@@ -67,7 +67,7 @@
 optional properties that apply to "generic" devices (ie, devices that
 NetworkManager does not specifically recognize).</p>
 <p>There are currently no properties on this object; it exists only to be
-the "connection type" setting on <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> for generic devices.</p>
+the "connection type" setting on <span class="type">NMConnections</span> for generic devices.</p>
 </div>
 <div class="refsect1">
 <a name="NMSettingGeneric.functions_details"></a><h2>Functions</h2>
diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html
index 35c275cd..b6477e6f 100644
--- a/docs/libnm/html/NMSettingGsm.html
+++ b/docs/libnm/html/NMSettingGsm.html
@@ -290,7 +290,7 @@ nm_setting_gsm_get_username (<em class="parameter"><code><a class="link" href="N
 </div>
 <div class="refsect3">
 <a name="nm-setting-gsm-get-username.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--username"><span class="type">“username”</span></a> property of the setting</p>
+<p> the <span class="type">“username”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -315,7 +315,7 @@ nm_setting_gsm_get_password (<em class="parameter"><code><a class="link" href="N
 </div>
 <div class="refsect3">
 <a name="nm-setting-gsm-get-password.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--password"><span class="type">“password”</span></a> property of the setting</p>
+<p> the <span class="type">“password”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -340,7 +340,7 @@ nm_setting_gsm_get_apn (<em class="parameter"><code><a class="link" href="NMSett
 </div>
 <div class="refsect3">
 <a name="nm-setting-gsm-get-apn.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--apn"><span class="type">“apn”</span></a> property of the setting</p>
+<p> the <span class="type">“apn”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -365,7 +365,7 @@ nm_setting_gsm_get_network_id (<em class="parameter"><code><a class="link" href=
 </div>
 <div class="refsect3">
 <a name="nm-setting-gsm-get-network-id.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--network-id"><span class="type">“network-id”</span></a> property of the setting</p>
+<p> the <span class="type">“network-id”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -390,7 +390,7 @@ nm_setting_gsm_get_pin (<em class="parameter"><code><a class="link" href="NMSett
 </div>
 <div class="refsect3">
 <a name="nm-setting-gsm-get-pin.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--pin"><span class="type">“pin”</span></a> property of the setting</p>
+<p> the <span class="type">“pin”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -415,7 +415,7 @@ nm_setting_gsm_get_home_only (<em class="parameter"><code><a class="link" href="
 </div>
 <div class="refsect3">
 <a name="nm-setting-gsm-get-home-only.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--home-only"><span class="type">“home-only”</span></a> property of the setting</p>
+<p> the <span class="type">“home-only”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -548,7 +548,7 @@ nm_setting_gsm_get_number (<em class="parameter"><code><a class="link" href="NMS
 </div>
 <div class="refsect3">
 <a name="nm-setting-gsm-get-number.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--number"><span class="type">“number”</span></a> property of the setting</p>
+<p> the <span class="type">“number”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -573,7 +573,7 @@ nm_setting_gsm_get_pin_flags (<em class="parameter"><code><a class="link" href="
 </div>
 <div class="refsect3">
 <a name="nm-setting-gsm-get-pin-flags.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--pin"><span class="type">“pin”</span></a></p>
+<p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <span class="type">“pin”</span></p>
 </div>
 </div>
 <hr>
@@ -598,7 +598,7 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 </div>
 <div class="refsect3">
 <a name="nm-setting-gsm-get-password-flags.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--password"><span class="type">“password”</span></a></p>
+<p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <span class="type">“password”</span></p>
 </div>
 </div>
 </div>
diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html
index aa26a2f3..ec5bb9f5 100644
--- a/docs/libnm/html/NMSettingIP4Config.html
+++ b/docs/libnm/html/NMSettingIP4Config.html
@@ -179,7 +179,7 @@ nm_setting_ip4_config_new (<em class="parameter"><code><span class="type">void</
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_setting_ip4_config_get_dhcp_client_id
                                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
-<p>Returns the value contained in the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#NMSettingIP4Config--dhcp-client-id"><span class="type">“dhcp-client-id”</span></a>
+<p>Returns the value contained in the <span class="type">“dhcp-client-id”</span>
 property.</p>
 <div class="refsect3">
 <a name="nm-setting-ip4-config-get-dhcp-client-id.parameters"></a><h4>Parameters</h4>
diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html
index fe805d0f..452f5796 100644
--- a/docs/libnm/html/NMSettingIP6Config.html
+++ b/docs/libnm/html/NMSettingIP6Config.html
@@ -215,7 +215,7 @@ nm_setting_ip6_config_new (<em class="parameter"><code><span class="type">void</
 <a name="nm-setting-ip6-config-get-ip6-privacy"></a><h3>nm_setting_ip6_config_get_ip6_privacy ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigPrivacy" title="enum NMSettingIP6ConfigPrivacy"><span class="returnvalue">NMSettingIP6ConfigPrivacy</span></a>
 nm_setting_ip6_config_get_ip6_privacy (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
-<p>Returns the value contained in the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP6Config.html#NMSettingIP6Config--ip6-privacy"><span class="type">“ip6-privacy”</span></a>
+<p>Returns the value contained in the <span class="type">“ip6-privacy”</span>
 property.</p>
 <div class="refsect3">
 <a name="nm-setting-ip6-config-get-ip6-privacy.parameters"></a><h4>Parameters</h4>
diff --git a/docs/libnm/html/NMSettingInfiniband.html b/docs/libnm/html/NMSettingInfiniband.html
index c4c2ef31..185907d0 100644
--- a/docs/libnm/html/NMSettingInfiniband.html
+++ b/docs/libnm/html/NMSettingInfiniband.html
@@ -169,7 +169,7 @@ nm_setting_infiniband_get_mac_address (<em class="parameter"><code><a class="lin
 </div>
 <div class="refsect3">
 <a name="nm-setting-infiniband-get-mac-address.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingInfiniband.html#NMSettingInfiniband--mac-address"><span class="type">“mac-address”</span></a> property of the setting</p>
+<p> the <span class="type">“mac-address”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -194,7 +194,7 @@ nm_setting_infiniband_get_mtu (<em class="parameter"><code><a class="link" href=
 </div>
 <div class="refsect3">
 <a name="nm-setting-infiniband-get-mtu.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingInfiniband.html#NMSettingInfiniband--mtu"><span class="type">“mtu”</span></a> property of the setting</p>
+<p> the <span class="type">“mtu”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -285,8 +285,8 @@ nm_setting_infiniband_get_parent (<em class="parameter"><code><a class="link" hr
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_setting_infiniband_get_virtual_interface_name
                                (<em class="parameter"><code><a class="link" href="NMSettingInfiniband.html" title="NMSettingInfiniband"><span class="type">NMSettingInfiniband</span></a> *setting</code></em>);</pre>
-<p>Returns the interface name created by combining <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingInfiniband.html#NMSettingInfiniband--parent"><span class="type">“parent”</span></a>
-and <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingInfiniband.html#NMSettingInfiniband--p-key"><span class="type">“p-key”</span></a>. (If either property is unset, this will
+<p>Returns the interface name created by combining <span class="type">“parent”</span>
+and <span class="type">“p-key”</span>. (If either property is unset, this will
 return <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.)</p>
 <div class="refsect3">
 <a name="nm-setting-infiniband-get-virtual-interface-name.parameters"></a><h4>Parameters</h4>
diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html
index efed6596..b4f5f1f5 100644
--- a/docs/libnm/html/NMSettingSerial.html
+++ b/docs/libnm/html/NMSettingSerial.html
@@ -178,7 +178,7 @@ nm_setting_serial_get_baud (<em class="parameter"><code><a class="link" href="NM
 </div>
 <div class="refsect3">
 <a name="nm-setting-serial-get-baud.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingSerial.html#NMSettingSerial--baud"><span class="type">“baud”</span></a> property of the setting</p>
+<p> the <span class="type">“baud”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -203,7 +203,7 @@ nm_setting_serial_get_bits (<em class="parameter"><code><a class="link" href="NM
 </div>
 <div class="refsect3">
 <a name="nm-setting-serial-get-bits.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingSerial.html#NMSettingSerial--bits"><span class="type">“bits”</span></a> property of the setting</p>
+<p> the <span class="type">“bits”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -228,7 +228,7 @@ nm_setting_serial_get_parity (<em class="parameter"><code><a class="link" href="
 </div>
 <div class="refsect3">
 <a name="nm-setting-serial-get-parity.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingSerial.html#NMSettingSerial--parity"><span class="type">“parity”</span></a> property of the setting</p>
+<p> the <span class="type">“parity”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -253,7 +253,7 @@ nm_setting_serial_get_stopbits (<em class="parameter"><code><a class="link" href
 </div>
 <div class="refsect3">
 <a name="nm-setting-serial-get-stopbits.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingSerial.html#NMSettingSerial--stopbits"><span class="type">“stopbits”</span></a> property of the setting</p>
+<p> the <span class="type">“stopbits”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -278,7 +278,7 @@ nm_setting_serial_get_send_delay (<em class="parameter"><code><a class="link" hr
 </div>
 <div class="refsect3">
 <a name="nm-setting-serial-get-send-delay.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingSerial.html#NMSettingSerial--send-delay"><span class="type">“send-delay”</span></a> property of the setting</p>
+<p> the <span class="type">“send-delay”</span> property of the setting</p>
 </div>
 </div>
 </div>
diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index 1af5bc5f..aaf9f7fb 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -1202,7 +1202,7 @@ nm_setting_team_get_config (<em class="parameter"><code><a class="link" href="NM
 </div>
 <div class="refsect3">
 <a name="nm-setting-team-get-config.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingTeam.html#NMSettingTeam--config"><span class="type">“config”</span></a> property of the setting</p>
+<p> the <span class="type">“config”</span> property of the setting</p>
 </div>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html
index bd6712a5..b2dc9bfa 100644
--- a/docs/libnm/html/NMSettingTeamPort.html
+++ b/docs/libnm/html/NMSettingTeamPort.html
@@ -236,7 +236,7 @@ nm_setting_team_port_get_config (<em class="parameter"><code><a class="link" hre
 </div>
 <div class="refsect3">
 <a name="nm-setting-team-port-get-config.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingTeamPort.html#NMSettingTeamPort--config"><span class="type">“config”</span></a> property of the setting</p>
+<p> the <span class="type">“config”</span> property of the setting</p>
 </div>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index 69d1733c..7b992456 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -233,7 +233,7 @@ nm_setting_vlan_get_parent (<em class="parameter"><code><a class="link" href="NM
 </div>
 <div class="refsect3">
 <a name="nm-setting-vlan-get-parent.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--parent"><span class="type">“parent”</span></a> property of the setting</p>
+<p> the <span class="type">“parent”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -258,7 +258,7 @@ nm_setting_vlan_get_id (<em class="parameter"><code><a class="link" href="NMSett
 </div>
 <div class="refsect3">
 <a name="nm-setting-vlan-get-id.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--id"><span class="type">“id”</span></a> property of the setting</p>
+<p> the <span class="type">“id”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -283,7 +283,7 @@ nm_setting_vlan_get_flags (<em class="parameter"><code><a class="link" href="NMS
 </div>
 <div class="refsect3">
 <a name="nm-setting-vlan-get-flags.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--flags"><span class="type">“flags”</span></a> property of the setting</p>
+<p> the <span class="type">“flags”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -293,7 +293,7 @@ nm_setting_vlan_get_flags (<em class="parameter"><code><a class="link" href="NMS
 nm_setting_vlan_get_num_priorities (<em class="parameter"><code><a class="link" href="NMSettingVlan.html" title="NMSettingVlan"><span class="type">NMSettingVlan</span></a> *setting</code></em>,
                                     <em class="parameter"><code><a class="link" href="NMSettingVlan.html#NMVlanPriorityMap" title="enum NMVlanPriorityMap"><span class="type">NMVlanPriorityMap</span></a> map</code></em>);</pre>
 <p>Returns the number of entries in the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--ingress-priority-map"><span class="type">“ingress_priority_map”</span></a> or <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--egress-priority-map"><span class="type">“egress_priority_map”</span></a>
+<span class="type">“ingress_priority_map”</span> or <span class="type">“egress_priority_map”</span>
 properties of this setting.</p>
 <div class="refsect3">
 <a name="nm-setting-vlan-get-num-priorities.parameters"></a><h4>Parameters</h4>
@@ -331,8 +331,8 @@ nm_setting_vlan_get_priority (<em class="parameter"><code><a class="link" href="
                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>,
                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> *out_from</code></em>,
                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> *out_to</code></em>);</pre>
-<p>Retrieve one of the entries of the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--ingress-priority-map"><span class="type">“ingress_priority_map”</span></a>
-or <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--egress-priority-map"><span class="type">“egress_priority_map”</span></a> properties of this setting.</p>
+<p>Retrieve one of the entries of the <span class="type">“ingress_priority_map”</span>
+or <span class="type">“egress_priority_map”</span> properties of this setting.</p>
 <div class="refsect3">
 <a name="nm-setting-vlan-get-priority.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -384,8 +384,8 @@ nm_setting_vlan_add_priority (<em class="parameter"><code><a class="link" href="
                               <em class="parameter"><code><a class="link" href="NMSettingVlan.html#NMVlanPriorityMap" title="enum NMVlanPriorityMap"><span class="type">NMVlanPriorityMap</span></a> map</code></em>,
                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> from</code></em>,
                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> to</code></em>);</pre>
-<p>Adds a priority mapping to the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--ingress-priority-map"><span class="type">“ingress_priority_map”</span></a> or
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--egress-priority-map"><span class="type">“egress_priority_map”</span></a> properties of the setting. If <em class="parameter"><code>from</code></em>
+<p>Adds a priority mapping to the <span class="type">“ingress_priority_map”</span> or
+<span class="type">“egress_priority_map”</span> properties of the setting. If <em class="parameter"><code>from</code></em>
  is
 already in the given priority map, this function will overwrite the
 existing entry with the new <em class="parameter"><code>to</code></em>
@@ -448,7 +448,7 @@ nm_setting_vlan_remove_priority (<em class="parameter"><code><a class="link" hre
                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);</pre>
 <p>Removes the priority map at index <em class="parameter"><code>idx</code></em>
  from the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--ingress-priority-map"><span class="type">“ingress_priority_map”</span></a> or <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--egress-priority-map"><span class="type">“egress_priority_map”</span></a>
+<span class="type">“ingress_priority_map”</span> or <span class="type">“egress_priority_map”</span>
 properties.</p>
 <div class="refsect3">
 <a name="nm-setting-vlan-remove-priority.parameters"></a><h4>Parameters</h4>
@@ -489,8 +489,8 @@ nm_setting_vlan_remove_priority_by_value
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> to</code></em>);</pre>
 <p>Removes the priority map <em class="parameter"><code>form</code></em>
 :<em class="parameter"><code>to</code></em>
- from the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--ingress-priority-map"><span class="type">“ingress_priority_map”</span></a>
-or <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--egress-priority-map"><span class="type">“egress_priority_map”</span></a> (according to <em class="parameter"><code>map</code></em>
+ from the <span class="type">“ingress_priority_map”</span>
+or <span class="type">“egress_priority_map”</span> (according to <em class="parameter"><code>map</code></em>
  argument)
 properties.</p>
 <div class="refsect3">
@@ -541,8 +541,8 @@ nm_setting_vlan_remove_priority_str_by_value
                                 <em class="parameter"><code><a class="link" href="NMSettingVlan.html#NMVlanPriorityMap" title="enum NMVlanPriorityMap"><span class="type">NMVlanPriorityMap</span></a> map</code></em>,
                                 <em class="parameter"><code>const <span class="type">char</span> *str</code></em>);</pre>
 <p>Removes the priority map <em class="parameter"><code>str</code></em>
- from the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--ingress-priority-map"><span class="type">“ingress_priority_map”</span></a>
-or <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--egress-priority-map"><span class="type">“egress_priority_map”</span></a> (according to <em class="parameter"><code>map</code></em>
+ from the <span class="type">“ingress_priority_map”</span>
+or <span class="type">“egress_priority_map”</span> (according to <em class="parameter"><code>map</code></em>
  argument)
 properties.</p>
 <div class="refsect3">
@@ -583,8 +583,8 @@ properties.</p>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_setting_vlan_clear_priorities (<em class="parameter"><code><a class="link" href="NMSettingVlan.html" title="NMSettingVlan"><span class="type">NMSettingVlan</span></a> *setting</code></em>,
                                   <em class="parameter"><code><a class="link" href="NMSettingVlan.html#NMVlanPriorityMap" title="enum NMVlanPriorityMap"><span class="type">NMVlanPriorityMap</span></a> map</code></em>);</pre>
-<p>Clear all the entries from <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--ingress-priority-map"><span class="type">“ingress_priority_map”</span></a> or
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--egress-priority-map"><span class="type">“egress_priority_map”</span></a> properties.</p>
+<p>Clear all the entries from <span class="type">“ingress_priority_map”</span> or
+<span class="type">“egress_priority_map”</span> properties.</p>
 <div class="refsect3">
 <a name="nm-setting-vlan-clear-priorities.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -615,8 +615,8 @@ nm_setting_vlan_clear_priorities (<em class="parameter"><code><a class="link" hr
 nm_setting_vlan_add_priority_str (<em class="parameter"><code><a class="link" href="NMSettingVlan.html" title="NMSettingVlan"><span class="type">NMSettingVlan</span></a> *setting</code></em>,
                                   <em class="parameter"><code><a class="link" href="NMSettingVlan.html#NMVlanPriorityMap" title="enum NMVlanPriorityMap"><span class="type">NMVlanPriorityMap</span></a> map</code></em>,
                                   <em class="parameter"><code>const <span class="type">char</span> *str</code></em>);</pre>
-<p>Adds a priority map entry into either the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--ingress-priority-map"><span class="type">“ingress_priority_map”</span></a>
-or the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--egress-priority-map"><span class="type">“egress_priority_map”</span></a> properties.  The priority map maps
+<p>Adds a priority map entry into either the <span class="type">“ingress_priority_map”</span>
+or the <span class="type">“egress_priority_map”</span> properties.  The priority map maps
 the Linux SKB priorities to 802.1p priorities.</p>
 <div class="refsect3">
 <a name="nm-setting-vlan-add-priority-str.parameters"></a><h4>Parameters</h4>
diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index 6389ac4b..247660e5 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -372,7 +372,7 @@ nm_setting_wired_get_port (<em class="parameter"><code><a class="link" href="NMS
 </div>
 <div class="refsect3">
 <a name="nm-setting-wired-get-port.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--port"><span class="type">“port”</span></a> property of the setting</p>
+<p> the <span class="type">“port”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -397,7 +397,7 @@ nm_setting_wired_get_speed (<em class="parameter"><code><a class="link" href="NM
 </div>
 <div class="refsect3">
 <a name="nm-setting-wired-get-speed.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--speed"><span class="type">“speed”</span></a> property of the setting</p>
+<p> the <span class="type">“speed”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -422,7 +422,7 @@ nm_setting_wired_get_duplex (<em class="parameter"><code><a class="link" href="N
 </div>
 <div class="refsect3">
 <a name="nm-setting-wired-get-duplex.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--duplex"><span class="type">“duplex”</span></a> property of the setting</p>
+<p> the <span class="type">“duplex”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -447,7 +447,7 @@ nm_setting_wired_get_auto_negotiate (<em class="parameter"><code><a class="link"
 </div>
 <div class="refsect3">
 <a name="nm-setting-wired-get-auto-negotiate.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--auto-negotiate"><span class="type">“auto-negotiate”</span></a> property of the setting</p>
+<p> the <span class="type">“auto-negotiate”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -472,7 +472,7 @@ nm_setting_wired_get_mac_address (<em class="parameter"><code><a class="link" hr
 </div>
 <div class="refsect3">
 <a name="nm-setting-wired-get-mac-address.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--mac-address"><span class="type">“mac-address”</span></a> property of the setting</p>
+<p> the <span class="type">“mac-address”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -498,7 +498,7 @@ nm_setting_wired_get_cloned_mac_address
 </div>
 <div class="refsect3">
 <a name="nm-setting-wired-get-cloned-mac-address.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--cloned-mac-address"><span class="type">“cloned-mac-address”</span></a> property of the setting</p>
+<p> the <span class="type">“cloned-mac-address”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -578,7 +578,7 @@ nm_setting_wired_get_mac_address_blacklist
 </div>
 <div class="refsect3">
 <a name="nm-setting-wired-get-mac-address-blacklist.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--mac-address-blacklist"><span class="type">“mac-address-blacklist”</span></a> property of the setting</p>
+<p> the <span class="type">“mac-address-blacklist”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -650,7 +650,7 @@ at index <em class="parameter"><code>idx</code></em>
 nm_setting_wired_add_mac_blacklist_item
                                (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>,
                                 <em class="parameter"><code>const <span class="type">char</span> *mac</code></em>);</pre>
-<p>Adds a new MAC address to the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--mac-address-blacklist"><span class="type">“mac-address-blacklist”</span></a> property.</p>
+<p>Adds a new MAC address to the <span class="type">“mac-address-blacklist”</span> property.</p>
 <div class="refsect3">
 <a name="nm-setting-wired-add-mac-blacklist-item.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -793,7 +793,7 @@ nm_setting_wired_get_mtu (<em class="parameter"><code><a class="link" href="NMSe
 </div>
 <div class="refsect3">
 <a name="nm-setting-wired-get-mtu.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--mtu"><span class="type">“mtu”</span></a> property of the setting</p>
+<p> the <span class="type">“mtu”</span> property of the setting</p>
 </div>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index 8f937cbc..6c734ef1 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -417,7 +417,7 @@ nm_setting_wireless_get_ssid (<em class="parameter"><code><a class="link" href="
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-get-ssid.returns"></a><h4>Returns</h4>
-<p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--ssid"><span class="type">“ssid”</span></a> property of the setting. </p>
+<p>the <span class="type">“ssid”</span> property of the setting. </p>
 <p><span class="annotation">[<acronym title="The data is owned by the callee, which is responsible of freeing it."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -443,7 +443,7 @@ nm_setting_wireless_get_mode (<em class="parameter"><code><a class="link" href="
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-get-mode.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--mode"><span class="type">“mode”</span></a> property of the setting</p>
+<p> the <span class="type">“mode”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -468,7 +468,7 @@ nm_setting_wireless_get_band (<em class="parameter"><code><a class="link" href="
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-get-band.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--band"><span class="type">“band”</span></a> property of the setting</p>
+<p> the <span class="type">“band”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -493,7 +493,7 @@ nm_setting_wireless_get_channel (<em class="parameter"><code><a class="link" hre
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-get-channel.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--channel"><span class="type">“channel”</span></a> property of the setting</p>
+<p> the <span class="type">“channel”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -518,7 +518,7 @@ nm_setting_wireless_get_bssid (<em class="parameter"><code><a class="link" href=
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-get-bssid.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--bssid"><span class="type">“bssid”</span></a> property of the setting</p>
+<p> the <span class="type">“bssid”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -543,7 +543,7 @@ nm_setting_wireless_get_rate (<em class="parameter"><code><a class="link" href="
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-get-rate.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--rate"><span class="type">“rate”</span></a> property of the setting</p>
+<p> the <span class="type">“rate”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -568,7 +568,7 @@ nm_setting_wireless_get_tx_power (<em class="parameter"><code><a class="link" hr
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-get-tx-power.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--tx-power"><span class="type">“tx-power”</span></a> property of the setting</p>
+<p> the <span class="type">“tx-power”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -593,7 +593,7 @@ nm_setting_wireless_get_mac_address (<em class="parameter"><code><a class="link"
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-get-mac-address.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--mac-address"><span class="type">“mac-address”</span></a> property of the setting</p>
+<p> the <span class="type">“mac-address”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -619,7 +619,7 @@ nm_setting_wireless_get_cloned_mac_address
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-get-cloned-mac-address.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--cloned-mac-address"><span class="type">“cloned-mac-address”</span></a> property of the setting</p>
+<p> the <span class="type">“cloned-mac-address”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -672,7 +672,7 @@ nm_setting_wireless_get_mac_address_blacklist
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-get-mac-address-blacklist.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--mac-address-blacklist"><span class="type">“mac-address-blacklist”</span></a> property of the setting</p>
+<p> the <span class="type">“mac-address-blacklist”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -744,7 +744,7 @@ at index <em class="parameter"><code>idx</code></em>
 nm_setting_wireless_add_mac_blacklist_item
                                (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>,
                                 <em class="parameter"><code>const <span class="type">char</span> *mac</code></em>);</pre>
-<p>Adds a new MAC address to the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--mac-address-blacklist"><span class="type">“mac-address-blacklist”</span></a> property.</p>
+<p>Adds a new MAC address to the <span class="type">“mac-address-blacklist”</span> property.</p>
 <div class="refsect3">
 <a name="nm-setting-wireless-add-mac-blacklist-item.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -887,7 +887,7 @@ nm_setting_wireless_get_mtu (<em class="parameter"><code><a class="link" href="N
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-get-mtu.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--mtu"><span class="type">“mtu”</span></a> property of the setting</p>
+<p> the <span class="type">“mtu”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -912,7 +912,7 @@ nm_setting_wireless_get_hidden (<em class="parameter"><code><a class="link" href
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-get-hidden.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--hidden"><span class="type">“hidden”</span></a> property of the setting</p>
+<p> the <span class="type">“hidden”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -937,7 +937,7 @@ nm_setting_wireless_get_powersave (<em class="parameter"><code><a class="link" h
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-get-powersave.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--powersave"><span class="type">“powersave”</span></a> property of the setting</p>
+<p> the <span class="type">“powersave”</span> property of the setting</p>
 </div>
 <p class="since">Since: 1.2</p>
 </div>
diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index 617735d0..bdc00c7e 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -479,7 +479,7 @@ nm_setting_wireless_security_get_key_mgmt
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-security-get-key-mgmt.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt"><span class="type">“key-mgmt”</span></a> property of the setting</p>
+<p> the <span class="type">“key-mgmt”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -1113,7 +1113,7 @@ nm_setting_wireless_security_get_psk (<em class="parameter"><code><a class="link
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-security-get-psk.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk"><span class="type">“psk”</span></a> property of the setting</p>
+<p> the <span class="type">“psk”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -1140,7 +1140,7 @@ nm_setting_wireless_security_get_psk_flags
 <div class="refsect3">
 <a name="nm-setting-wireless-security-get-psk-flags.returns"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk"><span class="type">“psk”</span></a></p>
+<span class="type">“psk”</span></p>
 </div>
 </div>
 <hr>
@@ -1166,7 +1166,7 @@ nm_setting_wireless_security_get_leap_username
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-security-get-leap-username.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username"><span class="type">“leap-username”</span></a> property of the setting</p>
+<p> the <span class="type">“leap-username”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -1192,7 +1192,7 @@ nm_setting_wireless_security_get_leap_password
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-security-get-leap-password.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password"><span class="type">“leap-password”</span></a> property of the setting</p>
+<p> the <span class="type">“leap-password”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -1219,7 +1219,7 @@ nm_setting_wireless_security_get_leap_password_flags
 <div class="refsect3">
 <a name="nm-setting-wireless-security-get-leap-password-flags.returns"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password"><span class="type">“leap-password”</span></a></p>
+<span class="type">“leap-password”</span></p>
 </div>
 </div>
 <hr>
@@ -1287,7 +1287,7 @@ nm_setting_wireless_security_set_wep_key
 <tr>
 <td class="parameter_name"><p>key</p></td>
 <td class="parameter_description"><p>the WEP key as a string, in either hexadecimal, ASCII, or passphrase
-form as determined by the value of the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type"><span class="type">“wep-key-type”</span></a>
+form as determined by the value of the <span class="type">“wep-key-type”</span>
 property.</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -1318,7 +1318,7 @@ nm_setting_wireless_security_get_wep_tx_keyidx
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-security-get-wep-tx-keyidx.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-tx-keyidx"><span class="type">“wep-tx-keyidx”</span></a> property of the setting</p>
+<p> the <span class="type">“wep-tx-keyidx”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -1344,7 +1344,7 @@ nm_setting_wireless_security_get_auth_alg
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-security-get-auth-alg.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg"><span class="type">“auth-alg”</span></a> property of the setting</p>
+<p> the <span class="type">“auth-alg”</span> property of the setting</p>
 </div>
 </div>
 <hr>
@@ -1396,7 +1396,7 @@ nm_setting_wireless_security_get_wep_key_type
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-security-get-wep-key-type.returns"></a><h4>Returns</h4>
-<p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type"><span class="type">“wep-key-type”</span></a> property of the setting</p>
+<p> the <span class="type">“wep-key-type”</span> property of the setting</p>
 </div>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html
index bacd8318..6dfe6f8b 100644
--- a/docs/libnm/html/NMVpnConnection.html
+++ b/docs/libnm/html/NMVpnConnection.html
@@ -44,7 +44,7 @@
 <tbody>
 <tr>
 <td class="function_type">
-<a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState"><span class="returnvalue">NMVpnConnectionState</span></a>
+<span class="returnvalue">NMVpnConnectionState</span>
 </td>
 <td class="function_name">
 <a class="link" href="NMVpnConnection.html#nm-vpn-connection-get-vpn-state" title="nm_vpn_connection_get_vpn_state ()">nm_vpn_connection_get_vpn_state</a> <span class="c_punctuation">()</span>
@@ -76,7 +76,7 @@
 <td class="property_flags">Read</td>
 </tr>
 <tr>
-<td class="property_type"><a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState"><span class="type">NMVpnConnectionState</span></a></td>
+<td class="property_type"><span class="type">NMVpnConnectionState</span></td>
 <td class="property_name"><a class="link" href="NMVpnConnection.html#NMVpnConnection--vpn-state" title="The “vpn-state” property">vpn-state</a></td>
 <td class="property_flags">Read</td>
 </tr>
@@ -136,7 +136,7 @@
 <a name="NMVpnConnection.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
 <a name="nm-vpn-connection-get-vpn-state"></a><h3>nm_vpn_connection_get_vpn_state ()</h3>
-<pre class="programlisting"><a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState"><span class="returnvalue">NMVpnConnectionState</span></a>
+<pre class="programlisting"><span class="returnvalue">NMVpnConnectionState</span>
 nm_vpn_connection_get_vpn_state (<em class="parameter"><code><a class="link" href="NMVpnConnection.html" title="NMVpnConnection"><span class="type">NMVpnConnection</span></a> *vpn</code></em>);</pre>
 <p>Gets the current <a class="link" href="NMVpnConnection.html" title="NMVpnConnection"><span class="type">NMVpnConnection</span></a> state.</p>
 <div class="refsect3">
@@ -219,7 +219,7 @@ string used by the connection, and must not be modified.</p>
 <hr>
 <div class="refsect2">
 <a name="NMVpnConnection--vpn-state"></a><h3>The <code class="literal">“vpn-state”</code> property</h3>
-<pre class="programlisting">  “vpn-state”                <a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState"><span class="type">NMVpnConnectionState</span></a></pre>
+<pre class="programlisting">  “vpn-state”                <span class="type">NMVpnConnectionState</span></pre>
 <p>The VPN state of the active VPN connection.</p>
 <p>Owner: NMVpnConnection</p>
 <p>Flags: Read</p>
diff --git a/docs/libnm/html/NMVpnPluginOld.html b/docs/libnm/html/NMVpnPluginOld.html
index c66e3496..ed72c07f 100644
--- a/docs/libnm/html/NMVpnPluginOld.html
+++ b/docs/libnm/html/NMVpnPluginOld.html
@@ -53,7 +53,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="returnvalue">NMVpnServiceState</span></a>
+<span class="returnvalue">NMVpnServiceState</span>
 </td>
 <td class="function_name">
 <a class="link" href="NMVpnPluginOld.html#nm-vpn-plugin-old-get-state" title="nm_vpn_plugin_old_get_state ()">nm_vpn_plugin_old_get_state</a> <span class="c_punctuation">()</span>
@@ -142,7 +142,7 @@
 <td class="property_flags">Read / Write / Construct Only</td>
 </tr>
 <tr>
-<td class="property_type"><a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a></td>
+<td class="property_type"><span class="type">NMVpnServiceState</span></td>
 <td class="property_name"><a class="link" href="NMVpnPluginOld.html#NMVpnPluginOld--state" title="The “state” property">state</a></td>
 <td class="property_flags">Read / Write</td>
 </tr>
@@ -258,7 +258,7 @@ nm_vpn_plugin_old_get_connection (<em class="parameter"><code><a class="link" hr
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-plugin-old-get-state"></a><h3>nm_vpn_plugin_old_get_state ()</h3>
-<pre class="programlisting"><a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="returnvalue">NMVpnServiceState</span></a>
+<pre class="programlisting"><span class="returnvalue">NMVpnServiceState</span>
 nm_vpn_plugin_old_get_state (<em class="parameter"><code><a class="link" href="NMVpnPluginOld.html" title="NMVpnPluginOld"><span class="type">NMVpnPluginOld</span></a> *plugin</code></em>);</pre>
 <div class="warning">
 <p><code class="literal">nm_vpn_plugin_old_get_state</code> has been deprecated since version 1.2 and should not be used in newly-written code.</p>
@@ -270,7 +270,7 @@ nm_vpn_plugin_old_get_state (<em class="parameter"><code><a class="link" href="N
 <a name="nm-vpn-plugin-old-set-state"></a><h3>nm_vpn_plugin_old_set_state ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_old_set_state (<em class="parameter"><code><a class="link" href="NMVpnPluginOld.html" title="NMVpnPluginOld"><span class="type">NMVpnPluginOld</span></a> *plugin</code></em>,
-                             <em class="parameter"><code><a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a> state</code></em>);</pre>
+                             <em class="parameter"><code><span class="type">NMVpnServiceState</span> state</code></em>);</pre>
 <div class="warning">
 <p><code class="literal">nm_vpn_plugin_old_set_state</code> has been deprecated since version 1.2 and should not be used in newly-written code.</p>
 <p>Replaced by NMVpnServicePlugin.</p>
@@ -336,7 +336,7 @@ nm_vpn_plugin_old_set_login_banner (<em class="parameter"><code><a class="link"
 <a name="nm-vpn-plugin-old-failure"></a><h3>nm_vpn_plugin_old_failure ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_old_failure (<em class="parameter"><code><a class="link" href="NMVpnPluginOld.html" title="NMVpnPluginOld"><span class="type">NMVpnPluginOld</span></a> *plugin</code></em>,
-                           <em class="parameter"><code><a href="libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure"><span class="type">NMVpnPluginFailure</span></a> reason</code></em>);</pre>
+                           <em class="parameter"><code><span class="type">NMVpnPluginFailure</span> reason</code></em>);</pre>
 <div class="warning">
 <p><code class="literal">nm_vpn_plugin_old_failure</code> has been deprecated since version 1.2 and should not be used in newly-written code.</p>
 <p>Replaced by NMVpnServicePlugin.</p>
@@ -497,7 +497,7 @@ to flags, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macro
 <hr>
 <div class="refsect2">
 <a name="NMVpnPluginOld--state"></a><h3>The <code class="literal">“state”</code> property</h3>
-<pre class="programlisting">  “state”                    <a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a></pre>
+<pre class="programlisting">  “state”                    <span class="type">NMVpnServiceState</span></pre>
 <p>The state of the plugin.</p>
 <div class="warning">
 <p><code class="literal">NMVpnPluginOld:state</code> has been deprecated since version 1.2 and should not be used in newly-written code.</p>
diff --git a/docs/libnm/html/NMVpnServicePlugin.html b/docs/libnm/html/NMVpnServicePlugin.html
index fea3574a..e53bfaa2 100644
--- a/docs/libnm/html/NMVpnServicePlugin.html
+++ b/docs/libnm/html/NMVpnServicePlugin.html
@@ -150,7 +150,7 @@
 <td class="property_flags">Read / Write / Construct Only</td>
 </tr>
 <tr>
-<td class="property_type"><a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a></td>
+<td class="property_type"><span class="type">NMVpnServiceState</span></td>
 <td class="property_name"><a class="link" href="NMVpnServicePlugin.html#NMVpnServicePlugin--state" title="The “state” property">state</a></td>
 <td class="property_flags">Read / Write</td>
 </tr>
@@ -325,7 +325,7 @@ nm_vpn_service_plugin_set_login_banner
 <a name="nm-vpn-service-plugin-failure"></a><h3>nm_vpn_service_plugin_failure ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_service_plugin_failure (<em class="parameter"><code><a class="link" href="NMVpnServicePlugin.html" title="NMVpnServicePlugin"><span class="type">NMVpnServicePlugin</span></a> *plugin</code></em>,
-                               <em class="parameter"><code><a href="libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure"><span class="type">NMVpnPluginFailure</span></a> reason</code></em>);</pre>
+                               <em class="parameter"><code><span class="type">NMVpnPluginFailure</span> reason</code></em>);</pre>
 <p class="since">Since: 1.2</p>
 </div>
 <hr>
@@ -522,7 +522,7 @@ to flags, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macro
 <hr>
 <div class="refsect2">
 <a name="NMVpnServicePlugin--state"></a><h3>The <code class="literal">“state”</code> property</h3>
-<pre class="programlisting">  “state”                    <a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a></pre>
+<pre class="programlisting">  “state”                    <span class="type">NMVpnServiceState</span></pre>
 <p>The state of the plugin.</p>
 <p>Owner: NMVpnServicePlugin</p>
 <p>Flags: Read / Write</p>
diff --git a/docs/libnm/html/NMWifiP2PPeer.html b/docs/libnm/html/NMWifiP2PPeer.html
index 074d90d8..5684a60b 100644
--- a/docs/libnm/html/NMWifiP2PPeer.html
+++ b/docs/libnm/html/NMWifiP2PPeer.html
@@ -572,7 +572,7 @@ with this function.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p>an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> to
+<td class="parameter_description"><p>an array of <span class="type">NMConnections</span> to
 filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
@@ -582,7 +582,7 @@ filter. </p></td>
 <div class="refsect3">
 <a name="nm-wifi-p2p-peer-filter-connections.returns"></a><h4>Returns</h4>
 <p>an array of
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>peer</code></em>
+<span class="type">NMConnections</span> that could be activated with the given <em class="parameter"><code>peer</code></em>
 . The array should
 be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-unref"><code class="function">g_ptr_array_unref()</code></a> when it is no longer required. </p>
 <p><span class="annotation">[<acronym title="The caller owns the data container, but not the data inside it."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html
index 0c103ec7..c6ffe501 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -269,7 +269,7 @@ connections will match the <em class="parameter"><code>nsp</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p>an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> to
+<td class="parameter_description"><p>an array of <span class="type">NMConnections</span> to
 filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
@@ -279,7 +279,7 @@ filter. </p></td>
 <div class="refsect3">
 <a name="nm-wimax-nsp-filter-connections.returns"></a><h4>Returns</h4>
 <p>an array of
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>nsp</code></em>
+<span class="type">NMConnections</span> that could be activated with the given <em class="parameter"><code>nsp</code></em>
 .  The array should
 be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-unref"><code class="function">g_ptr_array_unref()</code></a> when it is no longer required. </p>
 <p><span class="annotation">[<acronym title="The caller owns the data, and is responsible for free it."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index 33cd7161..a07306d0 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -425,19 +425,19 @@ NMClientNotifyEventWithPtrCb, user_function in <a class="link" href="NMIPConfig.
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct">NMConnection</a>, struct in NMSettingOvs
+NMConnection, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-changed">NMConnection::changed</a>, object signal in NMSettingOvs
+NMConnection::changed, object signal in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-secrets-cleared">NMConnection::secrets-cleared</a>, object signal in NMSettingOvs
+NMConnection::secrets-cleared, object signal in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-secrets-updated">NMConnection::secrets-updated</a>, object signal in NMSettingOvs
+NMConnection::secrets-updated, object signal in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1693,7 +1693,7 @@ _NMObjectClassFieldInfo, struct in <a class="link" href="NMIPConfig.html" title=
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSetting-struct">NMSetting</a>, struct in NMSettingOvs
+NMSetting, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1709,11 +1709,11 @@ NMSetting8021x, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--altsubject-matches">NMSetting8021x:altsubject-matches</a>, object property in NMSettingOvs
+NMSetting8021x:altsubject-matches, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--anonymous-identity">NMSetting8021x:anonymous-identity</a>, object property in NMSettingOvs
+NMSetting8021x:anonymous-identity, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1721,7 +1721,7 @@ NMSetting8021x:auth-timeout, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--ca-cert">NMSetting8021x:ca-cert</a>, object property in NMSettingOvs
+NMSetting8021x:ca-cert, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1733,11 +1733,11 @@ NMSetting8021x:ca-cert-password-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--ca-path">NMSetting8021x:ca-path</a>, object property in NMSettingOvs
+NMSetting8021x:ca-path, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--client-cert">NMSetting8021x:client-cert</a>, object property in NMSettingOvs
+NMSetting8021x:client-cert, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1757,11 +1757,11 @@ NMSetting8021x:domain-suffix-match, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--eap">NMSetting8021x:eap</a>, object property in NMSettingOvs
+NMSetting8021x:eap, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--identity">NMSetting8021x:identity</a>, object property in NMSettingOvs
+NMSetting8021x:identity, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1769,23 +1769,23 @@ NMSetting8021x:optional, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--pac-file">NMSetting8021x:pac-file</a>, object property in NMSettingOvs
+NMSetting8021x:pac-file, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--password">NMSetting8021x:password</a>, object property in NMSettingOvs
+NMSetting8021x:password, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--password-flags">NMSetting8021x:password-flags</a>, object property in NMSettingOvs
+NMSetting8021x:password-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--password-raw">NMSetting8021x:password-raw</a>, object property in NMSettingOvs
+NMSetting8021x:password-raw, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--password-raw-flags">NMSetting8021x:password-raw-flags</a>, object property in NMSettingOvs
+NMSetting8021x:password-raw-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1793,31 +1793,31 @@ NMSetting8021x:phase1-auth-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning">NMSetting8021x:phase1-fast-provisioning</a>, object property in NMSettingOvs
+NMSetting8021x:phase1-fast-provisioning, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase1-peaplabel">NMSetting8021x:phase1-peaplabel</a>, object property in NMSettingOvs
+NMSetting8021x:phase1-peaplabel, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase1-peapver">NMSetting8021x:phase1-peapver</a>, object property in NMSettingOvs
+NMSetting8021x:phase1-peapver, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-altsubject-matches">NMSetting8021x:phase2-altsubject-matches</a>, object property in NMSettingOvs
+NMSetting8021x:phase2-altsubject-matches, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-auth">NMSetting8021x:phase2-auth</a>, object property in NMSettingOvs
+NMSetting8021x:phase2-auth, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-autheap">NMSetting8021x:phase2-autheap</a>, object property in NMSettingOvs
+NMSetting8021x:phase2-autheap, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-ca-cert">NMSetting8021x:phase2-ca-cert</a>, object property in NMSettingOvs
+NMSetting8021x:phase2-ca-cert, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1829,11 +1829,11 @@ NMSetting8021x:phase2-ca-cert-password-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-ca-path">NMSetting8021x:phase2-ca-path</a>, object property in NMSettingOvs
+NMSetting8021x:phase2-ca-path, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-client-cert">NMSetting8021x:phase2-client-cert</a>, object property in NMSettingOvs
+NMSetting8021x:phase2-client-cert, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1853,47 +1853,47 @@ NMSetting8021x:phase2-domain-suffix-match, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key">NMSetting8021x:phase2-private-key</a>, object property in NMSettingOvs
+NMSetting8021x:phase2-private-key, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key-password">NMSetting8021x:phase2-private-key-password</a>, object property in NMSettingOvs
+NMSetting8021x:phase2-private-key-password, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key-password-flags">NMSetting8021x:phase2-private-key-password-flags</a>, object property in NMSettingOvs
+NMSetting8021x:phase2-private-key-password-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-subject-match">NMSetting8021x:phase2-subject-match</a>, object property in NMSettingOvs
+NMSetting8021x:phase2-subject-match, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--pin">NMSetting8021x:pin</a>, object property in NMSettingOvs
+NMSetting8021x:pin, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--pin-flags">NMSetting8021x:pin-flags</a>, object property in NMSettingOvs
+NMSetting8021x:pin-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--private-key">NMSetting8021x:private-key</a>, object property in NMSettingOvs
+NMSetting8021x:private-key, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--private-key-password">NMSetting8021x:private-key-password</a>, object property in NMSettingOvs
+NMSetting8021x:private-key-password, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--private-key-password-flags">NMSetting8021x:private-key-password-flags</a>, object property in NMSettingOvs
+NMSetting8021x:private-key-password-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--subject-match">NMSetting8021x:subject-match</a>, object property in NMSettingOvs
+NMSetting8021x:subject-match, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting8021x.html#NMSetting8021x--system-ca-certs">NMSetting8021x:system-ca-certs</a>, object property in NMSettingOvs
+NMSetting8021x:system-ca-certs, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1909,7 +1909,7 @@ NMSetting8021x:phase2-domain-suffix-match, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSetting--name">NMSetting:name</a>, object property in NMSettingOvs
+NMSetting:name, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1917,31 +1917,31 @@ NMSettingAdsl, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--encapsulation">NMSettingAdsl:encapsulation</a>, object property in NMSettingOvs
+NMSettingAdsl:encapsulation, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--password">NMSettingAdsl:password</a>, object property in NMSettingOvs
+NMSettingAdsl:password, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--password-flags">NMSettingAdsl:password-flags</a>, object property in NMSettingOvs
+NMSettingAdsl:password-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--protocol">NMSettingAdsl:protocol</a>, object property in NMSettingOvs
+NMSettingAdsl:protocol, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--username">NMSettingAdsl:username</a>, object property in NMSettingOvs
+NMSettingAdsl:username, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--vci">NMSettingAdsl:vci</a>, object property in NMSettingOvs
+NMSettingAdsl:vci, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingAdsl.html#NMSettingAdsl--vpi">NMSettingAdsl:vpi</a>, object property in NMSettingOvs
+NMSettingAdsl:vpi, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1949,11 +1949,11 @@ NMSettingBluetooth, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBluetooth.html#NMSettingBluetooth--bdaddr">NMSettingBluetooth:bdaddr</a>, object property in NMSettingOvs
+NMSettingBluetooth:bdaddr, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBluetooth.html#NMSettingBluetooth--type">NMSettingBluetooth:type</a>, object property in NMSettingOvs
+NMSettingBluetooth:type, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1961,7 +1961,7 @@ NMSettingBond, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBond.html#NMSettingBond--options">NMSettingBond:options</a>, object property in NMSettingOvs
+NMSettingBond:options, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1977,11 +1977,11 @@ NMSettingBridge, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--ageing-time">NMSettingBridge:ageing-time</a>, object property in NMSettingOvs
+NMSettingBridge:ageing-time, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--forward-delay">NMSettingBridge:forward-delay</a>, object property in NMSettingOvs
+NMSettingBridge:forward-delay, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1993,15 +1993,15 @@ NMSettingBridge:group-forward-mask, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--hello-time">NMSettingBridge:hello-time</a>, object property in NMSettingOvs
+NMSettingBridge:hello-time, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--mac-address">NMSettingBridge:mac-address</a>, object property in NMSettingOvs
+NMSettingBridge:mac-address, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--max-age">NMSettingBridge:max-age</a>, object property in NMSettingOvs
+NMSettingBridge:max-age, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2057,11 +2057,11 @@ NMSettingBridge:multicast-startup-query-interval, object property in NMSettingOv
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--priority">NMSettingBridge:priority</a>, object property in NMSettingOvs
+NMSettingBridge:priority, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridge.html#NMSettingBridge--stp">NMSettingBridge:stp</a>, object property in NMSettingOvs
+NMSettingBridge:stp, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2089,15 +2089,15 @@ NMSettingBridgePort, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode">NMSettingBridgePort:hairpin-mode</a>, object property in NMSettingOvs
+NMSettingBridgePort:hairpin-mode, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridgePort.html#NMSettingBridgePort--path-cost">NMSettingBridgePort:path-cost</a>, object property in NMSettingOvs
+NMSettingBridgePort:path-cost, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingBridgePort.html#NMSettingBridgePort--priority">NMSettingBridgePort:priority</a>, object property in NMSettingOvs
+NMSettingBridgePort:priority, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2113,19 +2113,19 @@ NMSettingCdma:mtu, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingCdma.html#NMSettingCdma--number">NMSettingCdma:number</a>, object property in NMSettingOvs
+NMSettingCdma:number, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingCdma.html#NMSettingCdma--password">NMSettingCdma:password</a>, object property in NMSettingOvs
+NMSettingCdma:password, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingCdma.html#NMSettingCdma--password-flags">NMSettingCdma:password-flags</a>, object property in NMSettingOvs
+NMSettingCdma:password-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingCdma.html#NMSettingCdma--username">NMSettingCdma:username</a>, object property in NMSettingOvs
+NMSettingCdma:username, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2137,7 +2137,7 @@ NMSettingCdma:mtu, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection-struct">NMSettingConnection</a>, struct in NMSettingOvs
+NMSettingConnection, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2145,7 +2145,7 @@ NMSettingConnection:auth-retries, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--autoconnect">NMSettingConnection:autoconnect</a>, object property in NMSettingOvs
+NMSettingConnection:autoconnect, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2165,15 +2165,15 @@ NMSettingConnection:dns-over-tls, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--gateway-ping-timeout">NMSettingConnection:gateway-ping-timeout</a>, object property in NMSettingOvs
+NMSettingConnection:gateway-ping-timeout, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--id">NMSettingConnection:id</a>, object property in NMSettingOvs
+NMSettingConnection:id, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--interface-name">NMSettingConnection:interface-name</a>, object property in NMSettingOvs
+NMSettingConnection:interface-name, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2185,7 +2185,7 @@ NMSettingConnection:llmnr, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--master">NMSettingConnection:master</a>, object property in NMSettingOvs
+NMSettingConnection:master, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2209,19 +2209,19 @@ NMSettingConnection:multi-connect, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--permissions">NMSettingConnection:permissions</a>, object property in NMSettingOvs
+NMSettingConnection:permissions, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--read-only">NMSettingConnection:read-only</a>, object property in NMSettingOvs
+NMSettingConnection:read-only, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--secondaries">NMSettingConnection:secondaries</a>, object property in NMSettingOvs
+NMSettingConnection:secondaries, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--slave-type">NMSettingConnection:slave-type</a>, object property in NMSettingOvs
+NMSettingConnection:slave-type, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2229,15 +2229,15 @@ NMSettingConnection:stable-id, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--timestamp">NMSettingConnection:timestamp</a>, object property in NMSettingOvs
+NMSettingConnection:timestamp, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--type">NMSettingConnection:type</a>, object property in NMSettingOvs
+NMSettingConnection:type, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--uuid">NMSettingConnection:uuid</a>, object property in NMSettingOvs
+NMSettingConnection:uuid, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2249,7 +2249,7 @@ NMSettingConnection:wait-device-timeout, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--zone">NMSettingConnection:zone</a>, object property in NMSettingOvs
+NMSettingConnection:zone, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2277,63 +2277,63 @@ NMSettingDcb, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-fcoe-flags">NMSettingDcb:app-fcoe-flags</a>, object property in NMSettingOvs
+NMSettingDcb:app-fcoe-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-fcoe-mode">NMSettingDcb:app-fcoe-mode</a>, object property in NMSettingOvs
+NMSettingDcb:app-fcoe-mode, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-fcoe-priority">NMSettingDcb:app-fcoe-priority</a>, object property in NMSettingOvs
+NMSettingDcb:app-fcoe-priority, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-fip-flags">NMSettingDcb:app-fip-flags</a>, object property in NMSettingOvs
+NMSettingDcb:app-fip-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-fip-priority">NMSettingDcb:app-fip-priority</a>, object property in NMSettingOvs
+NMSettingDcb:app-fip-priority, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-iscsi-flags">NMSettingDcb:app-iscsi-flags</a>, object property in NMSettingOvs
+NMSettingDcb:app-iscsi-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--app-iscsi-priority">NMSettingDcb:app-iscsi-priority</a>, object property in NMSettingOvs
+NMSettingDcb:app-iscsi-priority, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-bandwidth">NMSettingDcb:priority-bandwidth</a>, object property in NMSettingOvs
+NMSettingDcb:priority-bandwidth, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-flow-control">NMSettingDcb:priority-flow-control</a>, object property in NMSettingOvs
+NMSettingDcb:priority-flow-control, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-flow-control-flags">NMSettingDcb:priority-flow-control-flags</a>, object property in NMSettingOvs
+NMSettingDcb:priority-flow-control-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-group-bandwidth">NMSettingDcb:priority-group-bandwidth</a>, object property in NMSettingOvs
+NMSettingDcb:priority-group-bandwidth, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-group-flags">NMSettingDcb:priority-group-flags</a>, object property in NMSettingOvs
+NMSettingDcb:priority-group-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-group-id">NMSettingDcb:priority-group-id</a>, object property in NMSettingOvs
+NMSettingDcb:priority-group-id, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-strict-bandwidth">NMSettingDcb:priority-strict-bandwidth</a>, object property in NMSettingOvs
+NMSettingDcb:priority-strict-bandwidth, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingDcb.html#NMSettingDcb--priority-traffic-class">NMSettingDcb:priority-traffic-class</a>, object property in NMSettingOvs
+NMSettingDcb:priority-traffic-class, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2361,7 +2361,7 @@ NMSettingGsm, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--apn">NMSettingGsm:apn</a>, object property in NMSettingOvs
+NMSettingGsm:apn, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2373,7 +2373,7 @@ NMSettingGsm:device-id, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--home-only">NMSettingGsm:home-only</a>, object property in NMSettingOvs
+NMSettingGsm:home-only, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2381,27 +2381,27 @@ NMSettingGsm:mtu, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--network-id">NMSettingGsm:network-id</a>, object property in NMSettingOvs
+NMSettingGsm:network-id, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--number">NMSettingGsm:number</a>, object property in NMSettingOvs
+NMSettingGsm:number, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--password">NMSettingGsm:password</a>, object property in NMSettingOvs
+NMSettingGsm:password, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--password-flags">NMSettingGsm:password-flags</a>, object property in NMSettingOvs
+NMSettingGsm:password-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--pin">NMSettingGsm:pin</a>, object property in NMSettingOvs
+NMSettingGsm:pin, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--pin-flags">NMSettingGsm:pin-flags</a>, object property in NMSettingOvs
+NMSettingGsm:pin-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2413,7 +2413,7 @@ NMSettingGsm:sim-operator-id, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingGsm.html#NMSettingGsm--username">NMSettingGsm:username</a>, object property in NMSettingOvs
+NMSettingGsm:username, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2441,23 +2441,23 @@ NMSettingInfiniband, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingInfiniband.html#NMSettingInfiniband--mac-address">NMSettingInfiniband:mac-address</a>, object property in NMSettingOvs
+NMSettingInfiniband:mac-address, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingInfiniband.html#NMSettingInfiniband--mtu">NMSettingInfiniband:mtu</a>, object property in NMSettingOvs
+NMSettingInfiniband:mtu, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingInfiniband.html#NMSettingInfiniband--p-key">NMSettingInfiniband:p-key</a>, object property in NMSettingOvs
+NMSettingInfiniband:p-key, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingInfiniband.html#NMSettingInfiniband--parent">NMSettingInfiniband:parent</a>, object property in NMSettingOvs
+NMSettingInfiniband:parent, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingInfiniband.html#NMSettingInfiniband--transport-mode">NMSettingInfiniband:transport-mode</a>, object property in NMSettingOvs
+NMSettingInfiniband:transport-mode, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2465,7 +2465,7 @@ NMSettingIP4Config, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#NMSettingIP4Config--dhcp-client-id">NMSettingIP4Config:dhcp-client-id</a>, object property in NMSettingOvs
+NMSettingIP4Config:dhcp-client-id, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2497,7 +2497,7 @@ NMSettingIP6Config:dhcp-duid, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP6Config.html#NMSettingIP6Config--ip6-privacy">NMSettingIP6Config:ip6-privacy</a>, object property in NMSettingOvs
+NMSettingIP6Config:ip6-privacy, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2769,15 +2769,15 @@ NMSettingOlpcMesh, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh--channel">NMSettingOlpcMesh:channel</a>, object property in NMSettingOvs
+NMSettingOlpcMesh:channel, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh--dhcp-anycast-address">NMSettingOlpcMesh:dhcp-anycast-address</a>, object property in NMSettingOvs
+NMSettingOlpcMesh:dhcp-anycast-address, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh--ssid">NMSettingOlpcMesh:ssid</a>, object property in NMSettingOvs
+NMSettingOlpcMesh:ssid, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3009,23 +3009,23 @@ NMSettingSerial, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingSerial.html#NMSettingSerial--baud">NMSettingSerial:baud</a>, object property in NMSettingOvs
+NMSettingSerial:baud, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingSerial.html#NMSettingSerial--bits">NMSettingSerial:bits</a>, object property in NMSettingOvs
+NMSettingSerial:bits, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingSerial.html#NMSettingSerial--parity">NMSettingSerial:parity</a>, object property in NMSettingOvs
+NMSettingSerial:parity, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingSerial.html#NMSettingSerial--send-delay">NMSettingSerial:send-delay</a>, object property in NMSettingOvs
+NMSettingSerial:send-delay, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingSerial.html#NMSettingSerial--stopbits">NMSettingSerial:stopbits</a>, object property in NMSettingOvs
+NMSettingSerial:stopbits, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3073,7 +3073,7 @@ NMSettingTeam, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingTeam.html#NMSettingTeam--config">NMSettingTeam:config</a>, object property in NMSettingOvs
+NMSettingTeam:config, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3141,7 +3141,7 @@ NMSettingTeamPort, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingTeamPort.html#NMSettingTeamPort--config">NMSettingTeamPort:config</a>, object property in NMSettingOvs
+NMSettingTeamPort:config, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3225,23 +3225,23 @@ NMSettingVlan, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--egress-priority-map">NMSettingVlan:egress-priority-map</a>, object property in NMSettingOvs
+NMSettingVlan:egress-priority-map, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--flags">NMSettingVlan:flags</a>, object property in NMSettingOvs
+NMSettingVlan:flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--id">NMSettingVlan:id</a>, object property in NMSettingOvs
+NMSettingVlan:id, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--ingress-priority-map">NMSettingVlan:ingress-priority-map</a>, object property in NMSettingOvs
+NMSettingVlan:ingress-priority-map, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingVlan.html#NMSettingVlan--parent">NMSettingVlan:parent</a>, object property in NMSettingOvs
+NMSettingVlan:parent, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3369,11 +3369,11 @@ NMSettingWimax, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWimax.html#NMSettingWimax--mac-address">NMSettingWimax:mac-address</a>, object property in NMSettingOvs
+NMSettingWimax:mac-address, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWimax.html#NMSettingWimax--network-name">NMSettingWimax:network-name</a>, object property in NMSettingOvs
+NMSettingWimax:network-name, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3385,15 +3385,15 @@ NMSettingWired:accept-all-mac-addresses, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--auto-negotiate">NMSettingWired:auto-negotiate</a>, object property in NMSettingOvs
+NMSettingWired:auto-negotiate, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--cloned-mac-address">NMSettingWired:cloned-mac-address</a>, object property in NMSettingOvs
+NMSettingWired:cloned-mac-address, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--duplex">NMSettingWired:duplex</a>, object property in NMSettingOvs
+NMSettingWired:duplex, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3401,35 +3401,35 @@ NMSettingWired:generate-mac-address-mask, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--mac-address">NMSettingWired:mac-address</a>, object property in NMSettingOvs
+NMSettingWired:mac-address, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--mac-address-blacklist">NMSettingWired:mac-address-blacklist</a>, object property in NMSettingOvs
+NMSettingWired:mac-address-blacklist, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--mtu">NMSettingWired:mtu</a>, object property in NMSettingOvs
+NMSettingWired:mtu, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--port">NMSettingWired:port</a>, object property in NMSettingOvs
+NMSettingWired:port, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--s390-nettype">NMSettingWired:s390-nettype</a>, object property in NMSettingOvs
+NMSettingWired:s390-nettype, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--s390-options">NMSettingWired:s390-options</a>, object property in NMSettingOvs
+NMSettingWired:s390-options, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--s390-subchannels">NMSettingWired:s390-subchannels</a>, object property in NMSettingOvs
+NMSettingWired:s390-subchannels, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NMSettingWired--speed">NMSettingWired:speed</a>, object property in NMSettingOvs
+NMSettingWired:speed, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3489,19 +3489,19 @@ NMSettingWireless:ap-isolation, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--band">NMSettingWireless:band</a>, object property in NMSettingOvs
+NMSettingWireless:band, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--bssid">NMSettingWireless:bssid</a>, object property in NMSettingOvs
+NMSettingWireless:bssid, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--channel">NMSettingWireless:channel</a>, object property in NMSettingOvs
+NMSettingWireless:channel, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--cloned-mac-address">NMSettingWireless:cloned-mac-address</a>, object property in NMSettingOvs
+NMSettingWireless:cloned-mac-address, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3509,15 +3509,15 @@ NMSettingWireless:generate-mac-address-mask, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--hidden">NMSettingWireless:hidden</a>, object property in NMSettingOvs
+NMSettingWireless:hidden, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--mac-address">NMSettingWireless:mac-address</a>, object property in NMSettingOvs
+NMSettingWireless:mac-address, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--mac-address-blacklist">NMSettingWireless:mac-address-blacklist</a>, object property in NMSettingOvs
+NMSettingWireless:mac-address-blacklist, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3525,31 +3525,31 @@ NMSettingWireless:mac-address-randomization, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--mode">NMSettingWireless:mode</a>, object property in NMSettingOvs
+NMSettingWireless:mode, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--mtu">NMSettingWireless:mtu</a>, object property in NMSettingOvs
+NMSettingWireless:mtu, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--powersave">NMSettingWireless:powersave</a>, object property in NMSettingOvs
+NMSettingWireless:powersave, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--rate">NMSettingWireless:rate</a>, object property in NMSettingOvs
+NMSettingWireless:rate, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--seen-bssids">NMSettingWireless:seen-bssids</a>, object property in NMSettingOvs
+NMSettingWireless:seen-bssids, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--ssid">NMSettingWireless:ssid</a>, object property in NMSettingOvs
+NMSettingWireless:ssid, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWireless.html#NMSettingWireless--tx-power">NMSettingWireless:tx-power</a>, object property in NMSettingOvs
+NMSettingWireless:tx-power, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3565,7 +3565,7 @@ NMSettingWirelessSecurity, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg">NMSettingWirelessSecurity:auth-alg</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:auth-alg, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3573,27 +3573,27 @@ NMSettingWirelessSecurity:fils, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--group">NMSettingWirelessSecurity:group</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:group, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt">NMSettingWirelessSecurity:key-mgmt</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:key-mgmt, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password">NMSettingWirelessSecurity:leap-password</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:leap-password, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password-flags">NMSettingWirelessSecurity:leap-password-flags</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:leap-password-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username">NMSettingWirelessSecurity:leap-username</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:leap-username, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--pairwise">NMSettingWirelessSecurity:pairwise</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:pairwise, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3601,43 +3601,43 @@ NMSettingWirelessSecurity:pmf, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--proto">NMSettingWirelessSecurity:proto</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:proto, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk">NMSettingWirelessSecurity:psk</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:psk, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk-flags">NMSettingWirelessSecurity:psk-flags</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:psk-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-flags">NMSettingWirelessSecurity:wep-key-flags</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:wep-key-flags, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type">NMSettingWirelessSecurity:wep-key-type</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:wep-key-type, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key0">NMSettingWirelessSecurity:wep-key0</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:wep-key0, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key1">NMSettingWirelessSecurity:wep-key1</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:wep-key1, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key2">NMSettingWirelessSecurity:wep-key2</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:wep-key2, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key3">NMSettingWirelessSecurity:wep-key3</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:wep-key3, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-tx-keyidx">NMSettingWirelessSecurity:wep-tx-keyidx</a>, object property in NMSettingOvs
+NMSettingWirelessSecurity:wep-tx-keyidx, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -3765,11 +3765,11 @@ NMUtilsPredicateStr, user_function in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState">NMVpnConnectionState</a>, enum in nm-vpn-dbus-interface
+NMVpnConnectionState, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>, enum in nm-vpn-dbus-interface
+NMVpnConnectionStateReason, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -3821,7 +3821,7 @@ NMUtilsPredicateStr, user_function in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure">NMVpnPluginFailure</a>, enum in nm-vpn-dbus-interface
+NMVpnPluginFailure, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -3933,7 +3933,7 @@ NMUtilsPredicateStr, user_function in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState">NMVpnServiceState</a>, enum in nm-vpn-dbus-interface
+NMVpnServiceState, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -4237,7 +4237,7 @@ NMUtilsPredicateStr, user_function in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-API-VERSION:CAPS">NM_API_VERSION</a>, macro in nm-version-macros
+NM_API_VERSION, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
@@ -4429,7 +4429,7 @@ nm_auto_unref_nml_dbusobj, macro in <a class="link" href="NMIPConfig.html" title
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-CHECK-VERSION:CAPS">NM_CHECK_VERSION</a>, macro in nm-version-macros
+NM_CHECK_VERSION, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
@@ -5285,7 +5285,7 @@ NM_CLIENT_NOTIFY_EVENT_PRIO_GPROP, macro in <a class="link" href="NMIPConfig.htm
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-conn-utils.html#nm-conn-wireguard-import">nm_conn_wireguard_import</a>, function in nm-conn-utils
+nm_conn_wireguard_import, function in nm-conn-utils
 </dt>
 <dd></dd>
 <dt>
@@ -5489,11 +5489,11 @@ nm_context_busy_watcher_quark, function in <a class="link" href="NMIPConfig.html
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-INTERFACE-VPN:CAPS">NM_DBUS_INTERFACE_VPN</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_INTERFACE_VPN, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-INTERFACE-VPN-CONNECTION:CAPS">NM_DBUS_INTERFACE_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_INTERFACE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -5505,15 +5505,15 @@ nm_context_busy_watcher_quark, function in <a class="link" href="NMIPConfig.html
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-INVALID-VPN-CONNECTION:CAPS">NM_DBUS_INVALID_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_INVALID_VPN_CONNECTION, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-NO-ACTIVE-VPN-CONNECTION:CAPS">NM_DBUS_NO_ACTIVE_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_NO_ACTIVE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-NO-VPN-CONNECTIONS:CAPS">NM_DBUS_NO_VPN_CONNECTIONS</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_NO_VPN_CONNECTIONS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -5549,11 +5549,11 @@ nm_dbus_path_not_empty, function in <a class="link" href="NMIPConfig.html" title
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-PATH-VPN:CAPS">NM_DBUS_PATH_VPN</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_PATH_VPN, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-PATH-VPN-CONNECTION:CAPS">NM_DBUS_PATH_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_PATH_VPN_CONNECTION, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -5569,67 +5569,67 @@ nm_dbus_path_not_empty, function in <a class="link" href="NMIPConfig.html" title
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-ALREADY-STARTED:CAPS">NM_DBUS_VPN_ALREADY_STARTED</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_ALREADY_STARTED, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-ALREADY-STOPPED:CAPS">NM_DBUS_VPN_ALREADY_STOPPED</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_ALREADY_STOPPED, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-BAD-ARGUMENTS:CAPS">NM_DBUS_VPN_BAD_ARGUMENTS</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_BAD_ARGUMENTS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-ERROR-PREFIX:CAPS">NM_DBUS_VPN_ERROR_PREFIX</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_ERROR_PREFIX, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-INTERACTIVE-NOT-SUPPORTED:CAPS">NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-CONNECT-FAILED:CAPS">NM_DBUS_VPN_SIGNAL_CONNECT_FAILED</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_SIGNAL_CONNECT_FAILED, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS">NM_DBUS_VPN_SIGNAL_IP4_CONFIG</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_SIGNAL_IP4_CONFIG, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-IP-CONFIG-BAD:CAPS">NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-LAUNCH-FAILED:CAPS">NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-LOGIN-BANNER:CAPS">NM_DBUS_VPN_SIGNAL_LOGIN_BANNER</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_SIGNAL_LOGIN_BANNER, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-LOGIN-FAILED:CAPS">NM_DBUS_VPN_SIGNAL_LOGIN_FAILED</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_SIGNAL_LOGIN_FAILED, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS">NM_DBUS_VPN_SIGNAL_STATE_CHANGE</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_SIGNAL_STATE_CHANGE, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-VPN-CONFIG-BAD:CAPS">NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-STARTING-IN-PROGRESS:CAPS">NM_DBUS_VPN_STARTING_IN_PROGRESS</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_STARTING_IN_PROGRESS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-STOPPING-IN-PROGRESS:CAPS">NM_DBUS_VPN_STOPPING_IN_PROGRESS</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_STOPPING_IN_PROGRESS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-WRONG-STATE:CAPS">NM_DBUS_VPN_WRONG_STATE</a>, macro in nm-vpn-dbus-interface
+NM_DBUS_VPN_WRONG_STATE, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -7185,327 +7185,327 @@ nm_dbus_path_not_empty, function in <a class="link" href="NMIPConfig.html" title
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-ENCODE-VERSION:CAPS">NM_ENCODE_VERSION</a>, macro in nm-version-macros
+NM_ENCODE_VERSION, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-ADAPTIVE-RX:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_ADAPTIVE_RX</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_ADAPTIVE_RX, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-ADAPTIVE-TX:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_ADAPTIVE_TX</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_ADAPTIVE_TX, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-PKT-RATE-HIGH:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_PKT_RATE_HIGH</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_PKT_RATE_HIGH, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-PKT-RATE-LOW:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_PKT_RATE_LOW</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_PKT_RATE_LOW, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-RX-FRAMES:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_RX_FRAMES</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_RX_FRAMES, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-RX-FRAMES-HIGH:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_RX_FRAMES_HIGH</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_RX_FRAMES_HIGH, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-RX-FRAMES-IRQ:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_RX_FRAMES_IRQ</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_RX_FRAMES_IRQ, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-RX-FRAMES-LOW:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_RX_FRAMES_LOW</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_RX_FRAMES_LOW, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-RX-USECS:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_RX_USECS</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_RX_USECS, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-RX-USECS-HIGH:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_RX_USECS_HIGH</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_RX_USECS_HIGH, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-RX-USECS-IRQ:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_RX_USECS_IRQ</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_RX_USECS_IRQ, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-RX-USECS-LOW:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_RX_USECS_LOW</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_RX_USECS_LOW, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-SAMPLE-INTERVAL:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_SAMPLE_INTERVAL</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_SAMPLE_INTERVAL, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-STATS-BLOCK-USECS:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_STATS_BLOCK_USECS</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_STATS_BLOCK_USECS, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-TX-FRAMES:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_TX_FRAMES</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_TX_FRAMES, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-TX-FRAMES-HIGH:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_TX_FRAMES_HIGH</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_TX_FRAMES_HIGH, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-TX-FRAMES-IRQ:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_TX_FRAMES_IRQ</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_TX_FRAMES_IRQ, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-TX-FRAMES-LOW:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_TX_FRAMES_LOW</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_TX_FRAMES_LOW, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-TX-USECS:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_TX_USECS</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_TX_USECS, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-TX-USECS-HIGH:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_TX_USECS_HIGH</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_TX_USECS_HIGH, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-TX-USECS-IRQ:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_TX_USECS_IRQ</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_TX_USECS_IRQ, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-COALESCE-TX-USECS-LOW:CAPS">NM_ETHTOOL_OPTNAME_COALESCE_TX_USECS_LOW</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_COALESCE_TX_USECS_LOW, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-ESP-HW-OFFLOAD:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_ESP_HW_OFFLOAD</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_ESP_HW_OFFLOAD, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-ESP-TX-CSUM-HW-OFFLOAD:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_ESP_TX_CSUM_HW_OFFLOAD</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_ESP_TX_CSUM_HW_OFFLOAD, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-FCOE-MTU:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_FCOE_MTU</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_FCOE_MTU, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-GRO:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_GRO</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_GRO, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-GSO:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_GSO</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_GSO, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-HIGHDMA:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_HIGHDMA</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_HIGHDMA, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-HW-TC-OFFLOAD:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_HW_TC_OFFLOAD</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_HW_TC_OFFLOAD, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-L2-FWD-OFFLOAD:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_L2_FWD_OFFLOAD</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_L2_FWD_OFFLOAD, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-LOOPBACK:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_LOOPBACK</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_LOOPBACK, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-LRO:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_LRO</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_LRO, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-MACSEC-HW-OFFLOAD:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_MACSEC_HW_OFFLOAD</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_MACSEC_HW_OFFLOAD, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-NTUPLE:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_NTUPLE</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_NTUPLE, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RX:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RX</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_RX, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RXHASH:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RXHASH</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_RXHASH, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RXVLAN:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RXVLAN</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_RXVLAN, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RX-ALL:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RX_ALL</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_RX_ALL, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RX-FCS:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RX_FCS</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_RX_FCS, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RX-GRO-HW:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RX_GRO_HW</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_RX_GRO_HW, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RX-GRO-LIST:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RX_GRO_LIST</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_RX_GRO_LIST, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RX-UDP-GRO-FORWARDING:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RX_UDP_GRO_FORWARDING</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_RX_UDP_GRO_FORWARDING, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RX-UDP-TUNNEL-PORT-OFFLOAD:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RX_UDP_TUNNEL_PORT_OFFLOAD</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_RX_UDP_TUNNEL_PORT_OFFLOAD, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RX-VLAN-FILTER:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_FILTER</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_FILTER, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RX-VLAN-STAG-FILTER:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_STAG_FILTER</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_STAG_FILTER, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RX-VLAN-STAG-HW-PARSE:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_STAG_HW_PARSE</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_STAG_HW_PARSE, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-SG:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_SG</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_SG, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TLS-HW-RECORD:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TLS_HW_RECORD</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TLS_HW_RECORD, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TLS-HW-RX-OFFLOAD:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TLS_HW_RX_OFFLOAD</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TLS_HW_RX_OFFLOAD, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TLS-HW-TX-OFFLOAD:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TLS_HW_TX_OFFLOAD</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TLS_HW_TX_OFFLOAD, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TSO:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TSO</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TSO, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TXVLAN:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TXVLAN</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TXVLAN, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-CHECKSUM-FCOE-CRC:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_FCOE_CRC</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_FCOE_CRC, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-CHECKSUM-IPV4:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IPV4</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IPV4, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-CHECKSUM-IPV6:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IPV6</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IPV6, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-CHECKSUM-IP-GENERIC:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IP_GENERIC</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IP_GENERIC, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-CHECKSUM-SCTP:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_SCTP</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_SCTP, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-ESP-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_ESP_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_ESP_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-FCOE-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_FCOE_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_FCOE_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-GRE-CSUM-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_GRE_CSUM_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_GRE_CSUM_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-GRE-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_GRE_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_GRE_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-GSO-LIST:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_GSO_LIST</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_GSO_LIST, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-GSO-PARTIAL:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_GSO_PARTIAL</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_GSO_PARTIAL, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-GSO-ROBUST:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_GSO_ROBUST</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_GSO_ROBUST, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-IPXIP4-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_IPXIP4_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_IPXIP4_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-IPXIP6-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_IPXIP6_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_IPXIP6_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-NOCACHE-COPY:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_NOCACHE_COPY</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_NOCACHE_COPY, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-SCATTER-GATHER:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_SCATTER_GATHER</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_SCATTER_GATHER, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-SCATTER-GATHER-FRAGLIST:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_SCATTER_GATHER_FRAGLIST</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_SCATTER_GATHER_FRAGLIST, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-SCTP-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_SCTP_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_SCTP_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-TCP6-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP6_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP6_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-TCP-ECN-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_ECN_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_ECN_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-TCP-MANGLEID-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_MANGLEID_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_MANGLEID_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-TCP-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-TUNNEL-REMCSUM-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_TUNNEL_REMCSUM_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_TUNNEL_REMCSUM_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-UDP-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-UDP-TNL-CSUM-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_TNL_CSUM_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_TNL_CSUM_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-UDP-TNL-SEGMENTATION:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_TNL_SEGMENTATION</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_TNL_SEGMENTATION, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX-VLAN-STAG-HW-INSERT:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX_VLAN_STAG_HW_INSERT</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_FEATURE_TX_VLAN_STAG_HW_INSERT, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
@@ -7525,31 +7525,31 @@ nm_dbus_path_not_empty, function in <a class="link" href="NMIPConfig.html" title
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-PAUSE-AUTONEG:CAPS">NM_ETHTOOL_OPTNAME_PAUSE_AUTONEG</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_PAUSE_AUTONEG, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-PAUSE-RX:CAPS">NM_ETHTOOL_OPTNAME_PAUSE_RX</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_PAUSE_RX, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-PAUSE-TX:CAPS">NM_ETHTOOL_OPTNAME_PAUSE_TX</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_PAUSE_TX, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-RING-RX:CAPS">NM_ETHTOOL_OPTNAME_RING_RX</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_RING_RX, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-RING-RX-JUMBO:CAPS">NM_ETHTOOL_OPTNAME_RING_RX_JUMBO</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_RING_RX_JUMBO, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-RING-RX-MINI:CAPS">NM_ETHTOOL_OPTNAME_RING_RX_MINI</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_RING_RX_MINI, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-RING-TX:CAPS">NM_ETHTOOL_OPTNAME_RING_TX</a>, macro in nm-ethtool-utils
+NM_ETHTOOL_OPTNAME_RING_TX, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
@@ -8209,7 +8209,7 @@ nm_dbus_path_not_empty, function in <a class="link" href="NMIPConfig.html" title
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-MAJOR-VERSION:CAPS">NM_MAJOR_VERSION</a>, macro in nm-version-macros
+NM_MAJOR_VERSION, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
@@ -8221,11 +8221,11 @@ nm_dbus_path_not_empty, function in <a class="link" href="NMIPConfig.html" title
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-MICRO-VERSION:CAPS">NM_MICRO_VERSION</a>, macro in nm-version-macros
+NM_MICRO_VERSION, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-MINOR-VERSION:CAPS">NM_MINOR_VERSION</a>, macro in nm-version-macros
+NM_MINOR_VERSION, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
@@ -14329,91 +14329,91 @@ nm_utils_wincaps_to_dash, function in <a class="link" href="NMIPConfig.html" tit
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION:CAPS">NM_VERSION</a>, macro in nm-version-macros
+NM_VERSION, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-0-9-10:CAPS">NM_VERSION_0_9_10</a>, macro in nm-version-macros
+NM_VERSION_0_9_10, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-0-9-8:CAPS">NM_VERSION_0_9_8</a>, macro in nm-version-macros
+NM_VERSION_0_9_8, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-0:CAPS">NM_VERSION_1_0</a>, macro in nm-version-macros
+NM_VERSION_1_0, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-10:CAPS">NM_VERSION_1_10</a>, macro in nm-version-macros
+NM_VERSION_1_10, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-12:CAPS">NM_VERSION_1_12</a>, macro in nm-version-macros
+NM_VERSION_1_12, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-14:CAPS">NM_VERSION_1_14</a>, macro in nm-version-macros
+NM_VERSION_1_14, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-16:CAPS">NM_VERSION_1_16</a>, macro in nm-version-macros
+NM_VERSION_1_16, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-18:CAPS">NM_VERSION_1_18</a>, macro in nm-version-macros
+NM_VERSION_1_18, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-2:CAPS">NM_VERSION_1_2</a>, macro in nm-version-macros
+NM_VERSION_1_2, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-20:CAPS">NM_VERSION_1_20</a>, macro in nm-version-macros
+NM_VERSION_1_20, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-22:CAPS">NM_VERSION_1_22</a>, macro in nm-version-macros
+NM_VERSION_1_22, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-24:CAPS">NM_VERSION_1_24</a>, macro in nm-version-macros
+NM_VERSION_1_24, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-26:CAPS">NM_VERSION_1_26</a>, macro in nm-version-macros
+NM_VERSION_1_26, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-28:CAPS">NM_VERSION_1_28</a>, macro in nm-version-macros
+NM_VERSION_1_28, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-30:CAPS">NM_VERSION_1_30</a>, macro in nm-version-macros
+NM_VERSION_1_30, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-32:CAPS">NM_VERSION_1_32</a>, macro in nm-version-macros
+NM_VERSION_1_32, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-34:CAPS">NM_VERSION_1_34</a>, macro in nm-version-macros
+NM_VERSION_1_34, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-36:CAPS">NM_VERSION_1_36</a>, macro in nm-version-macros
+NM_VERSION_1_36, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-38:CAPS">NM_VERSION_1_38</a>, macro in nm-version-macros
+NM_VERSION_1_38, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-4:CAPS">NM_VERSION_1_4</a>, macro in nm-version-macros
+NM_VERSION_1_4, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-40:CAPS">NM_VERSION_1_40</a>, macro in nm-version-macros
+NM_VERSION_1_40, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
@@ -14421,15 +14421,15 @@ NM_VERSION_1_40_4, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-6:CAPS">NM_VERSION_1_6</a>, macro in nm-version-macros
+NM_VERSION_1_6, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-1-8:CAPS">NM_VERSION_1_8</a>, macro in nm-version-macros
+NM_VERSION_1_8, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-CUR-STABLE:CAPS">NM_VERSION_CUR_STABLE</a>, macro in nm-version-macros
+NM_VERSION_CUR_STABLE, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
@@ -14441,7 +14441,7 @@ NM_VERSION_1_40_4, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-version-macros.html#NM-VERSION-NEXT-STABLE:CAPS">NM_VERSION_NEXT_STABLE</a>, macro in nm-version-macros
+NM_VERSION_NEXT_STABLE, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
@@ -14465,11 +14465,11 @@ NM_VERSION_1_40_4, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-DBUS-PLUGIN-INTERFACE:CAPS">NM_VPN_DBUS_PLUGIN_INTERFACE</a>, macro in nm-vpn-dbus-interface
+NM_VPN_DBUS_PLUGIN_INTERFACE, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-DBUS-PLUGIN-PATH:CAPS">NM_VPN_DBUS_PLUGIN_PATH</a>, macro in nm-vpn-dbus-interface
+NM_VPN_DBUS_PLUGIN_PATH, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -14537,35 +14537,35 @@ NM_VERSION_1_40_4, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CAN-PERSIST:CAPS">NM_VPN_PLUGIN_CAN_PERSIST</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_CAN_PERSIST, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-BANNER:CAPS">NM_VPN_PLUGIN_CONFIG_BANNER</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_CONFIG_BANNER, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS">NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-HAS-IP4:CAPS">NM_VPN_PLUGIN_CONFIG_HAS_IP4</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_CONFIG_HAS_IP4, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-HAS-IP6:CAPS">NM_VPN_PLUGIN_CONFIG_HAS_IP6</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_CONFIG_HAS_IP6, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-MTU:CAPS">NM_VPN_PLUGIN_CONFIG_MTU</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_CONFIG_MTU, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-PROXY-PAC:CAPS">NM_VPN_PLUGIN_CONFIG_PROXY_PAC</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_CONFIG_PROXY_PAC, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS">NM_VPN_PLUGIN_CONFIG_TUNDEV</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -14701,115 +14701,115 @@ NM_VERSION_1_40_4, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-ADDRESS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-BANNER:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_BANNER</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_BANNER, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-DNS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_DNS</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_DNS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAIN:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAINS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-EXT-GATEWAY:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-GATEWAY:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-INT-GATEWAY:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-MSS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_MSS</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_MSS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-MTU:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_MTU</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_MTU, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-NBNS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_NBNS</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_NBNS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-NEVER-DEFAULT:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-PREFIX:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_PREFIX</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-PRESERVE-ROUTES:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-PTP:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_PTP</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_PTP, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-ROUTES:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_ROUTES</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-TUNDEV:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-ADDRESS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-DNS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_DNS</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP6_CONFIG_DNS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAIN:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAINS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-INT-GATEWAY:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-MSS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_MSS</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP6_CONFIG_MSS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-NEVER-DEFAULT:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-PREFIX:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_PREFIX</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP6_CONFIG_PREFIX, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-PRESERVE-ROUTES:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-PTP:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_PTP</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP6_CONFIG_PTP, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-ROUTES:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_ROUTES</a>, macro in nm-vpn-dbus-interface
+NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index b8099088..9b382b70 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm 1.40.6
+      for libnm 1.40.8
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://networkmanager.dev/docs/libnm/latest/" target="_top">https://networkmanager.dev/docs/libnm/latest/</a>.
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html
index 7e8b4ede..6b16ef3a 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -254,7 +254,7 @@ nm_vpn_plugin_error_quark (<em class="parameter"><code><span class="type">void</
 <a name="NMAgentManagerError"></a><h3>enum NMAgentManagerError</h3>
 <p>Errors returned from the secret-agent manager.</p>
 <p>These errors may be returned from operations that could cause secrets to be
-requested (such as <a href="/usr/share/gtk-doc/html/libnm-glib/NMClient.html#nm-client-activate-connection"><code class="function">nm_client_activate_connection()</code></a>), and correspond to D-Bus
+requested (such as <code class="function">nm_client_activate_connection()</code>), and correspond to D-Bus
 errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.</p>
 <div class="refsect3">
 <a name="NMAgentManagerError.members"></a><h4>Members</h4>
@@ -326,7 +326,7 @@ request</p>
 <div class="refsect2">
 <a name="NMConnectionError"></a><h3>enum NMConnectionError</h3>
 <p>Describes errors that may result from operations involving a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-or its <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSetting-struct"><span class="type">NMSettings</span></a>.</p>
+or its <span class="type">NMSettings</span>.</p>
 <p>These errors may be returned directly from <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> and <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>
 methods, or may be returned from D-Bus operations (eg on <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> or
 <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>), where they correspond to errors in the
@@ -737,7 +737,7 @@ activation but is not available.</p>
 when they encounter problems retrieving secrets on behalf of NM. They
 correspond to errors in the "org.freedesktop.NetworkManager.SecretManager"
 namespace.</p>
-<p>Client APIs such as <a href="/usr/share/gtk-doc/html/libnm-glib/NMClient.html#nm-client-activate-connection"><code class="function">nm_client_activate_connection()</code></a> will not see these error
+<p>Client APIs such as <code class="function">nm_client_activate_connection()</code> will not see these error
 codes; instead, the secret agent manager will translate them to the
 corresponding <a class="link" href="libnm-nm-errors.html#NMAgentManagerError" title="enum NMAgentManagerError"><span class="type">NMAgentManagerError</span></a> codes.</p>
 <div class="refsect3">
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 1eab93bc..ff4f74e8 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -1716,7 +1716,7 @@ nm_utils_uuid_generate (<em class="parameter"><code><span class="type">void</spa
 <div class="refsect3">
 <a name="nm-utils-uuid-generate.returns"></a><h4>Returns</h4>
 <p> a newly allocated UUID suitable for use as the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
-object's <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection--id"><span class="type">“id”</span></a>: property.  Should be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a></p>
+object's <span class="type">“id”</span>: property.  Should be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a></p>
 </div>
 </div>
 <hr>
@@ -2906,7 +2906,7 @@ or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#
 nm_utils_version (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <div class="refsect3">
 <a name="nm-utils-version.returns"></a><h4>Returns</h4>
-<p> the version ID of the libnm version. That is, the <a href="libnm-nm-version-macros.html#NM-VERSION:CAPS"><code class="literal">NM_VERSION</code></a>
+<p> the version ID of the libnm version. That is, the <code class="literal">NM_VERSION</code>
 at runtime.</p>
 </div>
 <p class="since">Since: 1.6</p>
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index 518a390a..04306fd0 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -214,10 +214,10 @@
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMTernary" title="enum NMTernary">NMTernary</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-utils.html#NMUtilsSecurityType" title="enum NMUtilsSecurityType">NMUtilsSecurityType</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingVlan.html#NMVlanPriorityMap" title="enum NMVlanPriorityMap">NMVlanPriorityMap</a>
-    <span class="lineart">├──</span> <a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState">NMVpnConnectionState</a>
-    <span class="lineart">├──</span> <a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>
-    <span class="lineart">├──</span> <a href="libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure">NMVpnPluginFailure</a>
-    <span class="lineart">├──</span> <a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState">NMVpnServiceState</a>
+    <span class="lineart">├──</span> NMVpnConnectionState
+    <span class="lineart">├──</span> NMVpnConnectionStateReason
+    <span class="lineart">├──</span> NMVpnPluginFailure
+    <span class="lineart">├──</span> NMVpnServiceState
     <span class="lineart">├──</span> <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType">NMWepKeyType</a>
     <span class="lineart">╰──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType">NMWimaxNspNetworkType</a>
     <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
index 9e47ca3e..3857f15a 100644
--- a/docs/libnm/html/usage.html
+++ b/docs/libnm/html/usage.html
@@ -96,7 +96,7 @@
         </p>
 <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c</code></strong>
   <code class="prompt">$ </code><strong class="userinput"><code>./hello-nm</code></strong>
-  NetworkManager version: 1.40.6
+  NetworkManager version: 1.40.8
 
   <code class="prompt">$ </code></pre>
 <p>
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index 4adfc24b..19d25d0a 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.40.6
+1.40.8
diff --git a/examples/python/gi/checkpoint.py b/examples/python/gi/checkpoint.py
index 6f3194cd..6e94b07c 100755
--- a/examples/python/gi/checkpoint.py
+++ b/examples/python/gi/checkpoint.py
@@ -80,10 +80,10 @@ def find_checkpoint_last(nmc):
 
 def validate_path(path, nmc):
     if path == "--last":
-        path = find_checkpoint_last(nmc)
-        if path is None:
+        c = find_checkpoint_last(nmc)
+        if c is None:
             sys.exit("Has no checkpoint")
-        return path
+        return c.get_path()
 
     try:
         num = int(path)
diff --git a/man/NetworkManager-dispatcher.8 b/man/NetworkManager-dispatcher.8
index d3f63517..ba14b58a 100644
--- a/man/NetworkManager-dispatcher.8
+++ b/man/NetworkManager-dispatcher.8
@@ -2,9 +2,9 @@
 .\"     Title: NetworkManager-dispatcher
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager-dispatcher 1.40.6
+.\"    Source: NetworkManager-dispatcher 1.40.8
 .\"  Language: English
 .\"
 .TH "NETWORKMANAGER\-DISPATCHER" "8" "" "NetworkManager\-dispatcher 1\&" "Network management daemons"
diff --git a/man/NetworkManager-wait-online.service.8 b/man/NetworkManager-wait-online.service.8
index d9f16857..bfe4c230 100644
--- a/man/NetworkManager-wait-online.service.8
+++ b/man/NetworkManager-wait-online.service.8
@@ -2,9 +2,9 @@
 .\"     Title: NetworkManager-wait-online.service
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager-wait-online.service 1.40.6
+.\"    Source: NetworkManager-wait-online.service 1.40.8
 .\"  Language: English
 .\"
 .TH "NETWORKMANAGER\-WAIT\-ONLINE\&" "8" "" "NetworkManager\-wait\-online\&" "Network management daemons"
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index f2ab69e6..b102b9c4 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.40.6
+.\"    Source: NetworkManager 1.40.8
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.40\&.6" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.40\&.8" "Network management daemons"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 3373214a..8d092163 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.40.6
+.\"    Source: NetworkManager 1.40.8
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.40\&.6" "Configuration"
+.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.40\&.8" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-cloud-setup.8 b/man/nm-cloud-setup.8
index a750efaa..6e034264 100644
--- a/man/nm-cloud-setup.8
+++ b/man/nm-cloud-setup.8
@@ -2,12 +2,12 @@
 .\"     Title: nm-cloud-setup
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: Automatic Network Configuration in Cloud with NetworkManager
-.\"    Source: NetworkManager 1.40.6
+.\"    Source: NetworkManager 1.40.8
 .\"  Language: English
 .\"
-.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.40\&.6" "Automatic Network Configuratio"
+.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.40\&.8" "Automatic Network Configuratio"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-initrd-generator.8 b/man/nm-initrd-generator.8
index f3b45def..f62e4732 100644
--- a/man/nm-initrd-generator.8
+++ b/man/nm-initrd-generator.8
@@ -2,12 +2,12 @@
 .\"     Title: nm-initrd-generator
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: System Administration
-.\"    Source: NetworkManager 1.40.6
+.\"    Source: NetworkManager 1.40.8
 .\"  Language: English
 .\"
-.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.40\&.6" "System Administration"
+.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.40\&.8" "System Administration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-online.1 b/man/nm-online.1
index 03bb9cfb..6e554414 100644
--- a/man/nm-online.1
+++ b/man/nm-online.1
@@ -2,12 +2,12 @@
 .\"     Title: nm-online
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.40.6
+.\"    Source: NetworkManager 1.40.8
 .\"  Language: English
 .\"
-.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.40\&.6" "General Commands Manual"
+.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.40\&.8" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7
index 73ea2a99..b6f9fba8 100644
--- a/man/nm-openvswitch.7
+++ b/man/nm-openvswitch.7
@@ -2,12 +2,12 @@
 .\"     Title: nm-openvswitch
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: Open vSwitch support overview
-.\"    Source: NetworkManager 1.40.6
+.\"    Source: NetworkManager 1.40.8
 .\"  Language: English
 .\"
-.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.40\&.6" "Open vSwitch support overview"
+.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.40\&.8" "Open vSwitch support overview"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-dbus.5 b/man/nm-settings-dbus.5
index 57bcba96..5f38dc88 100644
--- a/man/nm-settings-dbus.5
+++ b/man/nm-settings-dbus.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-dbus
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.40.6
+.\"    Source: NetworkManager 1.40.8
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.40\&.6" "Configuration"
+.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.40\&.8" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -2990,7 +2990,7 @@ string
 T}:T{
 \ \&
 T}:T{
-The pre\-shared CAK (Connectivity Association Key) for MACsec Key Agreement\&.
+The pre\-shared CAK (Connectivity Association Key) for MACsec Key Agreement\&. Must be a string of 32 hexadecimal characters\&.
 T}
 T{
 mka\-cak\-flags
@@ -3008,7 +3008,7 @@ string
 T}:T{
 \ \&
 T}:T{
-The pre\-shared CKN (Connectivity\-association Key Name) for MACsec Key Agreement\&.
+The pre\-shared CKN (Connectivity\-association Key Name) for MACsec Key Agreement\&. Must be a string of hexadecimal characters with a even length between 2 and 64\&.
 T}
 T{
 mode
diff --git a/man/nm-settings-dbus.xml b/man/nm-settings-dbus.xml
index d02addff..bb56ea04 100644
--- a/man/nm-settings-dbus.xml
+++ b/man/nm-settings-dbus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<refentry id="nm-settings-dbus"><refentryinfo><title>nm-settings-dbus</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-dbus</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.40.6</refmiscinfo></refmeta><refnamediv><refname>nm-settings-dbus</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles on the D-Bus API</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
+<refentry id="nm-settings-dbus"><refentryinfo><title>nm-settings-dbus</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-dbus</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.40.8</refmiscinfo></refmeta><refnamediv><refname>nm-settings-dbus</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles on the D-Bus API</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
           NetworkManager is based on a concept of connection profiles, sometimes referred to as
           connections only. These connection profiles contain a network configuration. When
           NetworkManager activates a connection profile on a network device the configuration will
@@ -306,7 +306,7 @@
 
  If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection.
 
- Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv6.routes">routes</entry><entry align="left">array of legacy IPv6 route struct (a(ayuayu))</entry><entry align="left"/><entry>Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv6 route structures.  Each IPv6 route structure is composed of an IPv6 address, a prefix length (0 - 128), an IPv6 next hop address (which may be zeroed out if there is no next hop), and a metric. If the metric is 0, NM will choose an appropriate default metric for the device.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv6.token">token</entry><entry align="left">string</entry><entry align="left"/><entry> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</entry></row></tbody></tgroup></informaltable></refsect2><refsect2><title>ip-tunnel setting</title><para> IP Tunneling Settings.</para><informaltable><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 align="left" id="nm-settings-dbus.property.ip-tunnel.encapsulation-limit">encapsulation-limit</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.flags">flags</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.flow-label">flow-label</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.input-key">input-key</entry><entry align="left">string</entry><entry align="left"/><entry> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.local">local</entry><entry align="left">string</entry><entry align="left"/><entry> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.mode">mode</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.mtu">mtu</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.output-key">output-key</entry><entry align="left">string</entry><entry align="left"/><entry> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.parent">parent</entry><entry align="left">string</entry><entry align="left"/><entry> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.path-mtu-discovery">path-mtu-discovery</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry> Whether to enable Path MTU Discovery on this tunnel.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.remote">remote</entry><entry align="left">string</entry><entry align="left"/><entry> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.tos">tos</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.ttl">ttl</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</entry></row></tbody></tgroup></informaltable></refsect2><refsect2><title>macsec setting</title><para> MACSec Settings.</para><informaltable><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 align="left" id="nm-settings-dbus.property.macsec.encrypt">encrypt</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry> Whether the transmitted traffic must be encrypted.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.mka-cak">mka-cak</entry><entry align="left">string</entry><entry align="left"/><entry> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.mka-cak-flags">mka-cak-flags</entry><entry align="left">NMSettingSecretFlags (uint32)</entry><entry align="left"/><entry> Flags indicating how to handle the "mka-cak" property.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.mka-ckn">mka-ckn</entry><entry align="left">string</entry><entry align="left"/><entry> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.mode">mode</entry><entry align="left">int32</entry><entry align="left">0</entry><entry> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.parent">parent</entry><entry align="left">string</entry><entry align="left"/><entry> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.port">port</entry><entry align="left">int32</entry><entry align="left">1</entry><entry> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.send-sci">send-sci</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.validation">validation</entry><entry align="left">int32</entry><entry align="left">2</entry><entry> Specifies the validation mode for incoming frames.</entry></row></tbody></tgroup></informaltable></refsect2><refsect2><title>macvlan setting</title><para> MAC VLAN Settings.</para><informaltable><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 align="left" id="nm-settings-dbus.property.macvlan.mode">mode</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macvlan.parent">parent</entry><entry align="left">string</entry><entry align="left"/><entry> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macvlan.promiscuous">promiscuous</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry> Whether the interface should be put in promiscuous mode.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macvlan.tap">tap</entry><entry align="left">boolean</entry><entry align="left">FALSE</entry><entry> Whether the interface should be a MACVTAP.</entry></row></tbody></tgroup></informaltable></refsect2><refsect2><title>match setting</title><para> Match settings.</para><informaltable><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 align="left" id="nm-settings-dbus.property.match.driver">driver</entry><entry align="left">array of string</entry><entry align="left"/><entry> A list of driver names to match. Each element is a shell wildcard pattern.
+ Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv6.routes">routes</entry><entry align="left">array of legacy IPv6 route struct (a(ayuayu))</entry><entry align="left"/><entry>Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv6 route structures.  Each IPv6 route structure is composed of an IPv6 address, a prefix length (0 - 128), an IPv6 next hop address (which may be zeroed out if there is no next hop), and a metric. If the metric is 0, NM will choose an appropriate default metric for the device.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ipv6.token">token</entry><entry align="left">string</entry><entry align="left"/><entry> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</entry></row></tbody></tgroup></informaltable></refsect2><refsect2><title>ip-tunnel setting</title><para> IP Tunneling Settings.</para><informaltable><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 align="left" id="nm-settings-dbus.property.ip-tunnel.encapsulation-limit">encapsulation-limit</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.flags">flags</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.flow-label">flow-label</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.input-key">input-key</entry><entry align="left">string</entry><entry align="left"/><entry> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.local">local</entry><entry align="left">string</entry><entry align="left"/><entry> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.mode">mode</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.mtu">mtu</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.output-key">output-key</entry><entry align="left">string</entry><entry align="left"/><entry> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.parent">parent</entry><entry align="left">string</entry><entry align="left"/><entry> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.path-mtu-discovery">path-mtu-discovery</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry> Whether to enable Path MTU Discovery on this tunnel.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.remote">remote</entry><entry align="left">string</entry><entry align="left"/><entry> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.tos">tos</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</entry></row><row><entry align="left" id="nm-settings-dbus.property.ip-tunnel.ttl">ttl</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</entry></row></tbody></tgroup></informaltable></refsect2><refsect2><title>macsec setting</title><para> MACSec Settings.</para><informaltable><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 align="left" id="nm-settings-dbus.property.macsec.encrypt">encrypt</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry> Whether the transmitted traffic must be encrypted.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.mka-cak">mka-cak</entry><entry align="left">string</entry><entry align="left"/><entry> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.mka-cak-flags">mka-cak-flags</entry><entry align="left">NMSettingSecretFlags (uint32)</entry><entry align="left"/><entry> Flags indicating how to handle the "mka-cak" property.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.mka-ckn">mka-ckn</entry><entry align="left">string</entry><entry align="left"/><entry> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.mode">mode</entry><entry align="left">int32</entry><entry align="left">0</entry><entry> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.parent">parent</entry><entry align="left">string</entry><entry align="left"/><entry> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.port">port</entry><entry align="left">int32</entry><entry align="left">1</entry><entry> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.send-sci">send-sci</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macsec.validation">validation</entry><entry align="left">int32</entry><entry align="left">2</entry><entry> Specifies the validation mode for incoming frames.</entry></row></tbody></tgroup></informaltable></refsect2><refsect2><title>macvlan setting</title><para> MAC VLAN Settings.</para><informaltable><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 align="left" id="nm-settings-dbus.property.macvlan.mode">mode</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macvlan.parent">parent</entry><entry align="left">string</entry><entry align="left"/><entry> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macvlan.promiscuous">promiscuous</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry> Whether the interface should be put in promiscuous mode.</entry></row><row><entry align="left" id="nm-settings-dbus.property.macvlan.tap">tap</entry><entry align="left">boolean</entry><entry align="left">FALSE</entry><entry> Whether the interface should be a MACVTAP.</entry></row></tbody></tgroup></informaltable></refsect2><refsect2><title>match setting</title><para> Match settings.</para><informaltable><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 align="left" id="nm-settings-dbus.property.match.driver">driver</entry><entry align="left">array of string</entry><entry align="left"/><entry> A list of driver names to match. Each element is a shell wildcard pattern.
 
  See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.</entry></row><row><entry align="left" id="nm-settings-dbus.property.match.interface-name">interface-name</entry><entry align="left">array of string</entry><entry align="left"/><entry> A list of interface names to match. Each element is a shell wildcard pattern.
 
diff --git a/man/nm-settings-docs-dbus.xml b/man/nm-settings-docs-dbus.xml
index 7158e86a..9b2273ee 100644
--- a/man/nm-settings-docs-dbus.xml
+++ b/man/nm-settings-docs-dbus.xml
@@ -272,7 +272,7 @@
 
  If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection.
 
- Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.</description></property><property name="routes" name_upper="ROUTES" type="array of legacy IPv6 route struct (a(ayuayu))"><description-docbook><para> Array of IP routes.</para></description-docbook><description>Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv6 route structures.  Each IPv6 route structure is composed of an IPv6 address, a prefix length (0 - 128), an IPv6 next hop address (which may be zeroed out if there is no next hop), and a metric. If the metric is 0, NM will choose an appropriate default metric for the device.</description></property><property name="token" name_upper="TOKEN" type="string"><description-docbook><para> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</para></description-docbook><description> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</description></property></setting><setting name="ip-tunnel" description=" IP Tunneling Settings" name_upper="IP_TUNNEL"><property name="encapsulation-limit" name_upper="ENCAPSULATION_LIMIT" type="uint32" default="0"><description-docbook><para> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</para></description-docbook><description> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</description></property><property name="flags" name_upper="FLAGS" type="uint32" default="0"><description-docbook><para> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</para></description-docbook><description> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</description></property><property name="flow-label" name_upper="FLOW_LABEL" type="uint32" default="0"><description-docbook><para> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</para></description-docbook><description> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</description></property><property name="input-key" name_upper="INPUT_KEY" type="string"><description-docbook><para> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook><description> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description></property><property name="local" name_upper="LOCAL" type="string"><description-docbook><para> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</para></description-docbook><description> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</description></property><property name="mode" name_upper="MODE" type="uint32" default="0"><description-docbook><para> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</para></description-docbook><description> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</description></property><property name="mtu" name_upper="MTU" type="uint32" default="0"><description-docbook><para> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</para></description-docbook><description> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</description></property><property name="output-key" name_upper="OUTPUT_KEY" type="string"><description-docbook><para> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook><description> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description></property><property name="parent" name_upper="PARENT" type="string"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</para></description-docbook><description> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</description></property><property name="path-mtu-discovery" name_upper="PATH_MTU_DISCOVERY" type="boolean" default="TRUE"><description-docbook><para> Whether to enable Path MTU Discovery on this tunnel.</para></description-docbook><description> Whether to enable Path MTU Discovery on this tunnel.</description></property><property name="remote" name_upper="REMOTE" type="string"><description-docbook><para> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</para></description-docbook><description> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</description></property><property name="tos" name_upper="TOS" type="uint32" default="0"><description-docbook><para> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</para></description-docbook><description> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</description></property><property name="ttl" name_upper="TTL" type="uint32" default="0"><description-docbook><para> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</para></description-docbook><description> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</description></property></setting><setting name="macsec" description=" MACSec Settings" name_upper="MACSEC"><property name="encrypt" name_upper="ENCRYPT" type="boolean" default="TRUE"><description-docbook><para> Whether the transmitted traffic must be encrypted.</para></description-docbook><description> Whether the transmitted traffic must be encrypted.</description></property><property name="mka-cak" name_upper="MKA_CAK" type="string"><description-docbook><para> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</para></description-docbook><description> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</description></property><property name="mka-cak-flags" name_upper="MKA_CAK_FLAGS" type="NMSettingSecretFlags (uint32)"><description-docbook><para> Flags indicating how to handle the "mka-cak" property.</para></description-docbook><description> Flags indicating how to handle the "mka-cak" property.</description></property><property name="mka-ckn" name_upper="MKA_CKN" type="string"><description-docbook><para> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</para></description-docbook><description> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</description></property><property name="mode" name_upper="MODE" type="int32" default="0"><description-docbook><para> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</para></description-docbook><description> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</description></property><property name="parent" name_upper="PARENT" type="string"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook><description> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description></property><property name="port" name_upper="PORT" type="int32" default="1"><description-docbook><para> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</para></description-docbook><description> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</description></property><property name="send-sci" name_upper="SEND_SCI" type="boolean" default="TRUE"><description-docbook><para> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</para></description-docbook><description> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</description></property><property name="validation" name_upper="VALIDATION" type="int32" default="2"><description-docbook><para> Specifies the validation mode for incoming frames.</para></description-docbook><description> Specifies the validation mode for incoming frames.</description></property></setting><setting name="macvlan" description=" MAC VLAN Settings" name_upper="MACVLAN"><property name="mode" name_upper="MODE" type="uint32" default="0"><description-docbook><para> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</para></description-docbook><description> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</description></property><property name="parent" name_upper="PARENT" type="string"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook><description> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description></property><property name="promiscuous" name_upper="PROMISCUOUS" type="boolean" default="TRUE"><description-docbook><para> Whether the interface should be put in promiscuous mode.</para></description-docbook><description> Whether the interface should be put in promiscuous mode.</description></property><property name="tap" name_upper="TAP" type="boolean" default="FALSE"><description-docbook><para> Whether the interface should be a MACVTAP.</para></description-docbook><description> Whether the interface should be a MACVTAP.</description></property></setting><setting name="match" description=" Match settings" name_upper="MATCH"><property name="driver" name_upper="DRIVER" type="array of string"><description-docbook><para> A list of driver names to match. Each element is a shell wildcard pattern.</para><para> See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.</para></description-docbook><description> A list of driver names to match. Each element is a shell wildcard pattern.
+ Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.</description></property><property name="routes" name_upper="ROUTES" type="array of legacy IPv6 route struct (a(ayuayu))"><description-docbook><para> Array of IP routes.</para></description-docbook><description>Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv6 route structures.  Each IPv6 route structure is composed of an IPv6 address, a prefix length (0 - 128), an IPv6 next hop address (which may be zeroed out if there is no next hop), and a metric. If the metric is 0, NM will choose an appropriate default metric for the device.</description></property><property name="token" name_upper="TOKEN" type="string"><description-docbook><para> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</para></description-docbook><description> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</description></property></setting><setting name="ip-tunnel" description=" IP Tunneling Settings" name_upper="IP_TUNNEL"><property name="encapsulation-limit" name_upper="ENCAPSULATION_LIMIT" type="uint32" default="0"><description-docbook><para> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</para></description-docbook><description> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</description></property><property name="flags" name_upper="FLAGS" type="uint32" default="0"><description-docbook><para> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</para></description-docbook><description> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</description></property><property name="flow-label" name_upper="FLOW_LABEL" type="uint32" default="0"><description-docbook><para> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</para></description-docbook><description> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</description></property><property name="input-key" name_upper="INPUT_KEY" type="string"><description-docbook><para> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook><description> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description></property><property name="local" name_upper="LOCAL" type="string"><description-docbook><para> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</para></description-docbook><description> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</description></property><property name="mode" name_upper="MODE" type="uint32" default="0"><description-docbook><para> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</para></description-docbook><description> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</description></property><property name="mtu" name_upper="MTU" type="uint32" default="0"><description-docbook><para> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</para></description-docbook><description> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</description></property><property name="output-key" name_upper="OUTPUT_KEY" type="string"><description-docbook><para> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook><description> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description></property><property name="parent" name_upper="PARENT" type="string"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</para></description-docbook><description> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</description></property><property name="path-mtu-discovery" name_upper="PATH_MTU_DISCOVERY" type="boolean" default="TRUE"><description-docbook><para> Whether to enable Path MTU Discovery on this tunnel.</para></description-docbook><description> Whether to enable Path MTU Discovery on this tunnel.</description></property><property name="remote" name_upper="REMOTE" type="string"><description-docbook><para> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</para></description-docbook><description> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</description></property><property name="tos" name_upper="TOS" type="uint32" default="0"><description-docbook><para> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</para></description-docbook><description> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</description></property><property name="ttl" name_upper="TTL" type="uint32" default="0"><description-docbook><para> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</para></description-docbook><description> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</description></property></setting><setting name="macsec" description=" MACSec Settings" name_upper="MACSEC"><property name="encrypt" name_upper="ENCRYPT" type="boolean" default="TRUE"><description-docbook><para> Whether the transmitted traffic must be encrypted.</para></description-docbook><description> Whether the transmitted traffic must be encrypted.</description></property><property name="mka-cak" name_upper="MKA_CAK" type="string"><description-docbook><para> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</para></description-docbook><description> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</description></property><property name="mka-cak-flags" name_upper="MKA_CAK_FLAGS" type="NMSettingSecretFlags (uint32)"><description-docbook><para> Flags indicating how to handle the "mka-cak" property.</para></description-docbook><description> Flags indicating how to handle the "mka-cak" property.</description></property><property name="mka-ckn" name_upper="MKA_CKN" type="string"><description-docbook><para> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</para></description-docbook><description> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</description></property><property name="mode" name_upper="MODE" type="int32" default="0"><description-docbook><para> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</para></description-docbook><description> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</description></property><property name="parent" name_upper="PARENT" type="string"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook><description> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description></property><property name="port" name_upper="PORT" type="int32" default="1"><description-docbook><para> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</para></description-docbook><description> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</description></property><property name="send-sci" name_upper="SEND_SCI" type="boolean" default="TRUE"><description-docbook><para> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</para></description-docbook><description> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</description></property><property name="validation" name_upper="VALIDATION" type="int32" default="2"><description-docbook><para> Specifies the validation mode for incoming frames.</para></description-docbook><description> Specifies the validation mode for incoming frames.</description></property></setting><setting name="macvlan" description=" MAC VLAN Settings" name_upper="MACVLAN"><property name="mode" name_upper="MODE" type="uint32" default="0"><description-docbook><para> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</para></description-docbook><description> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</description></property><property name="parent" name_upper="PARENT" type="string"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook><description> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description></property><property name="promiscuous" name_upper="PROMISCUOUS" type="boolean" default="TRUE"><description-docbook><para> Whether the interface should be put in promiscuous mode.</para></description-docbook><description> Whether the interface should be put in promiscuous mode.</description></property><property name="tap" name_upper="TAP" type="boolean" default="FALSE"><description-docbook><para> Whether the interface should be a MACVTAP.</para></description-docbook><description> Whether the interface should be a MACVTAP.</description></property></setting><setting name="match" description=" Match settings" name_upper="MATCH"><property name="driver" name_upper="DRIVER" type="array of string"><description-docbook><para> A list of driver names to match. Each element is a shell wildcard pattern.</para><para> See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.</para></description-docbook><description> A list of driver names to match. Each element is a shell wildcard pattern.
 
  See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.</description></property><property name="interface-name" name_upper="INTERFACE_NAME" type="array of string"><description-docbook><para> A list of interface names to match. Each element is a shell wildcard pattern.</para><para> An element can be prefixed with a pipe symbol (|) or an ampersand (&amp;). The former means that the element is optional and the latter means that it is mandatory. If there are any optional elements, than the match evaluates to true if at least one of the optional element matches (logical OR). If there are any mandatory elements, then they all must match (logical AND). By default, an element is optional. This means that an element "foo" behaves the same as "|foo". An element can also be inverted with exclamation mark (!) between the pipe symbol (or the ampersand) and before the pattern. Note that "!foo" is a shortcut for the mandatory match "&amp;!foo". Finally, a backslash can be used at the beginning of the element (after the optional special characters) to escape the start of the pattern. For example, "&amp;\\!a" is an mandatory match for literally "!a".</para></description-docbook><description> A list of interface names to match. Each element is a shell wildcard pattern.
 
diff --git a/man/nm-settings-docs-nmcli.xml b/man/nm-settings-docs-nmcli.xml
index d2b7781c..7323d72b 100644
--- a/man/nm-settings-docs-nmcli.xml
+++ b/man/nm-settings-docs-nmcli.xml
@@ -166,7 +166,7 @@ fixed priority.
 </para>
 <para>
 Example: <literal>priority 5 from 1:2:3::5/128 table 45</literal>
-</para></description-docbook><description>A comma separated list of routing rules for policy routing.</description></property><property name="token" name_upper="TOKEN" type="string"><description-docbook><para> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</para></description-docbook><description>Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</description></property></setting><setting name="ip-tunnel" description=" IP Tunneling Settings" name_upper="IP_TUNNEL"><property name="encapsulation-limit" name_upper="ENCAPSULATION_LIMIT" type="uint32" default="0"><description-docbook><para> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</para></description-docbook><description>How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</description></property><property name="flags" name_upper="FLAGS" type="uint32" default="0"><description-docbook><para> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</para></description-docbook><description>Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</description></property><property name="flow-label" name_upper="FLOW_LABEL" type="uint32" default="0"><description-docbook><para> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</para></description-docbook><description>The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</description></property><property name="input-key" name_upper="INPUT_KEY" type="string"><description-docbook><para> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook><description>The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description></property><property name="local" name_upper="LOCAL" type="string" alias="local"><description-docbook><para> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</para></description-docbook><description>The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</description></property><property name="mode" name_upper="MODE" type="uint32" default="0" alias="mode"><description-docbook><para> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</para></description-docbook><description>The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</description></property><property name="mtu" name_upper="MTU" type="uint32" default="0"><description-docbook><para> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</para></description-docbook><description>If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</description></property><property name="output-key" name_upper="OUTPUT_KEY" type="string"><description-docbook><para> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook><description>The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description></property><property name="parent" name_upper="PARENT" type="string" alias="dev"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</para></description-docbook><description>If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</description></property><property name="path-mtu-discovery" name_upper="PATH_MTU_DISCOVERY" type="boolean" default="TRUE"><description-docbook><para> Whether to enable Path MTU Discovery on this tunnel.</para></description-docbook><description>Whether to enable Path MTU Discovery on this tunnel.</description></property><property name="remote" name_upper="REMOTE" type="string" alias="remote"><description-docbook><para> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</para></description-docbook><description>The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</description></property><property name="tos" name_upper="TOS" type="uint32" default="0"><description-docbook><para> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</para></description-docbook><description>The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</description></property><property name="ttl" name_upper="TTL" type="uint32" default="0"><description-docbook><para> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</para></description-docbook><description>The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</description></property></setting><setting name="macsec" description=" MACSec Settings" name_upper="MACSEC"><property name="encrypt" name_upper="ENCRYPT" type="boolean" default="TRUE" alias="encrypt"><description-docbook><para> Whether the transmitted traffic must be encrypted.</para></description-docbook><description>Whether the transmitted traffic must be encrypted.</description></property><property name="mka-cak" name_upper="MKA_CAK" type="string" alias="cak"><description-docbook><para> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</para></description-docbook><description>The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</description></property><property name="mka-cak-flags" name_upper="MKA_CAK_FLAGS" type="NMSettingSecretFlags (uint32)"><description-docbook><para> Flags indicating how to handle the "mka-cak" property.</para></description-docbook><description>Flags indicating how to handle the "mka-cak" property.</description></property><property name="mka-ckn" name_upper="MKA_CKN" type="string" alias="ckn"><description-docbook><para> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</para></description-docbook><description>The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</description></property><property name="mode" name_upper="MODE" type="int32" default="0" alias="mode"><description-docbook><para> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</para></description-docbook><description>Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</description></property><property name="parent" name_upper="PARENT" type="string" alias="dev"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook><description>If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description></property><property name="port" name_upper="PORT" type="int32" default="1" alias="port"><description-docbook><para> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</para></description-docbook><description>The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</description></property><property name="send-sci" name_upper="SEND_SCI" type="boolean" default="TRUE"><description-docbook><para> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</para></description-docbook><description>Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</description></property><property name="validation" name_upper="VALIDATION" type="int32" default="2"><description-docbook><para> Specifies the validation mode for incoming frames.</para></description-docbook><description>Specifies the validation mode for incoming frames.</description></property></setting><setting name="macvlan" description=" MAC VLAN Settings" name_upper="MACVLAN"><property name="mode" name_upper="MODE" type="uint32" default="0" alias="mode"><description-docbook><para> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</para></description-docbook><description>The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</description></property><property name="parent" name_upper="PARENT" type="string" alias="dev"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook><description>If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description></property><property name="promiscuous" name_upper="PROMISCUOUS" type="boolean" default="TRUE"><description-docbook><para> Whether the interface should be put in promiscuous mode.</para></description-docbook><description>Whether the interface should be put in promiscuous mode.</description></property><property name="tap" name_upper="TAP" type="boolean" default="FALSE" alias="tap"><description-docbook><para> Whether the interface should be a MACVTAP.</para></description-docbook><description>Whether the interface should be a MACVTAP.</description></property></setting><setting name="match" description=" Match settings" name_upper="MATCH"><property name="driver" name_upper="DRIVER" type="array of string"><description-docbook><para> A list of driver names to match. Each element is a shell wildcard pattern.</para><para> See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.</para></description-docbook><description>A list of driver names to match. Each element is a shell wildcard pattern. See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\' are used for optional and mandatory matches and inverting the pattern.</description></property><property name="interface-name" name_upper="INTERFACE_NAME" type="array of string"><description-docbook><para> A list of interface names to match. Each element is a shell wildcard pattern.</para><para> An element can be prefixed with a pipe symbol (|) or an ampersand (&amp;). The former means that the element is optional and the latter means that it is mandatory. If there are any optional elements, than the match evaluates to true if at least one of the optional element matches (logical OR). If there are any mandatory elements, then they all must match (logical AND). By default, an element is optional. This means that an element "foo" behaves the same as "|foo". An element can also be inverted with exclamation mark (!) between the pipe symbol (or the ampersand) and before the pattern. Note that "!foo" is a shortcut for the mandatory match "&amp;!foo". Finally, a backslash can be used at the beginning of the element (after the optional special characters) to escape the start of the pattern. For example, "&amp;\\!a" is an mandatory match for literally "!a".</para></description-docbook><description>A list of interface names to match. Each element is a shell wildcard pattern. An element can be prefixed with a pipe symbol (|) or an ampersand (&amp;). The former means that the element is optional and the latter means that it is mandatory. If there are any optional elements, than the match evaluates to true if at least one of the optional element matches (logical OR). If there are any mandatory elements, then they all must match (logical AND). By default, an element is optional. This means that an element "foo" behaves the same as "|foo". An element can also be inverted with exclamation mark (!) between the pipe symbol (or the ampersand) and before the pattern. Note that "!foo" is a shortcut for the mandatory match "&amp;!foo". Finally, a backslash can be used at the beginning of the element (after the optional special characters) to escape the start of the pattern. For example, "&amp;\!a" is an mandatory match for literally "!a".</description></property><property name="kernel-command-line" name_upper="KERNEL_COMMAND_LINE" type="array of string"><description-docbook><para> A list of kernel command line arguments to match. This may be used to check whether a specific kernel command line option is set (or unset, if prefixed with the exclamation mark). The argument must either be a single word, or an assignment (i.e. two words, joined by "="). In the former case the kernel command line is searched for the word appearing as is, or as left hand side of an assignment. In the latter case, the exact assignment is looked for with right and left hand side matching. Wildcard patterns are not supported.</para><para> See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the match.</para></description-docbook><description>A list of kernel command line arguments to match. This may be used to check whether a specific kernel command line option is set (or unset, if prefixed with the exclamation mark). The argument must either be a single word, or an assignment (i.e. two words, joined by "="). In the former case the kernel command line is searched for the word appearing as is, or as left hand side of an assignment. In the latter case, the exact assignment is looked for with right and left hand side matching. Wildcard patterns are not supported. See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\' are used for optional and mandatory matches and inverting the match.</description></property><property name="path" name_upper="PATH" type="array of string"><description-docbook><para> A list of paths to match against the ID_PATH udev property of devices. ID_PATH represents the topological persistent path of a device. It typically contains a subsystem string (pci, usb, platform, etc.) and a subsystem-specific identifier.</para><para> For PCI devices the path has the form "pci-$domain:$bus:$device.$function", where each variable is an hexadecimal value; for example "pci-0000:0a:00.0".</para><para> The path of a device can be obtained with "udevadm info /sys/class/net/$dev | grep ID_PATH=" or by looking at the "path" property exported by NetworkManager ("nmcli -f general.path device show $dev").</para><para> Each element of the list is a shell wildcard pattern.</para><para> See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.</para></description-docbook><description>A list of paths to match against the ID_PATH udev property of devices. ID_PATH represents the topological persistent path of a device. It typically contains a subsystem string (pci, usb, platform, etc.) and a subsystem-specific identifier. For PCI devices the path has the form "pci-$domain:$bus:$device.$function", where each variable is an hexadecimal value; for example "pci-0000:0a:00.0". The path of a device can be obtained with "udevadm info /sys/class/net/$dev | grep ID_PATH=" or by looking at the "path" property exported by NetworkManager ("nmcli -f general.path device show $dev"). Each element of the list is a shell wildcard pattern. See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\' are used for optional and mandatory matches and inverting the pattern.</description></property></setting><setting name="802-11-olpc-mesh" description=" OLPC Wireless Mesh Settings" name_upper="OLPC_MESH" alias="olpc-mesh"><property name="channel" name_upper="CHANNEL" type="uint32" default="0" alias="channel"><description-docbook><para> Channel on which the mesh network to join is located.</para></description-docbook><description>Channel on which the mesh network to join is located.</description></property><property name="dhcp-anycast-address" name_upper="DHCP_ANYCAST_ADDRESS" type="byte array" alias="dhcp-anycast"><description-docbook><para> Anycast DHCP MAC address used when requesting an IP address via DHCP. The specific anycast address used determines which DHCP server class answers the request.</para><para> This is currently only implemented by dhclient DHCP plugin.</para></description-docbook><description>Anycast DHCP MAC address used when requesting an IP address via DHCP. The specific anycast address used determines which DHCP server class answers the request. This is currently only implemented by dhclient DHCP plugin.</description></property><property name="ssid" name_upper="SSID" type="byte array" alias="ssid"><description-docbook><para> SSID of the mesh network to join.</para></description-docbook><description>SSID of the mesh network to join.</description></property></setting><setting name="ovs-bridge" description=" OvsBridge Link Settings" name_upper="OVS_BRIDGE"><property name="datapath-type" name_upper="DATAPATH_TYPE" type="string"><description-docbook><para> The data path type. One of "system", "netdev" or empty.</para></description-docbook><description>The data path type. One of "system", "netdev" or empty.</description></property><property name="fail-mode" name_upper="FAIL_MODE" type="string"><description-docbook><para> The bridge failure mode. One of "secure", "standalone" or empty.</para></description-docbook><description>The bridge failure mode. One of "secure", "standalone" or empty.</description></property><property name="mcast-snooping-enable" name_upper="MCAST_SNOOPING_ENABLE" type="boolean" default="FALSE"><description-docbook><para> Enable or disable multicast snooping.</para></description-docbook><description>Enable or disable multicast snooping.</description></property><property name="rstp-enable" name_upper="RSTP_ENABLE" type="boolean" default="FALSE"><description-docbook><para> Enable or disable RSTP.</para></description-docbook><description>Enable or disable RSTP.</description></property><property name="stp-enable" name_upper="STP_ENABLE" type="boolean" default="FALSE"><description-docbook><para> Enable or disable STP.</para></description-docbook><description>Enable or disable STP.</description></property></setting><setting name="ovs-dpdk" description=" OvsDpdk Link Settings" name_upper="OVS_DPDK"><property name="devargs" name_upper="DEVARGS" type="string"><description-docbook><para> Open vSwitch DPDK device arguments.</para></description-docbook><description>Open vSwitch DPDK device arguments.</description></property><property name="n-rxq" name_upper="N_RXQ" type="uint32" default="0"><description-docbook><para> Open vSwitch DPDK number of rx queues. Defaults to zero which means to leave the parameter in OVS unspecified and effectively configures one queue.</para></description-docbook><description>Open vSwitch DPDK number of rx queues. Defaults to zero which means to leave the parameter in OVS unspecified and effectively configures one queue.</description></property></setting><setting name="ovs-interface" description=" Open vSwitch Interface Settings" name_upper="OVS_INTERFACE"><property name="type" name_upper="TYPE" type="string"><description-docbook><para> The interface type. Either "internal", "system", "patch", "dpdk", or empty.</para></description-docbook><description>The interface type. Either "internal", "system", "patch", "dpdk", or empty.</description></property></setting><setting name="ovs-patch" description=" OvsPatch Link Settings" name_upper="OVS_PATCH"><property name="peer" name_upper="PEER" type="string"><description-docbook><para> Specifies the name of the interface for the other side of the patch. The patch on the other side must also set this interface as peer.</para></description-docbook><description>Specifies the name of the interface for the other side of the patch. The patch on the other side must also set this interface as peer.</description></property></setting><setting name="ovs-port" description=" OvsPort Link Settings" name_upper="OVS_PORT"><property name="bond-downdelay" name_upper="BOND_DOWNDELAY" type="uint32" default="0"><description-docbook><para> The time port must be inactive in order to be considered down.</para></description-docbook><description>The time port must be inactive in order to be considered down.</description></property><property name="bond-mode" name_upper="BOND_MODE" type="string"><description-docbook><para> Bonding mode. One of "active-backup", "balance-slb", or "balance-tcp".</para></description-docbook><description>Bonding mode. One of "active-backup", "balance-slb", or "balance-tcp".</description></property><property name="bond-updelay" name_upper="BOND_UPDELAY" type="uint32" default="0"><description-docbook><para> The time port must be active before it starts forwarding traffic.</para></description-docbook><description>The time port must be active before it starts forwarding traffic.</description></property><property name="lacp" name_upper="LACP" type="string"><description-docbook><para> LACP mode. One of "active", "off", or "passive".</para></description-docbook><description>LACP mode. One of "active", "off", or "passive".</description></property><property name="tag" name_upper="TAG" type="uint32" default="0"><description-docbook><para> The VLAN tag in the range 0-4095.</para></description-docbook><description>The VLAN tag in the range 0-4095.</description></property><property name="vlan-mode" name_upper="VLAN_MODE" type="string"><description-docbook><para> The VLAN mode. One of "access", "native-tagged", "native-untagged", "trunk" or unset.</para></description-docbook><description>The VLAN mode. One of "access", "native-tagged", "native-untagged", "trunk" or unset.</description></property></setting><setting name="ppp" description=" Point-to-Point Protocol Settings" name_upper="PPP"><property name="baud" name_upper="BAUD" type="uint32" default="0"><description-docbook><para> If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.</para></description-docbook><description>If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.</description></property><property name="crtscts" name_upper="CRTSCTS" type="boolean" default="FALSE"><description-docbook><para> If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.</para></description-docbook><description>If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.</description></property><property name="lcp-echo-failure" name_upper="LCP_ECHO_FAILURE" type="uint32" default="0"><description-docbook><para> If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The "lcp-echo-interval" property must also be set to a non-zero value if this property is used.</para></description-docbook><description>If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The "lcp-echo-interval" property must also be set to a non-zero value if this property is used.</description></property><property name="lcp-echo-interval" name_upper="LCP_ECHO_INTERVAL" type="uint32" default="0"><description-docbook><para> If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.</para></description-docbook><description>If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.</description></property><property name="mppe-stateful" name_upper="MPPE_STATEFUL" type="boolean" default="FALSE"><description-docbook><para> If TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.</para></description-docbook><description>If TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.</description></property><property name="mru" name_upper="MRU" type="uint32" default="0"><description-docbook><para> If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.</para></description-docbook><description>If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.</description></property><property name="mtu" name_upper="MTU" type="uint32" default="0"><description-docbook><para> If non-zero, instruct pppd to send packets no larger than the specified size.</para></description-docbook><description>If non-zero, instruct pppd to send packets no larger than the specified size.</description></property><property name="no-vj-comp" name_upper="NO_VJ_COMP" type="boolean" default="FALSE"><description-docbook><para> If TRUE, Van Jacobsen TCP header compression will not be requested.</para></description-docbook><description>If TRUE, Van Jacobsen TCP header compression will not be requested.</description></property><property name="noauth" name_upper="NOAUTH" type="boolean" default="TRUE"><description-docbook><para> If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.</para></description-docbook><description>If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.</description></property><property name="nobsdcomp" name_upper="NOBSDCOMP" type="boolean" default="FALSE"><description-docbook><para> If TRUE, BSD compression will not be requested.</para></description-docbook><description>If TRUE, BSD compression will not be requested.</description></property><property name="nodeflate" name_upper="NODEFLATE" type="boolean" default="FALSE"><description-docbook><para> If TRUE, "deflate" compression will not be requested.</para></description-docbook><description>If TRUE, "deflate" compression will not be requested.</description></property><property name="refuse-chap" name_upper="REFUSE_CHAP" type="boolean" default="FALSE"><description-docbook><para> If TRUE, the CHAP authentication method will not be used.</para></description-docbook><description>If TRUE, the CHAP authentication method will not be used.</description></property><property name="refuse-eap" name_upper="REFUSE_EAP" type="boolean" default="FALSE"><description-docbook><para> If TRUE, the EAP authentication method will not be used.</para></description-docbook><description>If TRUE, the EAP authentication method will not be used.</description></property><property name="refuse-mschap" name_upper="REFUSE_MSCHAP" type="boolean" default="FALSE"><description-docbook><para> If TRUE, the MSCHAP authentication method will not be used.</para></description-docbook><description>If TRUE, the MSCHAP authentication method will not be used.</description></property><property name="refuse-mschapv2" name_upper="REFUSE_MSCHAPV2" type="boolean" default="FALSE"><description-docbook><para> If TRUE, the MSCHAPv2 authentication method will not be used.</para></description-docbook><description>If TRUE, the MSCHAPv2 authentication method will not be used.</description></property><property name="refuse-pap" name_upper="REFUSE_PAP" type="boolean" default="FALSE"><description-docbook><para> If TRUE, the PAP authentication method will not be used.</para></description-docbook><description>If TRUE, the PAP authentication method will not be used.</description></property><property name="require-mppe" name_upper="REQUIRE_MPPE" type="boolean" default="FALSE"><description-docbook><para> If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.</para></description-docbook><description>If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.</description></property><property name="require-mppe-128" name_upper="REQUIRE_MPPE_128" type="boolean" default="FALSE"><description-docbook><para> If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required for the PPP session, and the "require-mppe" property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.</para></description-docbook><description>If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required for the PPP session, and the "require-mppe" property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.</description></property></setting><setting name="pppoe" description=" PPP-over-Ethernet Settings" name_upper="PPPOE"><property name="parent" name_upper="PARENT" type="string" alias="parent"><description-docbook><para> If given, specifies the parent interface name on which this PPPoE connection should be created.  If this property is not specified, the connection is activated on the interface specified in "interface-name" of NMSettingConnection.</para></description-docbook><description>If given, specifies the parent interface name on which this PPPoE connection should be created.  If this property is not specified, the connection is activated on the interface specified in "interface-name" of NMSettingConnection.</description></property><property name="password" name_upper="PASSWORD" type="string" alias="password"><description-docbook><para> Password used to authenticate with the PPPoE service.</para></description-docbook><description>Password used to authenticate with the PPPoE service.</description></property><property name="password-flags" name_upper="PASSWORD_FLAGS" type="NMSettingSecretFlags (uint32)"><description-docbook><para> Flags indicating how to handle the "password" property.</para></description-docbook><description>Flags indicating how to handle the "password" property.</description></property><property name="service" name_upper="SERVICE" type="string" alias="service"><description-docbook><para> If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified service.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.</para></description-docbook><description>If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified service.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.</description></property><property name="username" name_upper="USERNAME" type="string" alias="username"><description-docbook><para> Username used to authenticate with the PPPoE service.</para></description-docbook><description>Username used to authenticate with the PPPoE service.</description></property></setting><setting name="proxy" description=" WWW Proxy Settings" name_upper="PROXY"><property name="browser-only" name_upper="BROWSER_ONLY" type="boolean" default="FALSE" alias="browser-only"><description-docbook><para> Whether the proxy configuration is for browser only.</para></description-docbook><description>Whether the proxy configuration is for browser only.</description></property><property name="method" name_upper="METHOD" type="int32" default="0" alias="method"><description-docbook><para> Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)</para></description-docbook><description>Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)</description></property><property name="pac-script" name_upper="PAC_SCRIPT" type="string" alias="pac-script"><description-docbook><para> PAC script for the connection. This is an UTF-8 encoded javascript code that defines a FindProxyForURL() function.</para></description-docbook><description>The PAC script. In the profile this must be an UTF-8 encoded javascript code that defines a FindProxyForURL() function. When setting the property in nmcli, a filename is accepted too. In that case, nmcli will read the content of the file and set the script. The prefixes "file://" and "js://" are supported to explicitly differentiate between the two.</description></property><property name="pac-url" name_upper="PAC_URL" type="string" alias="pac-url"><description-docbook><para> PAC URL for obtaining PAC file.</para></description-docbook><description>PAC URL for obtaining PAC file.</description></property></setting><setting name="serial" description=" Serial Link Settings" name_upper="SERIAL"><property name="baud" name_upper="BAUD" type="uint32" default="57600"><description-docbook><para> Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.</para></description-docbook><description>Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.</description></property><property name="bits" name_upper="BITS" type="uint32" default="8"><description-docbook><para> Byte-width of the serial communication. The 8 in "8n1" for example.</para></description-docbook><description>Byte-width of the serial communication. The 8 in "8n1" for example.</description></property><property name="parity" name_upper="PARITY" type="NMSettingSerialParity (byte)"><description-docbook><para> Parity setting of the serial port.</para></description-docbook><description>Parity setting of the serial port.</description></property><property name="send-delay" name_upper="SEND_DELAY" type="uint64" default="0"><description-docbook><para> Time to delay between each byte sent to the modem, in microseconds.</para></description-docbook><description>Time to delay between each byte sent to the modem, in microseconds.</description></property><property name="stopbits" name_upper="STOPBITS" type="uint32" default="1"><description-docbook><para> Number of stop bits for communication on the serial port.  Either 1 or 2. The 1 in "8n1" for example.</para></description-docbook><description>Number of stop bits for communication on the serial port.  Either 1 or 2. The 1 in "8n1" for example.</description></property></setting><setting name="sriov" description=" SR-IOV settings" name_upper="SRIOV"><property name="autoprobe-drivers" name_upper="AUTOPROBE_DRIVERS" type="NMTernary (int32)"><description-docbook><para> Whether to autoprobe virtual functions by a compatible driver.</para><para> If set to NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver and if this succeeds a new network interface will be instantiated for each VF.</para><para> If set to NM_TERNARY_FALSE (0), VFs will not be claimed and no network interfaces will be created for them.</para><para> When set to NM_TERNARY_DEFAULT (-1), the global default is used; in case the global default is unspecified it is assumed to be NM_TERNARY_TRUE (1).</para></description-docbook><description>Whether to autoprobe virtual functions by a compatible driver. If set to NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver and if this succeeds a new network interface will be instantiated for each VF. If set to NM_TERNARY_FALSE (0), VFs will not be claimed and no network interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), the global default is used; in case the global default is unspecified it is assumed to be NM_TERNARY_TRUE (1).</description></property><property name="total-vfs" name_upper="TOTAL_VFS" type="uint32" default="0"><description-docbook><para> The total number of virtual functions to create.</para><para> Note that when the sriov setting is present NetworkManager enforces the number of virtual functions on the interface (also when it is zero) during activation and resets it upon deactivation. To prevent any changes to SR-IOV parameters don't add a sriov setting to the connection.</para></description-docbook><description>The total number of virtual functions to create. Note that when the sriov setting is present NetworkManager enforces the number of virtual functions on the interface (also when it is zero) during activation and resets it upon deactivation. To prevent any changes to SR-IOV parameters don't add a sriov setting to the connection.</description></property><property name="vfs" name_upper="VFS" type="array of vardict"><description-docbook><para> Array of virtual function descriptors.</para><para> Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF.</para><para> When represented as string a VF is in the form:</para><para> "INDEX [ATTR=VALUE[ ATTR=VALUE]...]".</para><para> for example:</para><para> "2 mac=00:11:22:33:44:55 spoof-check=true".</para><para> Multiple VFs can be specified using a comma as separator. Currently, the following attributes are supported: mac, spoof-check, trust, min-tx-rate, max-tx-rate, vlans.</para><para> The "vlans" attribute is represented as a semicolon-separated list of VLAN descriptors, where each descriptor has the form</para><para> "ID[.PRIORITY[.PROTO]]".</para><para> PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.</para></description-docbook><description>Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: "INDEX [ATTR=VALUE[ ATTR=VALUE]...]". for example: "2 mac=00:11:22:33:44:55 spoof-check=true". Multiple VFs can be specified using a comma as separator. Currently, the following attributes are supported: mac, spoof-check, trust, min-tx-rate, max-tx-rate, vlans. The "vlans" attribute is represented as a semicolon-separated list of VLAN descriptors, where each descriptor has the form "ID[.PRIORITY[.PROTO]]". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.</description></property></setting><setting name="tc" description=" Linux Traffic Control Settings" name_upper="TC_CONFIG"><property name="qdiscs" name_upper="QDISCS" type="GPtrArray(NMTCQdisc)"><description-docbook>
+</para></description-docbook><description>A comma separated list of routing rules for policy routing.</description></property><property name="token" name_upper="TOKEN" type="string"><description-docbook><para> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</para></description-docbook><description>Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</description></property></setting><setting name="ip-tunnel" description=" IP Tunneling Settings" name_upper="IP_TUNNEL"><property name="encapsulation-limit" name_upper="ENCAPSULATION_LIMIT" type="uint32" default="0"><description-docbook><para> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</para></description-docbook><description>How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</description></property><property name="flags" name_upper="FLAGS" type="uint32" default="0"><description-docbook><para> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</para></description-docbook><description>Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</description></property><property name="flow-label" name_upper="FLOW_LABEL" type="uint32" default="0"><description-docbook><para> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</para></description-docbook><description>The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</description></property><property name="input-key" name_upper="INPUT_KEY" type="string"><description-docbook><para> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook><description>The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description></property><property name="local" name_upper="LOCAL" type="string" alias="local"><description-docbook><para> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</para></description-docbook><description>The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</description></property><property name="mode" name_upper="MODE" type="uint32" default="0" alias="mode"><description-docbook><para> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</para></description-docbook><description>The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</description></property><property name="mtu" name_upper="MTU" type="uint32" default="0"><description-docbook><para> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</para></description-docbook><description>If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</description></property><property name="output-key" name_upper="OUTPUT_KEY" type="string"><description-docbook><para> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook><description>The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description></property><property name="parent" name_upper="PARENT" type="string" alias="dev"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</para></description-docbook><description>If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</description></property><property name="path-mtu-discovery" name_upper="PATH_MTU_DISCOVERY" type="boolean" default="TRUE"><description-docbook><para> Whether to enable Path MTU Discovery on this tunnel.</para></description-docbook><description>Whether to enable Path MTU Discovery on this tunnel.</description></property><property name="remote" name_upper="REMOTE" type="string" alias="remote"><description-docbook><para> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</para></description-docbook><description>The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</description></property><property name="tos" name_upper="TOS" type="uint32" default="0"><description-docbook><para> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</para></description-docbook><description>The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</description></property><property name="ttl" name_upper="TTL" type="uint32" default="0"><description-docbook><para> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</para></description-docbook><description>The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</description></property></setting><setting name="macsec" description=" MACSec Settings" name_upper="MACSEC"><property name="encrypt" name_upper="ENCRYPT" type="boolean" default="TRUE" alias="encrypt"><description-docbook><para> Whether the transmitted traffic must be encrypted.</para></description-docbook><description>Whether the transmitted traffic must be encrypted.</description></property><property name="mka-cak" name_upper="MKA_CAK" type="string" alias="cak"><description-docbook><para> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</para></description-docbook><description>The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</description></property><property name="mka-cak-flags" name_upper="MKA_CAK_FLAGS" type="NMSettingSecretFlags (uint32)"><description-docbook><para> Flags indicating how to handle the "mka-cak" property.</para></description-docbook><description>Flags indicating how to handle the "mka-cak" property.</description></property><property name="mka-ckn" name_upper="MKA_CKN" type="string" alias="ckn"><description-docbook><para> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</para></description-docbook><description>The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</description></property><property name="mode" name_upper="MODE" type="int32" default="0" alias="mode"><description-docbook><para> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</para></description-docbook><description>Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</description></property><property name="parent" name_upper="PARENT" type="string" alias="dev"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook><description>If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description></property><property name="port" name_upper="PORT" type="int32" default="1" alias="port"><description-docbook><para> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</para></description-docbook><description>The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</description></property><property name="send-sci" name_upper="SEND_SCI" type="boolean" default="TRUE"><description-docbook><para> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</para></description-docbook><description>Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</description></property><property name="validation" name_upper="VALIDATION" type="int32" default="2"><description-docbook><para> Specifies the validation mode for incoming frames.</para></description-docbook><description>Specifies the validation mode for incoming frames.</description></property></setting><setting name="macvlan" description=" MAC VLAN Settings" name_upper="MACVLAN"><property name="mode" name_upper="MODE" type="uint32" default="0" alias="mode"><description-docbook><para> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</para></description-docbook><description>The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</description></property><property name="parent" name_upper="PARENT" type="string" alias="dev"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook><description>If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description></property><property name="promiscuous" name_upper="PROMISCUOUS" type="boolean" default="TRUE"><description-docbook><para> Whether the interface should be put in promiscuous mode.</para></description-docbook><description>Whether the interface should be put in promiscuous mode.</description></property><property name="tap" name_upper="TAP" type="boolean" default="FALSE" alias="tap"><description-docbook><para> Whether the interface should be a MACVTAP.</para></description-docbook><description>Whether the interface should be a MACVTAP.</description></property></setting><setting name="match" description=" Match settings" name_upper="MATCH"><property name="driver" name_upper="DRIVER" type="array of string"><description-docbook><para> A list of driver names to match. Each element is a shell wildcard pattern.</para><para> See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.</para></description-docbook><description>A list of driver names to match. Each element is a shell wildcard pattern. See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\' are used for optional and mandatory matches and inverting the pattern.</description></property><property name="interface-name" name_upper="INTERFACE_NAME" type="array of string"><description-docbook><para> A list of interface names to match. Each element is a shell wildcard pattern.</para><para> An element can be prefixed with a pipe symbol (|) or an ampersand (&amp;). The former means that the element is optional and the latter means that it is mandatory. If there are any optional elements, than the match evaluates to true if at least one of the optional element matches (logical OR). If there are any mandatory elements, then they all must match (logical AND). By default, an element is optional. This means that an element "foo" behaves the same as "|foo". An element can also be inverted with exclamation mark (!) between the pipe symbol (or the ampersand) and before the pattern. Note that "!foo" is a shortcut for the mandatory match "&amp;!foo". Finally, a backslash can be used at the beginning of the element (after the optional special characters) to escape the start of the pattern. For example, "&amp;\\!a" is an mandatory match for literally "!a".</para></description-docbook><description>A list of interface names to match. Each element is a shell wildcard pattern. An element can be prefixed with a pipe symbol (|) or an ampersand (&amp;). The former means that the element is optional and the latter means that it is mandatory. If there are any optional elements, than the match evaluates to true if at least one of the optional element matches (logical OR). If there are any mandatory elements, then they all must match (logical AND). By default, an element is optional. This means that an element "foo" behaves the same as "|foo". An element can also be inverted with exclamation mark (!) between the pipe symbol (or the ampersand) and before the pattern. Note that "!foo" is a shortcut for the mandatory match "&amp;!foo". Finally, a backslash can be used at the beginning of the element (after the optional special characters) to escape the start of the pattern. For example, "&amp;\!a" is an mandatory match for literally "!a".</description></property><property name="kernel-command-line" name_upper="KERNEL_COMMAND_LINE" type="array of string"><description-docbook><para> A list of kernel command line arguments to match. This may be used to check whether a specific kernel command line option is set (or unset, if prefixed with the exclamation mark). The argument must either be a single word, or an assignment (i.e. two words, joined by "="). In the former case the kernel command line is searched for the word appearing as is, or as left hand side of an assignment. In the latter case, the exact assignment is looked for with right and left hand side matching. Wildcard patterns are not supported.</para><para> See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the match.</para></description-docbook><description>A list of kernel command line arguments to match. This may be used to check whether a specific kernel command line option is set (or unset, if prefixed with the exclamation mark). The argument must either be a single word, or an assignment (i.e. two words, joined by "="). In the former case the kernel command line is searched for the word appearing as is, or as left hand side of an assignment. In the latter case, the exact assignment is looked for with right and left hand side matching. Wildcard patterns are not supported. See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\' are used for optional and mandatory matches and inverting the match.</description></property><property name="path" name_upper="PATH" type="array of string"><description-docbook><para> A list of paths to match against the ID_PATH udev property of devices. ID_PATH represents the topological persistent path of a device. It typically contains a subsystem string (pci, usb, platform, etc.) and a subsystem-specific identifier.</para><para> For PCI devices the path has the form "pci-$domain:$bus:$device.$function", where each variable is an hexadecimal value; for example "pci-0000:0a:00.0".</para><para> The path of a device can be obtained with "udevadm info /sys/class/net/$dev | grep ID_PATH=" or by looking at the "path" property exported by NetworkManager ("nmcli -f general.path device show $dev").</para><para> Each element of the list is a shell wildcard pattern.</para><para> See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.</para></description-docbook><description>A list of paths to match against the ID_PATH udev property of devices. ID_PATH represents the topological persistent path of a device. It typically contains a subsystem string (pci, usb, platform, etc.) and a subsystem-specific identifier. For PCI devices the path has the form "pci-$domain:$bus:$device.$function", where each variable is an hexadecimal value; for example "pci-0000:0a:00.0". The path of a device can be obtained with "udevadm info /sys/class/net/$dev | grep ID_PATH=" or by looking at the "path" property exported by NetworkManager ("nmcli -f general.path device show $dev"). Each element of the list is a shell wildcard pattern. See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\' are used for optional and mandatory matches and inverting the pattern.</description></property></setting><setting name="802-11-olpc-mesh" description=" OLPC Wireless Mesh Settings" name_upper="OLPC_MESH" alias="olpc-mesh"><property name="channel" name_upper="CHANNEL" type="uint32" default="0" alias="channel"><description-docbook><para> Channel on which the mesh network to join is located.</para></description-docbook><description>Channel on which the mesh network to join is located.</description></property><property name="dhcp-anycast-address" name_upper="DHCP_ANYCAST_ADDRESS" type="byte array" alias="dhcp-anycast"><description-docbook><para> Anycast DHCP MAC address used when requesting an IP address via DHCP. The specific anycast address used determines which DHCP server class answers the request.</para><para> This is currently only implemented by dhclient DHCP plugin.</para></description-docbook><description>Anycast DHCP MAC address used when requesting an IP address via DHCP. The specific anycast address used determines which DHCP server class answers the request. This is currently only implemented by dhclient DHCP plugin.</description></property><property name="ssid" name_upper="SSID" type="byte array" alias="ssid"><description-docbook><para> SSID of the mesh network to join.</para></description-docbook><description>SSID of the mesh network to join.</description></property></setting><setting name="ovs-bridge" description=" OvsBridge Link Settings" name_upper="OVS_BRIDGE"><property name="datapath-type" name_upper="DATAPATH_TYPE" type="string"><description-docbook><para> The data path type. One of "system", "netdev" or empty.</para></description-docbook><description>The data path type. One of "system", "netdev" or empty.</description></property><property name="fail-mode" name_upper="FAIL_MODE" type="string"><description-docbook><para> The bridge failure mode. One of "secure", "standalone" or empty.</para></description-docbook><description>The bridge failure mode. One of "secure", "standalone" or empty.</description></property><property name="mcast-snooping-enable" name_upper="MCAST_SNOOPING_ENABLE" type="boolean" default="FALSE"><description-docbook><para> Enable or disable multicast snooping.</para></description-docbook><description>Enable or disable multicast snooping.</description></property><property name="rstp-enable" name_upper="RSTP_ENABLE" type="boolean" default="FALSE"><description-docbook><para> Enable or disable RSTP.</para></description-docbook><description>Enable or disable RSTP.</description></property><property name="stp-enable" name_upper="STP_ENABLE" type="boolean" default="FALSE"><description-docbook><para> Enable or disable STP.</para></description-docbook><description>Enable or disable STP.</description></property></setting><setting name="ovs-dpdk" description=" OvsDpdk Link Settings" name_upper="OVS_DPDK"><property name="devargs" name_upper="DEVARGS" type="string"><description-docbook><para> Open vSwitch DPDK device arguments.</para></description-docbook><description>Open vSwitch DPDK device arguments.</description></property><property name="n-rxq" name_upper="N_RXQ" type="uint32" default="0"><description-docbook><para> Open vSwitch DPDK number of rx queues. Defaults to zero which means to leave the parameter in OVS unspecified and effectively configures one queue.</para></description-docbook><description>Open vSwitch DPDK number of rx queues. Defaults to zero which means to leave the parameter in OVS unspecified and effectively configures one queue.</description></property></setting><setting name="ovs-interface" description=" Open vSwitch Interface Settings" name_upper="OVS_INTERFACE"><property name="type" name_upper="TYPE" type="string"><description-docbook><para> The interface type. Either "internal", "system", "patch", "dpdk", or empty.</para></description-docbook><description>The interface type. Either "internal", "system", "patch", "dpdk", or empty.</description></property></setting><setting name="ovs-patch" description=" OvsPatch Link Settings" name_upper="OVS_PATCH"><property name="peer" name_upper="PEER" type="string"><description-docbook><para> Specifies the name of the interface for the other side of the patch. The patch on the other side must also set this interface as peer.</para></description-docbook><description>Specifies the name of the interface for the other side of the patch. The patch on the other side must also set this interface as peer.</description></property></setting><setting name="ovs-port" description=" OvsPort Link Settings" name_upper="OVS_PORT"><property name="bond-downdelay" name_upper="BOND_DOWNDELAY" type="uint32" default="0"><description-docbook><para> The time port must be inactive in order to be considered down.</para></description-docbook><description>The time port must be inactive in order to be considered down.</description></property><property name="bond-mode" name_upper="BOND_MODE" type="string"><description-docbook><para> Bonding mode. One of "active-backup", "balance-slb", or "balance-tcp".</para></description-docbook><description>Bonding mode. One of "active-backup", "balance-slb", or "balance-tcp".</description></property><property name="bond-updelay" name_upper="BOND_UPDELAY" type="uint32" default="0"><description-docbook><para> The time port must be active before it starts forwarding traffic.</para></description-docbook><description>The time port must be active before it starts forwarding traffic.</description></property><property name="lacp" name_upper="LACP" type="string"><description-docbook><para> LACP mode. One of "active", "off", or "passive".</para></description-docbook><description>LACP mode. One of "active", "off", or "passive".</description></property><property name="tag" name_upper="TAG" type="uint32" default="0"><description-docbook><para> The VLAN tag in the range 0-4095.</para></description-docbook><description>The VLAN tag in the range 0-4095.</description></property><property name="vlan-mode" name_upper="VLAN_MODE" type="string"><description-docbook><para> The VLAN mode. One of "access", "native-tagged", "native-untagged", "trunk" or unset.</para></description-docbook><description>The VLAN mode. One of "access", "native-tagged", "native-untagged", "trunk" or unset.</description></property></setting><setting name="ppp" description=" Point-to-Point Protocol Settings" name_upper="PPP"><property name="baud" name_upper="BAUD" type="uint32" default="0"><description-docbook><para> If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.</para></description-docbook><description>If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.</description></property><property name="crtscts" name_upper="CRTSCTS" type="boolean" default="FALSE"><description-docbook><para> If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.</para></description-docbook><description>If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.</description></property><property name="lcp-echo-failure" name_upper="LCP_ECHO_FAILURE" type="uint32" default="0"><description-docbook><para> If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The "lcp-echo-interval" property must also be set to a non-zero value if this property is used.</para></description-docbook><description>If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The "lcp-echo-interval" property must also be set to a non-zero value if this property is used.</description></property><property name="lcp-echo-interval" name_upper="LCP_ECHO_INTERVAL" type="uint32" default="0"><description-docbook><para> If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.</para></description-docbook><description>If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.</description></property><property name="mppe-stateful" name_upper="MPPE_STATEFUL" type="boolean" default="FALSE"><description-docbook><para> If TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.</para></description-docbook><description>If TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.</description></property><property name="mru" name_upper="MRU" type="uint32" default="0"><description-docbook><para> If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.</para></description-docbook><description>If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.</description></property><property name="mtu" name_upper="MTU" type="uint32" default="0"><description-docbook><para> If non-zero, instruct pppd to send packets no larger than the specified size.</para></description-docbook><description>If non-zero, instruct pppd to send packets no larger than the specified size.</description></property><property name="no-vj-comp" name_upper="NO_VJ_COMP" type="boolean" default="FALSE"><description-docbook><para> If TRUE, Van Jacobsen TCP header compression will not be requested.</para></description-docbook><description>If TRUE, Van Jacobsen TCP header compression will not be requested.</description></property><property name="noauth" name_upper="NOAUTH" type="boolean" default="TRUE"><description-docbook><para> If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.</para></description-docbook><description>If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.</description></property><property name="nobsdcomp" name_upper="NOBSDCOMP" type="boolean" default="FALSE"><description-docbook><para> If TRUE, BSD compression will not be requested.</para></description-docbook><description>If TRUE, BSD compression will not be requested.</description></property><property name="nodeflate" name_upper="NODEFLATE" type="boolean" default="FALSE"><description-docbook><para> If TRUE, "deflate" compression will not be requested.</para></description-docbook><description>If TRUE, "deflate" compression will not be requested.</description></property><property name="refuse-chap" name_upper="REFUSE_CHAP" type="boolean" default="FALSE"><description-docbook><para> If TRUE, the CHAP authentication method will not be used.</para></description-docbook><description>If TRUE, the CHAP authentication method will not be used.</description></property><property name="refuse-eap" name_upper="REFUSE_EAP" type="boolean" default="FALSE"><description-docbook><para> If TRUE, the EAP authentication method will not be used.</para></description-docbook><description>If TRUE, the EAP authentication method will not be used.</description></property><property name="refuse-mschap" name_upper="REFUSE_MSCHAP" type="boolean" default="FALSE"><description-docbook><para> If TRUE, the MSCHAP authentication method will not be used.</para></description-docbook><description>If TRUE, the MSCHAP authentication method will not be used.</description></property><property name="refuse-mschapv2" name_upper="REFUSE_MSCHAPV2" type="boolean" default="FALSE"><description-docbook><para> If TRUE, the MSCHAPv2 authentication method will not be used.</para></description-docbook><description>If TRUE, the MSCHAPv2 authentication method will not be used.</description></property><property name="refuse-pap" name_upper="REFUSE_PAP" type="boolean" default="FALSE"><description-docbook><para> If TRUE, the PAP authentication method will not be used.</para></description-docbook><description>If TRUE, the PAP authentication method will not be used.</description></property><property name="require-mppe" name_upper="REQUIRE_MPPE" type="boolean" default="FALSE"><description-docbook><para> If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.</para></description-docbook><description>If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.</description></property><property name="require-mppe-128" name_upper="REQUIRE_MPPE_128" type="boolean" default="FALSE"><description-docbook><para> If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required for the PPP session, and the "require-mppe" property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.</para></description-docbook><description>If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required for the PPP session, and the "require-mppe" property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.</description></property></setting><setting name="pppoe" description=" PPP-over-Ethernet Settings" name_upper="PPPOE"><property name="parent" name_upper="PARENT" type="string" alias="parent"><description-docbook><para> If given, specifies the parent interface name on which this PPPoE connection should be created.  If this property is not specified, the connection is activated on the interface specified in "interface-name" of NMSettingConnection.</para></description-docbook><description>If given, specifies the parent interface name on which this PPPoE connection should be created.  If this property is not specified, the connection is activated on the interface specified in "interface-name" of NMSettingConnection.</description></property><property name="password" name_upper="PASSWORD" type="string" alias="password"><description-docbook><para> Password used to authenticate with the PPPoE service.</para></description-docbook><description>Password used to authenticate with the PPPoE service.</description></property><property name="password-flags" name_upper="PASSWORD_FLAGS" type="NMSettingSecretFlags (uint32)"><description-docbook><para> Flags indicating how to handle the "password" property.</para></description-docbook><description>Flags indicating how to handle the "password" property.</description></property><property name="service" name_upper="SERVICE" type="string" alias="service"><description-docbook><para> If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified service.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.</para></description-docbook><description>If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified service.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.</description></property><property name="username" name_upper="USERNAME" type="string" alias="username"><description-docbook><para> Username used to authenticate with the PPPoE service.</para></description-docbook><description>Username used to authenticate with the PPPoE service.</description></property></setting><setting name="proxy" description=" WWW Proxy Settings" name_upper="PROXY"><property name="browser-only" name_upper="BROWSER_ONLY" type="boolean" default="FALSE" alias="browser-only"><description-docbook><para> Whether the proxy configuration is for browser only.</para></description-docbook><description>Whether the proxy configuration is for browser only.</description></property><property name="method" name_upper="METHOD" type="int32" default="0" alias="method"><description-docbook><para> Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)</para></description-docbook><description>Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)</description></property><property name="pac-script" name_upper="PAC_SCRIPT" type="string" alias="pac-script"><description-docbook><para> PAC script for the connection. This is an UTF-8 encoded javascript code that defines a FindProxyForURL() function.</para></description-docbook><description>The PAC script. In the profile this must be an UTF-8 encoded javascript code that defines a FindProxyForURL() function. When setting the property in nmcli, a filename is accepted too. In that case, nmcli will read the content of the file and set the script. The prefixes "file://" and "js://" are supported to explicitly differentiate between the two.</description></property><property name="pac-url" name_upper="PAC_URL" type="string" alias="pac-url"><description-docbook><para> PAC URL for obtaining PAC file.</para></description-docbook><description>PAC URL for obtaining PAC file.</description></property></setting><setting name="serial" description=" Serial Link Settings" name_upper="SERIAL"><property name="baud" name_upper="BAUD" type="uint32" default="57600"><description-docbook><para> Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.</para></description-docbook><description>Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.</description></property><property name="bits" name_upper="BITS" type="uint32" default="8"><description-docbook><para> Byte-width of the serial communication. The 8 in "8n1" for example.</para></description-docbook><description>Byte-width of the serial communication. The 8 in "8n1" for example.</description></property><property name="parity" name_upper="PARITY" type="NMSettingSerialParity (byte)"><description-docbook><para> Parity setting of the serial port.</para></description-docbook><description>Parity setting of the serial port.</description></property><property name="send-delay" name_upper="SEND_DELAY" type="uint64" default="0"><description-docbook><para> Time to delay between each byte sent to the modem, in microseconds.</para></description-docbook><description>Time to delay between each byte sent to the modem, in microseconds.</description></property><property name="stopbits" name_upper="STOPBITS" type="uint32" default="1"><description-docbook><para> Number of stop bits for communication on the serial port.  Either 1 or 2. The 1 in "8n1" for example.</para></description-docbook><description>Number of stop bits for communication on the serial port.  Either 1 or 2. The 1 in "8n1" for example.</description></property></setting><setting name="sriov" description=" SR-IOV settings" name_upper="SRIOV"><property name="autoprobe-drivers" name_upper="AUTOPROBE_DRIVERS" type="NMTernary (int32)"><description-docbook><para> Whether to autoprobe virtual functions by a compatible driver.</para><para> If set to NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver and if this succeeds a new network interface will be instantiated for each VF.</para><para> If set to NM_TERNARY_FALSE (0), VFs will not be claimed and no network interfaces will be created for them.</para><para> When set to NM_TERNARY_DEFAULT (-1), the global default is used; in case the global default is unspecified it is assumed to be NM_TERNARY_TRUE (1).</para></description-docbook><description>Whether to autoprobe virtual functions by a compatible driver. If set to NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver and if this succeeds a new network interface will be instantiated for each VF. If set to NM_TERNARY_FALSE (0), VFs will not be claimed and no network interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), the global default is used; in case the global default is unspecified it is assumed to be NM_TERNARY_TRUE (1).</description></property><property name="total-vfs" name_upper="TOTAL_VFS" type="uint32" default="0"><description-docbook><para> The total number of virtual functions to create.</para><para> Note that when the sriov setting is present NetworkManager enforces the number of virtual functions on the interface (also when it is zero) during activation and resets it upon deactivation. To prevent any changes to SR-IOV parameters don't add a sriov setting to the connection.</para></description-docbook><description>The total number of virtual functions to create. Note that when the sriov setting is present NetworkManager enforces the number of virtual functions on the interface (also when it is zero) during activation and resets it upon deactivation. To prevent any changes to SR-IOV parameters don't add a sriov setting to the connection.</description></property><property name="vfs" name_upper="VFS" type="array of vardict"><description-docbook><para> Array of virtual function descriptors.</para><para> Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF.</para><para> When represented as string a VF is in the form:</para><para> "INDEX [ATTR=VALUE[ ATTR=VALUE]...]".</para><para> for example:</para><para> "2 mac=00:11:22:33:44:55 spoof-check=true".</para><para> Multiple VFs can be specified using a comma as separator. Currently, the following attributes are supported: mac, spoof-check, trust, min-tx-rate, max-tx-rate, vlans.</para><para> The "vlans" attribute is represented as a semicolon-separated list of VLAN descriptors, where each descriptor has the form</para><para> "ID[.PRIORITY[.PROTO]]".</para><para> PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.</para></description-docbook><description>Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: "INDEX [ATTR=VALUE[ ATTR=VALUE]...]". for example: "2 mac=00:11:22:33:44:55 spoof-check=true". Multiple VFs can be specified using a comma as separator. Currently, the following attributes are supported: mac, spoof-check, trust, min-tx-rate, max-tx-rate, vlans. The "vlans" attribute is represented as a semicolon-separated list of VLAN descriptors, where each descriptor has the form "ID[.PRIORITY[.PROTO]]". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.</description></property></setting><setting name="tc" description=" Linux Traffic Control Settings" name_upper="TC_CONFIG"><property name="qdiscs" name_upper="QDISCS" type="GPtrArray(NMTCQdisc)"><description-docbook>
 <para>
 Array of TC queueing disciplines. qdisc is a basic block in the
 Linux traffic control subsystem
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index 90fa6662..cd438540 100644
--- a/man/nm-settings-ifcfg-rh.5
+++ b/man/nm-settings-ifcfg-rh.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-ifcfg-rh
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.40.6
+.\"    Source: NetworkManager 1.40.8
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.40\&.6" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.40\&.8" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index 8106d703..3834ec51 100644
--- a/man/nm-settings-ifcfg-rh.xml
+++ b/man/nm-settings-ifcfg-rh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<refentry id="nm-settings-ifcfg-rh"><refentryinfo><title>nm-settings-ifcfg-rh</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.40.6</refmiscinfo></refmeta><refnamediv><refname>nm-settings-ifcfg-rh</refname><refpurpose>Description of <emphasis>ifcfg-rh</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
+<refentry id="nm-settings-ifcfg-rh"><refentryinfo><title>nm-settings-ifcfg-rh</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.40.8</refmiscinfo></refmeta><refnamediv><refname>nm-settings-ifcfg-rh</refname><refpurpose>Description of <emphasis>ifcfg-rh</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5
index 90ee1456..c08e2c8f 100644
--- a/man/nm-settings-keyfile.5
+++ b/man/nm-settings-keyfile.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-keyfile
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.40.6
+.\"    Source: NetworkManager 1.40.8
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.40\&.6" "Configuration"
+.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.40\&.8" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index 45e78cab..b3487914 100644
--- a/man/nm-settings-keyfile.xml
+++ b/man/nm-settings-keyfile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<refentry id="nm-settings-keyfile"><refentryinfo><title>nm-settings-keyfile</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.40.6</refmiscinfo></refmeta><refnamediv><refname>nm-settings-keyfile</refname><refpurpose>Description of <emphasis>keyfile</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
+<refentry id="nm-settings-keyfile"><refentryinfo><title>nm-settings-keyfile</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.40.8</refmiscinfo></refmeta><refnamediv><refname>nm-settings-keyfile</refname><refpurpose>Description of <emphasis>keyfile</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
diff --git a/man/nm-settings-nmcli.5 b/man/nm-settings-nmcli.5
index 20b571b6..d9c1bd4f 100644
--- a/man/nm-settings-nmcli.5
+++ b/man/nm-settings-nmcli.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-nmcli
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.40.6
+.\"    Source: NetworkManager 1.40.8
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.40\&.6" "Configuration"
+.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.40\&.8" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -2924,7 +2924,7 @@ Format: boolean
 .RS 4
 Alias: cak
 .sp
-The pre\-shared CAK (Connectivity Association Key) for MACsec Key Agreement\&.
+The pre\-shared CAK (Connectivity Association Key) for MACsec Key Agreement\&. Must be a string of 32 hexadecimal characters\&.
 .sp
 Format: string
 .RE
@@ -2940,7 +2940,7 @@ Format: NMSettingSecretFlags (uint32)
 .RS 4
 Alias: ckn
 .sp
-The pre\-shared CKN (Connectivity\-association Key Name) for MACsec Key Agreement\&.
+The pre\-shared CKN (Connectivity\-association Key Name) for MACsec Key Agreement\&. Must be a string of hexadecimal characters with a even length between 2 and 64\&.
 .sp
 Format: string
 .RE
diff --git a/man/nm-settings-nmcli.xml b/man/nm-settings-nmcli.xml
index a0bfd8d9..2a77ffa8 100644
--- a/man/nm-settings-nmcli.xml
+++ b/man/nm-settings-nmcli.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<refentry id="nm-settings-nmcli"><refentryinfo><title>nm-settings-nmcli</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-nmcli</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.40.6</refmiscinfo></refmeta><refnamediv><refname>nm-settings-nmcli</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles for nmcli</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
+<refentry id="nm-settings-nmcli"><refentryinfo><title>nm-settings-nmcli</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-nmcli</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.40.8</refmiscinfo></refmeta><refnamediv><refname>nm-settings-nmcli</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles for nmcli</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
           NetworkManager is based on a concept of connection profiles, sometimes referred to as
           connections only. These connection profiles contain a network configuration. When
           NetworkManager activates a connection profile on a network device the configuration will
@@ -492,10 +492,10 @@ Example: <literal>priority 5 from 1:2:3::5/128 table 45</literal>
         <variablelist><varlistentry><term><option id="nm-settings-nmcli.property.macsec.encrypt">encrypt</option></term><listitem><para>
             Alias: encrypt</para><para> Whether the transmitted traffic must be encrypted.</para><para>
             Format: boolean</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.macsec.mka-cak">mka-cak</option></term><listitem><para>
-            Alias: cak</para><para> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</para><para>
+            Alias: cak</para><para> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</para><para>
             Format: string</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.macsec.mka-cak-flags">mka-cak-flags</option></term><listitem><para> Flags indicating how to handle the "mka-cak" property.</para><para>
             Format: NMSettingSecretFlags (uint32)</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.macsec.mka-ckn">mka-ckn</option></term><listitem><para>
-            Alias: ckn</para><para> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</para><para>
+            Alias: ckn</para><para> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</para><para>
             Format: string</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.macsec.mode">mode</option></term><listitem><para>
             Alias: mode</para><para> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</para><para>
             Format: int32</para></listitem></varlistentry><varlistentry><term><option id="nm-settings-nmcli.property.macsec.parent">parent</option></term><listitem><para>
diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7
index 65bcd698..d7c97a67 100644
--- a/man/nmcli-examples.7
+++ b/man/nmcli-examples.7
@@ -2,12 +2,12 @@
 .\"     Title: nmcli-examples
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.40.6
+.\"    Source: NetworkManager 1.40.8
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.40\&.6" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.40\&.8" "Examples"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmcli.1 b/man/nmcli.1
index f11bc34f..409a59ad 100644
--- a/man/nmcli.1
+++ b/man/nmcli.1
@@ -2,12 +2,12 @@
 .\"     Title: nmcli
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.40.6
+.\"    Source: NetworkManager 1.40.8
 .\"  Language: English
 .\"
-.TH "NMCLI" "1" "" "NetworkManager 1\&.40\&.6" "General Commands Manual"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.40\&.8" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmtui.1 b/man/nmtui.1
index f126a124..5d74d326 100644
--- a/man/nmtui.1
+++ b/man/nmtui.1
@@ -2,12 +2,12 @@
 .\"     Title: nmtui
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/30/2022
+.\"      Date: 12/16/2022
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.40.6
+.\"    Source: NetworkManager 1.40.8
 .\"  Language: English
 .\"
-.TH "NMTUI" "1" "" "NetworkManager 1\&.40\&.6" "General Commands Manual"
+.TH "NMTUI" "1" "" "NetworkManager 1\&.40\&.8" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/meson.build b/meson.build
index fbf4bf8d..465558be 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ project(
 #  - add corresponding NM_VERSION_x_y_z macros in
 #    "src/libnm-core-public/nm-version-macros.h.in"
 #  - update number in configure.ac
-  version: '1.40.6',
+  version: '1.40.8',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
diff --git a/po/NetworkManager.pot b/po/NetworkManager.pot
index 495cdac6..29434902 100644
--- a/po/NetworkManager.pot
+++ b/po/NetworkManager.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager 1.40.6\n"
+"Project-Id-Version: NetworkManager 1.40.8\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/NetworkManager/"
 "NetworkManager/issues\n"
-"POT-Creation-Date: 2022-11-30 16:29+0100\n"
+"POT-Creation-Date: 2022-12-16 15:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1403,7 +1403,7 @@ msgid "property is not specified"
 msgstr ""
 
 #: src/libnm-core-impl/nm-setting-6lowpan.c:103
-#: src/libnm-core-impl/nm-setting-macsec.c:306
+#: src/libnm-core-impl/nm-setting-macsec.c:317
 #: src/libnm-core-impl/nm-setting-vlan.c:609
 #, c-format
 msgid "'%s' value doesn't match '%s=%s'"
@@ -1411,7 +1411,7 @@ msgstr ""
 
 #: src/libnm-core-impl/nm-setting-6lowpan.c:119
 #: src/libnm-core-impl/nm-setting-ip-tunnel.c:360
-#: src/libnm-core-impl/nm-setting-macsec.c:322
+#: src/libnm-core-impl/nm-setting-macsec.c:333
 #: src/libnm-core-impl/nm-setting-macvlan.c:140
 #: src/libnm-core-impl/nm-setting-vlan.c:625
 #: src/libnm-core-impl/nm-setting-vxlan.c:379
@@ -2332,32 +2332,36 @@ msgstr ""
 msgid "the key is empty"
 msgstr ""
 
-#: src/libnm-core-impl/nm-setting-macsec.c:260
+#: src/libnm-core-impl/nm-setting-macsec.c:261
 #, c-format
 msgid "the key must be %d characters"
 msgstr ""
 
-#: src/libnm-core-impl/nm-setting-macsec.c:269
+#: src/libnm-core-impl/nm-setting-macsec.c:271
+msgid "the key must have an even number of characters between 2 and 64"
+msgstr ""
+
+#: src/libnm-core-impl/nm-setting-macsec.c:280
 msgid "the key contains non-hexadecimal characters"
 msgstr ""
 
-#: src/libnm-core-impl/nm-setting-macsec.c:338
+#: src/libnm-core-impl/nm-setting-macsec.c:349
 #: src/libnm-core-impl/nm-setting-macvlan.c:156
 #: src/libnm-core-impl/nm-setting-vlan.c:638
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
 msgstr ""
 
-#: src/libnm-core-impl/nm-setting-macsec.c:369
+#: src/libnm-core-impl/nm-setting-macsec.c:380
 #, c-format
 msgid "EAP key management requires '%s' setting presence"
 msgstr ""
 
-#: src/libnm-core-impl/nm-setting-macsec.c:378
+#: src/libnm-core-impl/nm-setting-macsec.c:389
 msgid "must be either psk (0) or eap (1)"
 msgstr ""
 
-#: src/libnm-core-impl/nm-setting-macsec.c:389
+#: src/libnm-core-impl/nm-setting-macsec.c:400
 msgid "only valid for psk mode"
 msgstr ""
 
@@ -7250,7 +7254,8 @@ msgstr ""
 
 #: src/libnmc-setting/settings-docs.h.in:229
 msgid ""
-"The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
+"The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. "
+"Must be a string of 32 hexadecimal characters."
 msgstr ""
 
 #: src/libnmc-setting/settings-docs.h.in:230
@@ -7260,7 +7265,8 @@ msgstr ""
 #: src/libnmc-setting/settings-docs.h.in:231
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
-"Agreement."
+"Agreement. Must be a string of hexadecimal characters with a even length "
+"between 2 and 64."
 msgstr ""
 
 #: src/libnmc-setting/settings-docs.h.in:232
diff --git a/po/de.gmo b/po/de.gmo
index 62ab25ca..80f81632 100644
--- a/po/de.gmo
+++ b/po/de.gmo
Binary files differdiff --git a/po/es.gmo b/po/es.gmo
index afb98e6e..2928d47d 100644
--- a/po/es.gmo
+++ b/po/es.gmo
Binary files differdiff --git a/po/fr.gmo b/po/fr.gmo
index d74bf1a7..bd672334 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
Binary files differdiff --git a/po/id.gmo b/po/id.gmo
index 82d86f2d..33095017 100644
--- a/po/id.gmo
+++ b/po/id.gmo
Binary files differdiff --git a/po/it.gmo b/po/it.gmo
index 974f6dfe..2f799b19 100644
--- a/po/it.gmo
+++ b/po/it.gmo
Binary files differdiff --git a/po/ja.gmo b/po/ja.gmo
index 46fba2b2..22a08682 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
Binary files differdiff --git a/po/ko.gmo b/po/ko.gmo
index f000dd35..08656397 100644
--- a/po/ko.gmo
+++ b/po/ko.gmo
Binary files differdiff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 977776c3..f981e668 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
Binary files differdiff --git a/po/ru.gmo b/po/ru.gmo
index 88dabd04..2fb73634 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
Binary files differdiff --git a/po/sv.gmo b/po/sv.gmo
index 4d5ad2c0..ecaea0be 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
Binary files differdiff --git a/po/uk.gmo b/po/uk.gmo
index 095d13a2..f413c6a6 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
Binary files differdiff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 2a3d13f8..7e726131 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
Binary files differdiff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 440d0300..42dbf81e 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
Binary files differdiff --git a/src/core/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c
index 3e083de4..10765b60 100644
--- a/src/core/devices/nm-device-bond.c
+++ b/src/core/devices/nm-device-bond.c
@@ -492,7 +492,7 @@ act_stage1_prepare(NMDevice *device, NMDeviceStateReason *out_failure_reason)
     /* This is a workaround because netlink do not support ifname as primary */
     set_bond_attr_or_default(device, s_bond, NM_SETTING_BOND_OPTION_PRIMARY);
 
-    nm_device_bring_up(device, TRUE, NULL);
+    nm_device_bring_up(device);
 
     return ret;
 }
@@ -540,7 +540,7 @@ attach_port(NMDevice                  *device,
         success = nm_platform_link_enslave(nm_device_get_platform(device),
                                            nm_device_get_ip_ifindex(device),
                                            nm_device_get_ip_ifindex(port));
-        nm_device_bring_up(port, TRUE, NULL);
+        nm_device_bring_up(port);
 
         if (!success) {
             _LOGI(LOGD_BOND, "attaching bond port %s: failed", nm_device_get_ip_iface(port));
@@ -613,7 +613,7 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure)
          * other state is noticed by the now-released slave.
          */
         if (ifindex_slave > 0) {
-            if (!nm_device_bring_up(port, TRUE, NULL))
+            if (!nm_device_bring_up(port))
                 _LOGW(LOGD_BOND, "detached bond port could not be brought up.");
         }
     } else {
diff --git a/src/core/devices/nm-device-infiniband.c b/src/core/devices/nm-device-infiniband.c
index aef61222..6b6aef86 100644
--- a/src/core/devices/nm-device-infiniband.c
+++ b/src/core/devices/nm-device-infiniband.c
@@ -89,7 +89,7 @@ act_stage1_prepare(NMDevice *device, NMDeviceStateReason *out_failure_reason)
     ok = nm_platform_sysctl_set(nm_device_get_platform(device),
                                 NMP_SYSCTL_PATHID_NETDIR(dirfd, ifname_verified, "mode"),
                                 transport_mode);
-    nm_device_bring_up(device, TRUE, NULL);
+    nm_device_bring_up(device);
 
     if (!ok) {
         NM_SET_OUT(out_failure_reason, NM_DEVICE_STATE_REASON_CONFIG_FAILED);
diff --git a/src/core/devices/nm-device-macsec.c b/src/core/devices/nm-device-macsec.c
index 5cc0b8da..5b1f5fdc 100644
--- a/src/core/devices/nm-device-macsec.c
+++ b/src/core/devices/nm-device-macsec.c
@@ -187,8 +187,7 @@ update_properties(NMDevice *device)
 
     g_object_freeze_notify((GObject *) device);
 
-    if (priv->props.parent_ifindex != props->parent_ifindex)
-        nm_device_parent_set_ifindex(device, props->parent_ifindex);
+    nm_device_parent_set_ifindex(device, plink->parent);
 
 #define CHECK_PROPERTY_CHANGED(field, prop)      \
     G_STMT_START                                 \
@@ -402,7 +401,7 @@ supplicant_iface_state_is_completed(NMDeviceMacsec *self, NMSupplicantInterfaceS
         nm_clear_g_source(&priv->supplicant.lnk_timeout_id);
         nm_clear_g_source(&priv->supplicant.con_timeout_id);
 
-        nm_device_bring_up(NM_DEVICE(self), TRUE, NULL);
+        nm_device_bring_up(NM_DEVICE(self));
 
         /* If this is the initial association during device activation,
          * schedule the next activation stage.
diff --git a/src/core/devices/nm-device-private.h b/src/core/devices/nm-device-private.h
index 31424d5c..c597e052 100644
--- a/src/core/devices/nm-device-private.h
+++ b/src/core/devices/nm-device-private.h
@@ -37,7 +37,11 @@ gboolean nm_device_set_ip_ifindex(NMDevice *self, int ifindex);
 
 gboolean nm_device_set_ip_iface(NMDevice *self, const char *iface);
 
-gboolean nm_device_bring_up(NMDevice *self, gboolean wait, gboolean *no_firmware);
+gboolean nm_device_bring_up(NMDevice *self);
+gboolean nm_device_bring_up_full(NMDevice *self,
+                                 gboolean  block,
+                                 gboolean  update_carrier,
+                                 gboolean *no_firmware);
 
 void nm_device_take_down(NMDevice *self, gboolean block);
 
diff --git a/src/core/devices/nm-device-vrf.c b/src/core/devices/nm-device-vrf.c
index 2aef0e3d..91eb195a 100644
--- a/src/core/devices/nm-device-vrf.c
+++ b/src/core/devices/nm-device-vrf.c
@@ -226,7 +226,7 @@ attach_port(NMDevice                  *device,
         success = nm_platform_link_enslave(nm_device_get_platform(device),
                                            nm_device_get_ip_ifindex(device),
                                            nm_device_get_ip_ifindex(port));
-        nm_device_bring_up(port, TRUE, NULL);
+        nm_device_bring_up(port);
 
         if (!success)
             return FALSE;
diff --git a/src/core/devices/nm-device-wpan.c b/src/core/devices/nm-device-wpan.c
index f7b712ea..ecb5ee23 100644
--- a/src/core/devices/nm-device-wpan.c
+++ b/src/core/devices/nm-device-wpan.c
@@ -176,10 +176,10 @@ act_stage1_prepare(NMDevice *device, NMDeviceStateReason *out_failure_reason)
     ret = NM_ACT_STAGE_RETURN_SUCCESS;
 
 out:
-    nm_device_bring_up(device, TRUE, NULL);
+    nm_device_bring_up(device);
 
     if (lowpan_device)
-        nm_device_bring_up(lowpan_device, TRUE, NULL);
+        nm_device_bring_up(lowpan_device);
 
     return ret;
 }
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 2cda9b0d..059e31f2 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -4838,6 +4838,7 @@ get_ip_iface_identifier(NMDevice *self, NMUtilsIPv6IfaceId *out_iid)
     NMDevicePrivate      *priv     = NM_DEVICE_GET_PRIVATE(self);
     NMPlatform           *platform = nm_device_get_platform(self);
     const NMPlatformLink *pllink;
+    NMLinkType            link_type;
     const guint8         *hwaddr;
     guint8                pseudo_hwaddr[ETH_ALEN];
     gsize                 hwaddr_len;
@@ -4856,6 +4857,8 @@ get_ip_iface_identifier(NMDevice *self, NMUtilsIPv6IfaceId *out_iid)
     if (hwaddr_len <= 0)
         return FALSE;
 
+    link_type = pllink->type;
+
     if (pllink->type == NM_LINK_TYPE_6LOWPAN) {
         /* If the underlying IEEE 802.15.4 device has a short address we generate
          * a "pseudo 48-bit address" that's to be used in the same fashion as a
@@ -4876,10 +4879,11 @@ get_ip_iface_identifier(NMDevice *self, NMUtilsIPv6IfaceId *out_iid)
 
             hwaddr     = pseudo_hwaddr;
             hwaddr_len = G_N_ELEMENTS(pseudo_hwaddr);
+            link_type  = NM_LINK_TYPE_ETHERNET;
         }
     }
 
-    success = nm_utils_get_ipv6_interface_identifier(pllink->type,
+    success = nm_utils_get_ipv6_interface_identifier(link_type,
                                                      hwaddr,
                                                      hwaddr_len,
                                                      priv->dev_id,
@@ -6828,7 +6832,7 @@ device_link_changed(gpointer user_data)
          * bring it up probably has failed because of the
          * invalid hardware address; try again.
          */
-        nm_device_bring_up(self, TRUE, NULL);
+        nm_device_bring_up(self);
         nm_device_queue_recheck_available(self,
                                           NM_DEVICE_STATE_REASON_NONE,
                                           NM_DEVICE_STATE_REASON_NONE);
@@ -9719,7 +9723,7 @@ activate_stage2_device_config(NMDevice *self)
     _routing_rules_sync(self, NM_TERNARY_TRUE);
 
     if (!nm_device_sys_iface_state_is_external_or_assume(self)) {
-        if (!nm_device_bring_up(self, FALSE, &no_firmware)) {
+        if (!nm_device_bring_up_full(self, FALSE, TRUE, &no_firmware)) {
             nm_device_state_changed(self,
                                     NM_DEVICE_STATE_FAILED,
                                     no_firmware ? NM_DEVICE_STATE_REASON_FIRMWARE_MISSING
@@ -13994,7 +13998,10 @@ carrier_detect_wait(NMDevice *self)
 }
 
 gboolean
-nm_device_bring_up(NMDevice *self, gboolean block, gboolean *no_firmware)
+nm_device_bring_up_full(NMDevice *self,
+                        gboolean  block,
+                        gboolean  update_carrier,
+                        gboolean *no_firmware)
 {
     gboolean             device_is_up = FALSE;
     NMDeviceCapabilities capabilities;
@@ -14021,8 +14028,8 @@ nm_device_bring_up(NMDevice *self, gboolean block, gboolean *no_firmware)
             return FALSE;
     }
 
-    /* Store carrier immediately. */
-    nm_device_set_carrier_from_platform(self);
+    if (update_carrier)
+        nm_device_set_carrier_from_platform(self);
 
     device_is_up = nm_device_is_up(self);
     if (block && !device_is_up) {
@@ -14061,6 +14068,12 @@ nm_device_bring_up(NMDevice *self, gboolean block, gboolean *no_firmware)
     return TRUE;
 }
 
+gboolean
+nm_device_bring_up(NMDevice *self)
+{
+    return nm_device_bring_up_full(self, TRUE, TRUE, NULL);
+}
+
 void
 nm_device_take_down(NMDevice *self, gboolean block)
 {
@@ -15814,7 +15827,7 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
 
         if (priv->sys_iface_state == NM_DEVICE_SYS_IFACE_STATE_MANAGED) {
             if (old_state == NM_DEVICE_STATE_UNMANAGED || priv->firmware_missing) {
-                if (!nm_device_bring_up(self, TRUE, &no_firmware) && no_firmware)
+                if (!nm_device_bring_up_full(self, TRUE, FALSE, &no_firmware) && no_firmware)
                     _LOGW(LOGD_PLATFORM, "firmware may be missing.");
                 nm_device_set_firmware_missing(self, no_firmware ? TRUE : FALSE);
             }
@@ -16574,7 +16587,7 @@ handle_fail:
     }
 
     if (was_taken_down) {
-        if (!nm_device_bring_up(self, TRUE, NULL))
+        if (!nm_device_bring_up(self))
             return FALSE;
     }
 
@@ -17832,7 +17845,7 @@ dispose(GObject *object)
         priv->sriov.next = NULL;
     }
 
-    g_clear_object(&priv->l3cfg);
+    g_clear_object(&priv->l3cfg_);
     g_clear_object(&priv->l3ipdata_4.ip_config);
     g_clear_object(&priv->l3ipdata_6.ip_config);
 
diff --git a/src/core/devices/ovs/nm-device-ovs-interface.c b/src/core/devices/ovs/nm-device-ovs-interface.c
index 1f531a6f..711f65cb 100644
--- a/src/core/devices/ovs/nm-device-ovs-interface.c
+++ b/src/core/devices/ovs/nm-device-ovs-interface.c
@@ -132,7 +132,7 @@ link_changed(NMDevice *device, const NMPlatformLink *pllink)
             nm_device_devip_set_failed(device, AF_INET6, NM_DEVICE_STATE_REASON_CONFIG_FAILED);
             return;
         }
-        nm_device_bring_up(device, TRUE, NULL);
+        nm_device_bring_up(device);
 
         nm_device_devip_set_state(device, AF_INET, NM_DEVICE_IP_STATE_PENDING, NULL);
         nm_device_devip_set_state(device, AF_INET6, NM_DEVICE_IP_STATE_PENDING, NULL);
diff --git a/src/core/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c
index 4e073ddf..9eca008a 100644
--- a/src/core/devices/team/nm-device-team.c
+++ b/src/core/devices/team/nm-device-team.c
@@ -884,7 +884,7 @@ attach_port(NMDevice                  *device,
         success = nm_platform_link_enslave(nm_device_get_platform(device),
                                            nm_device_get_ip_ifindex(device),
                                            nm_device_get_ip_ifindex(port));
-        nm_device_bring_up(port, TRUE, NULL);
+        nm_device_bring_up(port);
 
         if (!success)
             return FALSE;
@@ -934,7 +934,7 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure)
          * IFF_UP), so we must bring it back up here to ensure carrier changes and
          * other state is noticed by the now-released port.
          */
-        if (!nm_device_bring_up(port, TRUE, NULL)) {
+        if (!nm_device_bring_up(port)) {
             _LOGW(LOGD_TEAM, "detached team port %s could not be brought up", port_iface);
         }
 
diff --git a/src/core/devices/wifi/nm-device-olpc-mesh.c b/src/core/devices/wifi/nm-device-olpc-mesh.c
index fd851ebc..4705f75c 100644
--- a/src/core/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/core/devices/wifi/nm-device-olpc-mesh.c
@@ -198,7 +198,7 @@ act_stage2_config(NMDevice *device, NMDeviceStateReason *out_failure_reason)
                                         nm_device_get_ifindex(device),
                                         g_bytes_get_data(ssid, NULL),
                                         g_bytes_get_size(ssid));
-    nm_device_bring_up(NM_DEVICE(self), TRUE, NULL);
+    nm_device_bring_up(NM_DEVICE(self));
     if (!success) {
         _LOGW(LOGD_WIFI, "Unable to set the mesh ID");
         return NM_ACT_STAGE_RETURN_FAILURE;
diff --git a/src/core/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c
index 43798b85..8af974d0 100644
--- a/src/core/devices/wifi/nm-device-wifi.c
+++ b/src/core/devices/wifi/nm-device-wifi.c
@@ -960,7 +960,7 @@ deactivate(NMDevice *device)
         != _NM_802_11_MODE_INFRA) {
         nm_device_take_down(NM_DEVICE(self), TRUE);
         nm_platform_wifi_set_mode(nm_device_get_platform(device), ifindex, _NM_802_11_MODE_INFRA);
-        nm_device_bring_up(NM_DEVICE(self), TRUE, NULL);
+        nm_device_bring_up(NM_DEVICE(self));
     }
 
     if (priv->mode != _NM_802_11_MODE_INFRA) {
@@ -3586,7 +3586,7 @@ set_enabled(NMDevice *device, gboolean enabled)
         if (state != NM_DEVICE_STATE_UNAVAILABLE)
             _LOGW(LOGD_CORE, "not in expected unavailable state!");
 
-        if (!nm_device_bring_up(NM_DEVICE(self), TRUE, &no_firmware)) {
+        if (!nm_device_bring_up_full(NM_DEVICE(self), TRUE, TRUE, &no_firmware)) {
             _LOGD(LOGD_WIFI, "enable blocked by failure to bring device up");
 
             if (no_firmware)
diff --git a/src/core/devices/wwan/nm-modem-broadband.c b/src/core/devices/wwan/nm-modem-broadband.c
index 997fe727..db4fb29f 100644
--- a/src/core/devices/wwan/nm-modem-broadband.c
+++ b/src/core/devices/wwan/nm-modem-broadband.c
@@ -1123,8 +1123,8 @@ stage3_ip_config_start(NMModem *modem, int addr_family, NMModemIPMethod ip_metho
         address.plen = mm_bearer_ip_config_get_prefix(self->_priv.ipv6_config);
         if (address.plen <= 128) {
             if (IN6_IS_ADDR_LINKLOCAL(&address.address)) {
-                iid_data.id = ((guint64 *) (&address.address.s6_addr))[1];
-                iid         = &iid_data;
+                nm_utils_ipv6_interface_identifier_get_from_addr(&iid_data, &address.address);
+                iid = &iid_data;
             } else
                 do_auto = FALSE;
             nm_l3_config_data_add_address_6(l3cd, &address);
diff --git a/src/core/dhcp/nm-dhcp-helper.c b/src/core/dhcp/nm-dhcp-helper.c
index 78db617c..213d9496 100644
--- a/src/core/dhcp/nm-dhcp-helper.c
+++ b/src/core/dhcp/nm-dhcp-helper.c
@@ -252,7 +252,7 @@ do_notify:
     success = FALSE;
 
 out:
-    if (!g_dbus_connection_flush_sync(connection, NULL, &error_flush)) {
+    if (connection && !g_dbus_connection_flush_sync(connection, NULL, &error_flush)) {
         _LOGE("could not flush D-Bus connection: %s", error_flush->message);
         /* if we considered this a success so far, don't fail because of this. */
     }
diff --git a/src/core/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c
index 04b673e5..9a6038d4 100644
--- a/src/core/ndisc/nm-ndisc.c
+++ b/src/core/ndisc/nm-ndisc.c
@@ -1609,27 +1609,27 @@ calc_pre_expiry_rs_msec(NMNDisc *ndisc)
         _calc_pre_expiry_rs_msec_worker(
             &expiry_msec,
             priv->last_rs_msec,
-            g_array_index(rdata->addresses, NMNDiscAddress, 0).expiry_msec);
+            g_array_index(rdata->addresses, NMNDiscAddress, i).expiry_msec);
     }
 
     for (i = 0; i < rdata->routes->len; i++) {
         _calc_pre_expiry_rs_msec_worker(&expiry_msec,
                                         priv->last_rs_msec,
-                                        g_array_index(rdata->routes, NMNDiscRoute, 0).expiry_msec);
+                                        g_array_index(rdata->routes, NMNDiscRoute, i).expiry_msec);
     }
 
     for (i = 0; i < rdata->dns_servers->len; i++) {
         _calc_pre_expiry_rs_msec_worker(
             &expiry_msec,
             priv->last_rs_msec,
-            g_array_index(rdata->dns_servers, NMNDiscDNSServer, 0).expiry_msec);
+            g_array_index(rdata->dns_servers, NMNDiscDNSServer, i).expiry_msec);
     }
 
     for (i = 0; i < rdata->dns_domains->len; i++) {
         _calc_pre_expiry_rs_msec_worker(
             &expiry_msec,
             priv->last_rs_msec,
-            g_array_index(rdata->dns_domains, NMNDiscDNSDomain, 0).expiry_msec);
+            g_array_index(rdata->dns_domains, NMNDiscDNSDomain, i).expiry_msec);
     }
 
     return expiry_msec - solicit_retransmit_time_jitter(NM_NDISC_PRE_EXPIRY_TIME_MSEC);
diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c
index 480e9b28..4aad9414 100644
--- a/src/core/nm-core-utils.c
+++ b/src/core/nm-core-utils.c
@@ -3265,25 +3265,32 @@ nm_utils_get_ipv6_interface_identifier(NMLinkType          link_type,
          * making sure to set the 'u' bit to 1.  The GUID is the lower 64 bits
          * of the IPoIB interface's hardware address.
          */
-        g_return_val_if_fail(hwaddr_len == INFINIBAND_ALEN, FALSE);
-        memcpy(out_iid->id_u8, hwaddr + INFINIBAND_ALEN - 8, 8);
-        out_iid->id_u8[0] |= 0x02;
-        return TRUE;
+        if (hwaddr_len == INFINIBAND_ALEN) {
+            memcpy(out_iid->id_u8, hwaddr + INFINIBAND_ALEN - 8, 8);
+            out_iid->id_u8[0] |= 0x02;
+            return TRUE;
+        }
+        break;
     case NM_LINK_TYPE_GRE:
         /* Hardware address is the network-endian IPv4 address */
-        g_return_val_if_fail(hwaddr_len == 4, FALSE);
-        addr              = *(guint32 *) hwaddr;
-        out_iid->id_u8[0] = get_gre_eui64_u_bit(addr);
-        out_iid->id_u8[1] = 0x00;
-        out_iid->id_u8[2] = 0x5E;
-        out_iid->id_u8[3] = 0xFE;
-        memcpy(out_iid->id_u8 + 4, &addr, 4);
-        return TRUE;
+        if (hwaddr_len == 4) {
+            addr              = unaligned_read_ne32(hwaddr);
+            out_iid->id_u8[0] = get_gre_eui64_u_bit(addr);
+            out_iid->id_u8[1] = 0x00;
+            out_iid->id_u8[2] = 0x5E;
+            out_iid->id_u8[3] = 0xFE;
+            memcpy(out_iid->id_u8 + 4, &addr, 4);
+            return TRUE;
+        }
+        break;
     case NM_LINK_TYPE_6LOWPAN:
         /* The hardware address is already 64-bit. This is the case for
          * IEEE 802.15.4 networks. */
-        memcpy(out_iid->id_u8, hwaddr, sizeof(out_iid->id_u8));
-        return TRUE;
+        if (hwaddr_len == sizeof(out_iid->id_u8)) {
+            memcpy(out_iid->id_u8, hwaddr, sizeof(out_iid->id_u8));
+            return TRUE;
+        }
+        break;
     default:
         if (hwaddr_len == ETH_ALEN) {
             /* Translate 48-bit MAC address to a 64-bit Modified EUI-64.  See
diff --git a/src/core/nm-netns.c b/src/core/nm-netns.c
index 5ee63152..859dbb21 100644
--- a/src/core/nm-netns.c
+++ b/src/core/nm-netns.c
@@ -129,13 +129,16 @@ NML3Cfg *
 nm_netns_l3cfg_get(NMNetns *self, int ifindex)
 {
     NMNetnsPrivate *priv;
+    L3CfgData      *l3cfg_data;
 
     g_return_val_if_fail(NM_IS_NETNS(self), NULL);
     g_return_val_if_fail(ifindex > 0, NULL);
 
     priv = NM_NETNS_GET_PRIVATE(self);
 
-    return g_hash_table_lookup(priv->l3cfgs, &ifindex);
+    l3cfg_data = g_hash_table_lookup(priv->l3cfgs, &ifindex);
+
+    return l3cfg_data ? l3cfg_data->l3cfg : NULL;
 }
 
 NML3Cfg *
diff --git a/src/core/supplicant/nm-supplicant-config.c b/src/core/supplicant/nm-supplicant-config.c
index 22c422a2..bd48ed92 100644
--- a/src/core/supplicant/nm-supplicant-config.c
+++ b/src/core/supplicant/nm-supplicant-config.c
@@ -403,6 +403,7 @@ nm_supplicant_config_add_setting_macsec(NMSupplicantConfig *self,
     const char *value;
     char        buf[32];
     int         port;
+    gsize       key_len;
 
     g_return_val_if_fail(NM_IS_SUPPLICANT_CONFIG(self), FALSE);
     g_return_val_if_fail(setting != NULL, FALSE);
@@ -446,7 +447,16 @@ nm_supplicant_config_add_setting_macsec(NMSupplicantConfig *self,
             return FALSE;
 
         value = nm_setting_macsec_get_mka_ckn(setting);
-        if (!value || !nm_utils_hexstr2bin_buf(value, FALSE, FALSE, NULL, buffer_ckn)) {
+        if (!value
+            || !nm_utils_hexstr2bin_full(value,
+                                         FALSE,
+                                         FALSE,
+                                         FALSE,
+                                         NULL,
+                                         0,
+                                         buffer_ckn,
+                                         G_N_ELEMENTS(buffer_ckn),
+                                         &key_len)) {
             g_set_error_literal(error,
                                 NM_SUPPLICANT_ERROR,
                                 NM_SUPPLICANT_ERROR_CONFIG,
@@ -456,7 +466,7 @@ nm_supplicant_config_add_setting_macsec(NMSupplicantConfig *self,
         if (!nm_supplicant_config_add_option(self,
                                              "mka_ckn",
                                              (char *) buffer_ckn,
-                                             sizeof(buffer_ckn),
+                                             key_len,
                                              value,
                                              error))
             return FALSE;
diff --git a/src/libnm-base/nm-ethtool-base.c b/src/libnm-base/nm-ethtool-base.c
index 78e9fbc1..a75df8a0 100644
--- a/src/libnm-base/nm-ethtool-base.c
+++ b/src/libnm-base/nm-ethtool-base.c
@@ -271,7 +271,7 @@ nm_ethtool_data_get_by_optname(const char *optname)
 
     _ASSERT_data();
 
-    idx = nm_utils_array_find_binary_search((gconstpointer *) _by_name,
+    idx = nm_utils_array_find_binary_search(_by_name,
                                             sizeof(_by_name[0]),
                                             _NM_ETHTOOL_ID_NUM,
                                             optname,
diff --git a/src/libnm-client-impl/nm-settings-docs-gir.xml b/src/libnm-client-impl/nm-settings-docs-gir.xml
index eef7de67..78dc852c 100644
--- a/src/libnm-client-impl/nm-settings-docs-gir.xml
+++ b/src/libnm-client-impl/nm-settings-docs-gir.xml
@@ -285,7 +285,7 @@
 
  If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection.
 
- Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.</description><description-docbook><para> Enable policy routing (source routing) and set the routing table used when adding routes.</para><para> This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table.</para><para> If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection.</para><para> Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.</para></description-docbook></property><property name="routes" name_upper="ROUTES" type="array of legacy IPv6 route struct"><description> Array of IP routes.</description><description-docbook><para> Array of IP routes.</para></description-docbook></property><property name="token" name_upper="TOKEN" type="string"><description> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</description><description-docbook><para> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</para></description-docbook></property></setting><setting name="ip-tunnel" description=" IP Tunneling Settings" name_upper="IP_TUNNEL"><property name="encapsulation-limit" name_upper="ENCAPSULATION_LIMIT" type="uint32" default="0"><description> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</description><description-docbook><para> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</para></description-docbook></property><property name="flags" name_upper="FLAGS" type="uint32" default="0"><description> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</description><description-docbook><para> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</para></description-docbook></property><property name="flow-label" name_upper="FLOW_LABEL" type="uint32" default="0"><description> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</description><description-docbook><para> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</para></description-docbook></property><property name="input-key" name_upper="INPUT_KEY" type="string"><description> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description><description-docbook><para> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook></property><property name="local" name_upper="LOCAL" type="string"><description> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</description><description-docbook><para> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</para></description-docbook></property><property name="mode" name_upper="MODE" type="uint32" default="0"><description> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</description><description-docbook><para> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</para></description-docbook></property><property name="mtu" name_upper="MTU" type="uint32" default="0"><description> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</description><description-docbook><para> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</para></description-docbook></property><property name="output-key" name_upper="OUTPUT_KEY" type="string"><description> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description><description-docbook><para> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook></property><property name="parent" name_upper="PARENT" type="string"><description> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</description><description-docbook><para> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</para></description-docbook></property><property name="path-mtu-discovery" name_upper="PATH_MTU_DISCOVERY" type="boolean" default="TRUE"><description> Whether to enable Path MTU Discovery on this tunnel.</description><description-docbook><para> Whether to enable Path MTU Discovery on this tunnel.</para></description-docbook></property><property name="remote" name_upper="REMOTE" type="string"><description> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</description><description-docbook><para> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</para></description-docbook></property><property name="tos" name_upper="TOS" type="uint32" default="0"><description> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</description><description-docbook><para> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</para></description-docbook></property><property name="ttl" name_upper="TTL" type="uint32" default="0"><description> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</description><description-docbook><para> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</para></description-docbook></property></setting><setting name="macsec" description=" MACSec Settings" name_upper="MACSEC"><property name="encrypt" name_upper="ENCRYPT" type="boolean" default="TRUE"><description> Whether the transmitted traffic must be encrypted.</description><description-docbook><para> Whether the transmitted traffic must be encrypted.</para></description-docbook></property><property name="mka-cak" name_upper="MKA_CAK" type="string"><description> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</description><description-docbook><para> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</para></description-docbook></property><property name="mka-cak-flags" name_upper="MKA_CAK_FLAGS" type="NMSettingSecretFlags (uint32)"><description> Flags indicating how to handle the "mka-cak" property.</description><description-docbook><para> Flags indicating how to handle the "mka-cak" property.</para></description-docbook></property><property name="mka-ckn" name_upper="MKA_CKN" type="string"><description> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</description><description-docbook><para> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</para></description-docbook></property><property name="mode" name_upper="MODE" type="int32" default="0"><description> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</description><description-docbook><para> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</para></description-docbook></property><property name="parent" name_upper="PARENT" type="string"><description> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook></property><property name="port" name_upper="PORT" type="int32" default="1"><description> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</description><description-docbook><para> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</para></description-docbook></property><property name="send-sci" name_upper="SEND_SCI" type="boolean" default="TRUE"><description> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</description><description-docbook><para> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</para></description-docbook></property><property name="validation" name_upper="VALIDATION" type="int32" default="2"><description> Specifies the validation mode for incoming frames.</description><description-docbook><para> Specifies the validation mode for incoming frames.</para></description-docbook></property></setting><setting name="macvlan" description=" MAC VLAN Settings" name_upper="MACVLAN"><property name="mode" name_upper="MODE" type="uint32" default="0"><description> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</description><description-docbook><para> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</para></description-docbook></property><property name="parent" name_upper="PARENT" type="string"><description> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook></property><property name="promiscuous" name_upper="PROMISCUOUS" type="boolean" default="TRUE"><description> Whether the interface should be put in promiscuous mode.</description><description-docbook><para> Whether the interface should be put in promiscuous mode.</para></description-docbook></property><property name="tap" name_upper="TAP" type="boolean" default="FALSE"><description> Whether the interface should be a MACVTAP.</description><description-docbook><para> Whether the interface should be a MACVTAP.</para></description-docbook></property></setting><setting name="match" description=" Match settings" name_upper="MATCH"><property name="driver" name_upper="DRIVER" type="array of string"><description> A list of driver names to match. Each element is a shell wildcard pattern.
+ Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.</description><description-docbook><para> Enable policy routing (source routing) and set the routing table used when adding routes.</para><para> This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table.</para><para> If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection.</para><para> Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.</para></description-docbook></property><property name="routes" name_upper="ROUTES" type="array of legacy IPv6 route struct"><description> Array of IP routes.</description><description-docbook><para> Array of IP routes.</para></description-docbook></property><property name="token" name_upper="TOKEN" type="string"><description> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</description><description-docbook><para> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</para></description-docbook></property></setting><setting name="ip-tunnel" description=" IP Tunneling Settings" name_upper="IP_TUNNEL"><property name="encapsulation-limit" name_upper="ENCAPSULATION_LIMIT" type="uint32" default="0"><description> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</description><description-docbook><para> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</para></description-docbook></property><property name="flags" name_upper="FLAGS" type="uint32" default="0"><description> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</description><description-docbook><para> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</para></description-docbook></property><property name="flow-label" name_upper="FLOW_LABEL" type="uint32" default="0"><description> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</description><description-docbook><para> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</para></description-docbook></property><property name="input-key" name_upper="INPUT_KEY" type="string"><description> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description><description-docbook><para> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook></property><property name="local" name_upper="LOCAL" type="string"><description> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</description><description-docbook><para> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</para></description-docbook></property><property name="mode" name_upper="MODE" type="uint32" default="0"><description> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</description><description-docbook><para> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</para></description-docbook></property><property name="mtu" name_upper="MTU" type="uint32" default="0"><description> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</description><description-docbook><para> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</para></description-docbook></property><property name="output-key" name_upper="OUTPUT_KEY" type="string"><description> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description><description-docbook><para> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook></property><property name="parent" name_upper="PARENT" type="string"><description> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</description><description-docbook><para> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</para></description-docbook></property><property name="path-mtu-discovery" name_upper="PATH_MTU_DISCOVERY" type="boolean" default="TRUE"><description> Whether to enable Path MTU Discovery on this tunnel.</description><description-docbook><para> Whether to enable Path MTU Discovery on this tunnel.</para></description-docbook></property><property name="remote" name_upper="REMOTE" type="string"><description> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</description><description-docbook><para> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</para></description-docbook></property><property name="tos" name_upper="TOS" type="uint32" default="0"><description> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</description><description-docbook><para> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</para></description-docbook></property><property name="ttl" name_upper="TTL" type="uint32" default="0"><description> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</description><description-docbook><para> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</para></description-docbook></property></setting><setting name="macsec" description=" MACSec Settings" name_upper="MACSEC"><property name="encrypt" name_upper="ENCRYPT" type="boolean" default="TRUE"><description> Whether the transmitted traffic must be encrypted.</description><description-docbook><para> Whether the transmitted traffic must be encrypted.</para></description-docbook></property><property name="mka-cak" name_upper="MKA_CAK" type="string"><description> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</description><description-docbook><para> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</para></description-docbook></property><property name="mka-cak-flags" name_upper="MKA_CAK_FLAGS" type="NMSettingSecretFlags (uint32)"><description> Flags indicating how to handle the "mka-cak" property.</description><description-docbook><para> Flags indicating how to handle the "mka-cak" property.</para></description-docbook></property><property name="mka-ckn" name_upper="MKA_CKN" type="string"><description> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</description><description-docbook><para> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</para></description-docbook></property><property name="mode" name_upper="MODE" type="int32" default="0"><description> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</description><description-docbook><para> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</para></description-docbook></property><property name="parent" name_upper="PARENT" type="string"><description> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook></property><property name="port" name_upper="PORT" type="int32" default="1"><description> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</description><description-docbook><para> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</para></description-docbook></property><property name="send-sci" name_upper="SEND_SCI" type="boolean" default="TRUE"><description> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</description><description-docbook><para> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</para></description-docbook></property><property name="validation" name_upper="VALIDATION" type="int32" default="2"><description> Specifies the validation mode for incoming frames.</description><description-docbook><para> Specifies the validation mode for incoming frames.</para></description-docbook></property></setting><setting name="macvlan" description=" MAC VLAN Settings" name_upper="MACVLAN"><property name="mode" name_upper="MODE" type="uint32" default="0"><description> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</description><description-docbook><para> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</para></description-docbook></property><property name="parent" name_upper="PARENT" type="string"><description> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook></property><property name="promiscuous" name_upper="PROMISCUOUS" type="boolean" default="TRUE"><description> Whether the interface should be put in promiscuous mode.</description><description-docbook><para> Whether the interface should be put in promiscuous mode.</para></description-docbook></property><property name="tap" name_upper="TAP" type="boolean" default="FALSE"><description> Whether the interface should be a MACVTAP.</description><description-docbook><para> Whether the interface should be a MACVTAP.</para></description-docbook></property></setting><setting name="match" description=" Match settings" name_upper="MATCH"><property name="driver" name_upper="DRIVER" type="array of string"><description> A list of driver names to match. Each element is a shell wildcard pattern.
 
  See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.</description><description-docbook><para> A list of driver names to match. Each element is a shell wildcard pattern.</para><para> See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.</para></description-docbook></property><property name="interface-name" name_upper="INTERFACE_NAME" type="array of string"><description> A list of interface names to match. Each element is a shell wildcard pattern.
 
diff --git a/src/libnm-core-impl/nm-setting-macsec.c b/src/libnm-core-impl/nm-setting-macsec.c
index 85271214..1463fd92 100644
--- a/src/libnm-core-impl/nm-setting-macsec.c
+++ b/src/libnm-core-impl/nm-setting-macsec.c
@@ -236,7 +236,7 @@ need_secrets(NMSetting *setting)
 static gboolean
 verify_macsec_key(const char *key, gboolean cak, GError **error)
 {
-    int req_len;
+    size_t len;
 
     /* CAK is a connection secret and can be NULL for various
      * reasons (agent-owned, no permissions to get secrets, etc.)
@@ -252,14 +252,25 @@ verify_macsec_key(const char *key, gboolean cak, GError **error)
         return FALSE;
     }
 
-    req_len = cak ? NM_SETTING_MACSEC_MKA_CAK_LENGTH : NM_SETTING_MACSEC_MKA_CKN_LENGTH;
-    if (strlen(key) != (gsize) req_len) {
-        g_set_error(error,
-                    NM_CONNECTION_ERROR,
-                    NM_CONNECTION_ERROR_INVALID_PROPERTY,
-                    _("the key must be %d characters"),
-                    req_len);
-        return FALSE;
+    len = strlen(key);
+    if (cak) {
+        if (len != NM_SETTING_MACSEC_MKA_CAK_LENGTH) {
+            g_set_error(error,
+                        NM_CONNECTION_ERROR,
+                        NM_CONNECTION_ERROR_INVALID_PROPERTY,
+                        _("the key must be %d characters"),
+                        NM_SETTING_MACSEC_MKA_CAK_LENGTH);
+            return FALSE;
+        }
+    } else {
+        if (len < 2 || len > 64 || len % 2 != 0) {
+            g_set_error_literal(
+                error,
+                NM_CONNECTION_ERROR,
+                NM_CONNECTION_ERROR_INVALID_PROPERTY,
+                _("the key must have an even number of characters between 2 and 64"));
+            return FALSE;
+        }
     }
 
     if (!NM_STRCHAR_ALL(key, ch, g_ascii_isxdigit(ch))) {
@@ -490,7 +501,7 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass)
      * NMSettingMacsec:mka-cak:
      *
      * The pre-shared CAK (Connectivity Association Key) for MACsec
-     * Key Agreement.
+     * Key Agreement. Must be a string of 32 hexadecimal characters.
      *
      * Since: 1.6
      **/
@@ -521,7 +532,8 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass)
      * NMSettingMacsec:mka-ckn:
      *
      * The pre-shared CKN (Connectivity-association Key Name) for
-     * MACsec Key Agreement.
+     * MACsec Key Agreement. Must be a string of hexadecimal characters
+     * with a even length between 2 and 64.
      *
      * Since: 1.6
      **/
diff --git a/src/libnm-core-public/nm-setting-macsec.h b/src/libnm-core-public/nm-setting-macsec.h
index 52e4313d..c2662b1f 100644
--- a/src/libnm-core-public/nm-setting-macsec.h
+++ b/src/libnm-core-public/nm-setting-macsec.h
@@ -73,6 +73,8 @@ typedef enum {
 } NMSettingMacsecValidation;
 
 #define NM_SETTING_MACSEC_MKA_CAK_LENGTH 32
+
+/* Deprecated. The CKN can be between 2 and 64 characters. */
 #define NM_SETTING_MACSEC_MKA_CKN_LENGTH 64
 
 NM_AVAILABLE_IN_1_6
diff --git a/src/libnm-core-public/nm-version-macros.h b/src/libnm-core-public/nm-version-macros.h
index 04fce5df..2b5bc67e 100644
--- a/src/libnm-core-public/nm-version-macros.h
+++ b/src/libnm-core-public/nm-version-macros.h
@@ -30,7 +30,7 @@
  * Evaluates to the micro version number of NetworkManager which this source
  * compiled against.
  */
-#define NM_MICRO_VERSION (6)
+#define NM_MICRO_VERSION (8)
 
 /**
  * NM_CHECK_VERSION:
diff --git a/src/libnm-glib-aux/nm-test-utils.h b/src/libnm-glib-aux/nm-test-utils.h
index 83702070..d338d0af 100644
--- a/src/libnm-glib-aux/nm-test-utils.h
+++ b/src/libnm-glib-aux/nm-test-utils.h
@@ -2141,7 +2141,7 @@ _nmtst_connection_normalize_v(NMConnection *connection, va_list args)
     while ((p_name = va_arg(args, const char *))) {
         if (!parameters)
             parameters = g_hash_table_new(g_str_hash, g_str_equal);
-        g_hash_table_insert(parameters, (gpointer *) p_name, va_arg(args, gpointer));
+        g_hash_table_insert(parameters, (gpointer) p_name, va_arg(args, gpointer));
     }
 
     success = nm_connection_normalize(connection, parameters, &was_modified, &error);
diff --git a/src/libnm-platform/nm-platform.c b/src/libnm-platform/nm-platform.c
index 7d82083c..198e5f0a 100644
--- a/src/libnm-platform/nm-platform.c
+++ b/src/libnm-platform/nm-platform.c
@@ -8249,7 +8249,6 @@ void
 nm_platform_lnk_macsec_hash_update(const NMPlatformLnkMacsec *obj, NMHashState *h)
 {
     nm_hash_update_vals(h,
-                        obj->parent_ifindex,
                         obj->sci,
                         obj->cipher_suite,
                         obj->window,
@@ -8269,7 +8268,6 @@ int
 nm_platform_lnk_macsec_cmp(const NMPlatformLnkMacsec *a, const NMPlatformLnkMacsec *b)
 {
     NM_CMP_SELF(a, b);
-    NM_CMP_FIELD(a, b, parent_ifindex);
     NM_CMP_FIELD(a, b, sci);
     NM_CMP_FIELD(a, b, icv_length);
     NM_CMP_FIELD(a, b, cipher_suite);
diff --git a/src/libnm-platform/nm-platform.h b/src/libnm-platform/nm-platform.h
index 7792bbf5..30d0b506 100644
--- a/src/libnm-platform/nm-platform.h
+++ b/src/libnm-platform/nm-platform.h
@@ -980,7 +980,6 @@ typedef struct {
 } NMPlatformLnkIpIp;
 
 typedef struct {
-    int     parent_ifindex;
     guint64 sci; /* host byte order */
     guint64 cipher_suite;
     guint32 window;
diff --git a/src/libnmc-setting/settings-docs-input.xml b/src/libnmc-setting/settings-docs-input.xml
index 77643955..39bfb540 100644
--- a/src/libnmc-setting/settings-docs-input.xml
+++ b/src/libnmc-setting/settings-docs-input.xml
@@ -440,7 +440,7 @@ fixed priority.
 </para>
 <para>
 Example: <literal>priority 5 from 1:2:3::5/128 table 45</literal>
-</para></description-docbook><description>A comma separated list of routing rules for policy routing.</description></property><property name="token" name_upper="TOKEN" type="string"><description-docbook><para> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</para></description-docbook><description> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</description></property></setting><setting name="ip-tunnel" description=" IP Tunneling Settings" name_upper="IP_TUNNEL"><property name="encapsulation-limit" name_upper="ENCAPSULATION_LIMIT" type="uint32" default="0"><description-docbook><para> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</para></description-docbook><description> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</description></property><property name="flags" name_upper="FLAGS" type="uint32" default="0"><description-docbook><para> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</para></description-docbook><description> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</description></property><property name="flow-label" name_upper="FLOW_LABEL" type="uint32" default="0"><description-docbook><para> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</para></description-docbook><description> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</description></property><property name="input-key" name_upper="INPUT_KEY" type="string"><description-docbook><para> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook><description> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description></property><property name="local" name_upper="LOCAL" type="string"><description-docbook><para> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</para></description-docbook><description> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</description></property><property name="mode" name_upper="MODE" type="uint32" default="0"><description-docbook><para> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</para></description-docbook><description> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</description></property><property name="mtu" name_upper="MTU" type="uint32" default="0"><description-docbook><para> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</para></description-docbook><description> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</description></property><property name="output-key" name_upper="OUTPUT_KEY" type="string"><description-docbook><para> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook><description> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description></property><property name="parent" name_upper="PARENT" type="string"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</para></description-docbook><description> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</description></property><property name="path-mtu-discovery" name_upper="PATH_MTU_DISCOVERY" type="boolean" default="TRUE"><description-docbook><para> Whether to enable Path MTU Discovery on this tunnel.</para></description-docbook><description> Whether to enable Path MTU Discovery on this tunnel.</description></property><property name="remote" name_upper="REMOTE" type="string"><description-docbook><para> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</para></description-docbook><description> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</description></property><property name="tos" name_upper="TOS" type="uint32" default="0"><description-docbook><para> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</para></description-docbook><description> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</description></property><property name="ttl" name_upper="TTL" type="uint32" default="0"><description-docbook><para> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</para></description-docbook><description> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</description></property></setting><setting name="macsec" description=" MACSec Settings" name_upper="MACSEC"><property name="encrypt" name_upper="ENCRYPT" type="boolean" default="TRUE"><description-docbook><para> Whether the transmitted traffic must be encrypted.</para></description-docbook><description> Whether the transmitted traffic must be encrypted.</description></property><property name="mka-cak" name_upper="MKA_CAK" type="string"><description-docbook><para> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</para></description-docbook><description> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</description></property><property name="mka-cak-flags" name_upper="MKA_CAK_FLAGS" type="NMSettingSecretFlags (uint32)"><description-docbook><para> Flags indicating how to handle the "mka-cak" property.</para></description-docbook><description> Flags indicating how to handle the "mka-cak" property.</description></property><property name="mka-ckn" name_upper="MKA_CKN" type="string"><description-docbook><para> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</para></description-docbook><description> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</description></property><property name="mode" name_upper="MODE" type="int32" default="0"><description-docbook><para> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</para></description-docbook><description> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</description></property><property name="parent" name_upper="PARENT" type="string"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook><description> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description></property><property name="port" name_upper="PORT" type="int32" default="1"><description-docbook><para> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</para></description-docbook><description> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</description></property><property name="send-sci" name_upper="SEND_SCI" type="boolean" default="TRUE"><description-docbook><para> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</para></description-docbook><description> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</description></property><property name="validation" name_upper="VALIDATION" type="int32" default="2"><description-docbook><para> Specifies the validation mode for incoming frames.</para></description-docbook><description> Specifies the validation mode for incoming frames.</description></property></setting><setting name="macvlan" description=" MAC VLAN Settings" name_upper="MACVLAN"><property name="mode" name_upper="MODE" type="uint32" default="0"><description-docbook><para> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</para></description-docbook><description> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</description></property><property name="parent" name_upper="PARENT" type="string"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook><description> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description></property><property name="promiscuous" name_upper="PROMISCUOUS" type="boolean" default="TRUE"><description-docbook><para> Whether the interface should be put in promiscuous mode.</para></description-docbook><description> Whether the interface should be put in promiscuous mode.</description></property><property name="tap" name_upper="TAP" type="boolean" default="FALSE"><description-docbook><para> Whether the interface should be a MACVTAP.</para></description-docbook><description> Whether the interface should be a MACVTAP.</description></property></setting><setting name="match" description=" Match settings" name_upper="MATCH"><property name="driver" name_upper="DRIVER" type="array of string"><description-docbook><para> A list of driver names to match. Each element is a shell wildcard pattern.</para><para> See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.</para></description-docbook><description> A list of driver names to match. Each element is a shell wildcard pattern.
+</para></description-docbook><description>A comma separated list of routing rules for policy routing.</description></property><property name="token" name_upper="TOKEN" type="string"><description-docbook><para> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</para></description-docbook><description> Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</description></property></setting><setting name="ip-tunnel" description=" IP Tunneling Settings" name_upper="IP_TUNNEL"><property name="encapsulation-limit" name_upper="ENCAPSULATION_LIMIT" type="uint32" default="0"><description-docbook><para> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</para></description-docbook><description> How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</description></property><property name="flags" name_upper="FLAGS" type="uint32" default="0"><description-docbook><para> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</para></description-docbook><description> Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</description></property><property name="flow-label" name_upper="FLOW_LABEL" type="uint32" default="0"><description-docbook><para> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</para></description-docbook><description> The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</description></property><property name="input-key" name_upper="INPUT_KEY" type="string"><description-docbook><para> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook><description> The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description></property><property name="local" name_upper="LOCAL" type="string"><description-docbook><para> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</para></description-docbook><description> The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</description></property><property name="mode" name_upper="MODE" type="uint32" default="0"><description-docbook><para> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</para></description-docbook><description> The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</description></property><property name="mtu" name_upper="MTU" type="uint32" default="0"><description-docbook><para> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</para></description-docbook><description> If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</description></property><property name="output-key" name_upper="OUTPUT_KEY" type="string"><description-docbook><para> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</para></description-docbook><description> The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</description></property><property name="parent" name_upper="PARENT" type="string"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</para></description-docbook><description> If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</description></property><property name="path-mtu-discovery" name_upper="PATH_MTU_DISCOVERY" type="boolean" default="TRUE"><description-docbook><para> Whether to enable Path MTU Discovery on this tunnel.</para></description-docbook><description> Whether to enable Path MTU Discovery on this tunnel.</description></property><property name="remote" name_upper="REMOTE" type="string"><description-docbook><para> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</para></description-docbook><description> The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</description></property><property name="tos" name_upper="TOS" type="uint32" default="0"><description-docbook><para> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</para></description-docbook><description> The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</description></property><property name="ttl" name_upper="TTL" type="uint32" default="0"><description-docbook><para> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</para></description-docbook><description> The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</description></property></setting><setting name="macsec" description=" MACSec Settings" name_upper="MACSEC"><property name="encrypt" name_upper="ENCRYPT" type="boolean" default="TRUE"><description-docbook><para> Whether the transmitted traffic must be encrypted.</para></description-docbook><description> Whether the transmitted traffic must be encrypted.</description></property><property name="mka-cak" name_upper="MKA_CAK" type="string"><description-docbook><para> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</para></description-docbook><description> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</description></property><property name="mka-cak-flags" name_upper="MKA_CAK_FLAGS" type="NMSettingSecretFlags (uint32)"><description-docbook><para> Flags indicating how to handle the "mka-cak" property.</para></description-docbook><description> Flags indicating how to handle the "mka-cak" property.</description></property><property name="mka-ckn" name_upper="MKA_CKN" type="string"><description-docbook><para> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</para></description-docbook><description> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</description></property><property name="mode" name_upper="MODE" type="int32" default="0"><description-docbook><para> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</para></description-docbook><description> Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.</description></property><property name="parent" name_upper="PARENT" type="string"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook><description> If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description></property><property name="port" name_upper="PORT" type="int32" default="1"><description-docbook><para> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</para></description-docbook><description> The port component of the SCI (Secure Channel Identifier), between 1 and 65534.</description></property><property name="send-sci" name_upper="SEND_SCI" type="boolean" default="TRUE"><description-docbook><para> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</para></description-docbook><description> Specifies whether the SCI (Secure Channel Identifier) is included in every packet.</description></property><property name="validation" name_upper="VALIDATION" type="int32" default="2"><description-docbook><para> Specifies the validation mode for incoming frames.</para></description-docbook><description> Specifies the validation mode for incoming frames.</description></property></setting><setting name="macvlan" description=" MAC VLAN Settings" name_upper="MACVLAN"><property name="mode" name_upper="MODE" type="uint32" default="0"><description-docbook><para> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</para></description-docbook><description> The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</description></property><property name="parent" name_upper="PARENT" type="string"><description-docbook><para> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</para></description-docbook><description> If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.</description></property><property name="promiscuous" name_upper="PROMISCUOUS" type="boolean" default="TRUE"><description-docbook><para> Whether the interface should be put in promiscuous mode.</para></description-docbook><description> Whether the interface should be put in promiscuous mode.</description></property><property name="tap" name_upper="TAP" type="boolean" default="FALSE"><description-docbook><para> Whether the interface should be a MACVTAP.</para></description-docbook><description> Whether the interface should be a MACVTAP.</description></property></setting><setting name="match" description=" Match settings" name_upper="MATCH"><property name="driver" name_upper="DRIVER" type="array of string"><description-docbook><para> A list of driver names to match. Each element is a shell wildcard pattern.</para><para> See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.</para></description-docbook><description> A list of driver names to match. Each element is a shell wildcard pattern.
 
  See NMSettingMatch:interface-name for how special characters '|', '&amp;', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.</description></property><property name="interface-name" name_upper="INTERFACE_NAME" type="array of string"><description-docbook><para> A list of interface names to match. Each element is a shell wildcard pattern.</para><para> An element can be prefixed with a pipe symbol (|) or an ampersand (&amp;). The former means that the element is optional and the latter means that it is mandatory. If there are any optional elements, than the match evaluates to true if at least one of the optional element matches (logical OR). If there are any mandatory elements, then they all must match (logical AND). By default, an element is optional. This means that an element "foo" behaves the same as "|foo". An element can also be inverted with exclamation mark (!) between the pipe symbol (or the ampersand) and before the pattern. Note that "!foo" is a shortcut for the mandatory match "&amp;!foo". Finally, a backslash can be used at the beginning of the element (after the optional special characters) to escape the start of the pattern. For example, "&amp;\\!a" is an mandatory match for literally "!a".</para></description-docbook><description> A list of interface names to match. Each element is a shell wildcard pattern.
 
diff --git a/src/libnmc-setting/settings-docs.h b/src/libnmc-setting/settings-docs.h
index 934ddff9..208cad86 100644
--- a/src/libnmc-setting/settings-docs.h
+++ b/src/libnmc-setting/settings-docs.h
@@ -226,9 +226,9 @@
 #define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TOS N_("The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.")
 #define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TTL N_("The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.")
 #define DESCRIBE_DOC_NM_SETTING_MACSEC_ENCRYPT N_("Whether the transmitted traffic must be encrypted.")
-#define DESCRIBE_DOC_NM_SETTING_MACSEC_MKA_CAK N_("The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.")
+#define DESCRIBE_DOC_NM_SETTING_MACSEC_MKA_CAK N_("The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.")
 #define DESCRIBE_DOC_NM_SETTING_MACSEC_MKA_CAK_FLAGS N_("Flags indicating how to handle the \"mka-cak\" property.")
-#define DESCRIBE_DOC_NM_SETTING_MACSEC_MKA_CKN N_("The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.")
+#define DESCRIBE_DOC_NM_SETTING_MACSEC_MKA_CKN N_("The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.")
 #define DESCRIBE_DOC_NM_SETTING_MACSEC_MODE N_("Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.")
 #define DESCRIBE_DOC_NM_SETTING_MACSEC_PARENT N_("If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an \"802-3-ethernet\" setting with a \"mac-address\" property.")
 #define DESCRIBE_DOC_NM_SETTING_MACSEC_PORT N_("The port component of the SCI (Secure Channel Identifier), between 1 and 65534.")
diff --git a/src/libnmc-setting/settings-docs.h.in b/src/libnmc-setting/settings-docs.h.in
index 934ddff9..208cad86 100644
--- a/src/libnmc-setting/settings-docs.h.in
+++ b/src/libnmc-setting/settings-docs.h.in
@@ -226,9 +226,9 @@
 #define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TOS N_("The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.")
 #define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TTL N_("The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.")
 #define DESCRIBE_DOC_NM_SETTING_MACSEC_ENCRYPT N_("Whether the transmitted traffic must be encrypted.")
-#define DESCRIBE_DOC_NM_SETTING_MACSEC_MKA_CAK N_("The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.")
+#define DESCRIBE_DOC_NM_SETTING_MACSEC_MKA_CAK N_("The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.")
 #define DESCRIBE_DOC_NM_SETTING_MACSEC_MKA_CAK_FLAGS N_("Flags indicating how to handle the \"mka-cak\" property.")
-#define DESCRIBE_DOC_NM_SETTING_MACSEC_MKA_CKN N_("The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.")
+#define DESCRIBE_DOC_NM_SETTING_MACSEC_MKA_CKN N_("The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.")
 #define DESCRIBE_DOC_NM_SETTING_MACSEC_MODE N_("Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key Agreement) is obtained.")
 #define DESCRIBE_DOC_NM_SETTING_MACSEC_PARENT N_("If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created.  If this property is not specified, the connection must contain an \"802-3-ethernet\" setting with a \"mac-address\" property.")
 #define DESCRIBE_DOC_NM_SETTING_MACSEC_PORT N_("The port component of the SCI (Secure Channel Identifier), between 1 and 65534.")
diff --git a/src/nmcli/generate-docs-nm-settings-nmcli.xml b/src/nmcli/generate-docs-nm-settings-nmcli.xml
index 5da5c979..f78c5f42 100644
--- a/src/nmcli/generate-docs-nm-settings-nmcli.xml
+++ b/src/nmcli/generate-docs-nm-settings-nmcli.xml
@@ -774,12 +774,12 @@
                   description="Whether the transmitted traffic must be encrypted." />
         <property name="mka-cak"
                   alias="cak"
-                  description="The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement." />
+                  description="The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters." />
         <property name="mka-cak-flags"
                   description="Flags indicating how to handle the &quot;mka-cak&quot; property." />
         <property name="mka-ckn"
                   alias="ckn"
-                  description="The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement." />
+                  description="The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64." />
         <property name="port"
                   alias="port"
                   description="The port component of the SCI (Secure Channel Identifier), between 1 and 65534." />
diff --git a/src/nmcli/generate-docs-nm-settings-nmcli.xml.in b/src/nmcli/generate-docs-nm-settings-nmcli.xml.in
index 5da5c979..f78c5f42 100644
--- a/src/nmcli/generate-docs-nm-settings-nmcli.xml.in
+++ b/src/nmcli/generate-docs-nm-settings-nmcli.xml.in
@@ -774,12 +774,12 @@
                   description="Whether the transmitted traffic must be encrypted." />
         <property name="mka-cak"
                   alias="cak"
-                  description="The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement." />
+                  description="The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters." />
         <property name="mka-cak-flags"
                   description="Flags indicating how to handle the &quot;mka-cak&quot; property." />
         <property name="mka-ckn"
                   alias="ckn"
-                  description="The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement." />
+                  description="The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64." />
         <property name="port"
                   alias="port"
                   description="The port component of the SCI (Secure Channel Identifier), between 1 and 65534." />
author	Michael Biebl <biebl@debian.org>	2022-12-18 21:31:39 +0100
committer	Michael Biebl <biebl@debian.org>	2022-12-18 21:31:39 +0100
commit	2965dc70bb3cbfa8de2f279761812b84b87600cb (patch)
tree	90d4a861f7cd7a05834e7328af7677e7c8acd17f
parent	6e9d10e114f94799d54bb3dabc66e35ab4e3e8cd (diff)