Merge tag 'debian/1.40.6-1' into ubuntu/master

network-manager Debian release 1.40.6-1

52 files changed, 427 insertions, 349 deletions

diff --git a/NEWS b/NEWS
index 3464a428..38f8b235 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,13 @@
 ===============================================
+NetworkManager-1.40.6
+Overview of changes since NetworkManager-1.40.4
+===============================================
+
+* team: also set empty port configuration so teamd
+  knows about the port.
+* team: restore port configuration after teamd respawn.
+
+===============================================
 NetworkManager-1.40.4
 Overview of changes since NetworkManager-1.40.2
 ===============================================
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index 24be79cf..1e1ab679 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2020 Free Software Foundation, Inc.
+#   Copyright 1996-2022 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -371,7 +371,7 @@ else
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
-    freebsd* | dragonfly*)
+    freebsd* | dragonfly* | midnightbsd*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
@@ -547,7 +547,7 @@ case "$host_os" in
   freebsd[23].*)
     library_names_spec='$libname$shrext$versuffix'
     ;;
-  freebsd* | dragonfly*)
+  freebsd* | dragonfly* | midnightbsd*)
     library_names_spec='$libname$shrext'
     ;;
   gnu*)
diff --git a/configure b/configure
index 5c1be5f0..a8bef9b3 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.4.
+# Generated by GNU Autoconf 2.71 for NetworkManager 1.40.6.
 #
 # 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.4'
-PACKAGE_STRING='NetworkManager 1.40.4'
+PACKAGE_VERSION='1.40.6'
+PACKAGE_STRING='NetworkManager 1.40.6'
 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.4 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.40.6 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.4:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.40.6:";;
    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.4
+NetworkManager configure 1.40.6
 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.4, which was
+It was created by NetworkManager $as_me 1.40.6, 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.4'
+ VERSION='1.40.6'
 
 
 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=4
-NM_VERSION=1.40.4
+NM_MICRO_VERSION=6
+NM_VERSION=1.40.6
 
 
 
@@ -19337,7 +19337,7 @@ NM_VERSION=1.40.4
 
 
 
-NM_GIT_SHA=86b82bf358a969fc7ff56d4933ae00382ac2bada
+NM_GIT_SHA=ba35cff250dada15250902d8197b7901c21434cb
 
 if test """" != "no-config-h" ; then
 
@@ -20272,7 +20272,7 @@ else $as_nop
       *-*-aix*)
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if defined __powerpc64__ || defined _ARCH_PPC64
+#if defined __powerpc64__ || defined __LP64__
                 int ok;
                #else
                 error fail
@@ -20562,7 +20562,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            # be generating 64-bit code.
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if defined __powerpc64__ || defined _ARCH_PPC64
+#if defined __powerpc64__ || defined __LP64__
                    int ok;
                   #else
                    error fail
@@ -20802,7 +20802,7 @@ then :
 else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __ELF__
+#if defined __ELF__ || (defined __linux__ && defined __EDG__)
         Extensible Linking Format
         #endif
 
@@ -20820,7 +20820,7 @@ rm -rf conftest*
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
 printf "%s\n" "$gl_cv_elf" >&6; }
-  if test $gl_cv_elf; then
+  if test $gl_cv_elf = yes; then
     # Extract the ELF class of a file (5th byte) in decimal.
     # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
     if od -A x < /dev/null >/dev/null 2>/dev/null; then
@@ -20837,19 +20837,22 @@ printf "%s\n" "$gl_cv_elf" >&6; }
         echo
       }
     fi
+    # Use 'expr', not 'test', to compare the values of func_elfclass, because on
+    # Solaris 11 OpenIndiana and Solaris 11 OmniOS, the result is 001 or 002,
+    # not 1 or 2.
     case $HOST_CPU_C_ABI_32BIT in
       yes)
         # 32-bit ABI.
         acl_is_expected_elfclass ()
         {
-          test "`func_elfclass | sed -e 's/[ 	]//g'`" = 1
+          expr "`func_elfclass | sed -e 's/[ 	]//g'`" = 1 > /dev/null
         }
         ;;
       no)
         # 64-bit ABI.
         acl_is_expected_elfclass ()
         {
-          test "`func_elfclass | sed -e 's/[ 	]//g'`" = 2
+          expr "`func_elfclass | sed -e 's/[ 	]//g'`" = 2 > /dev/null
         }
         ;;
       *)
@@ -21379,7 +21382,14 @@ fi
                     fi
                     ;;
                   -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                                                                                                                                                                dep=`echo "X$dep" | sed -e 's/^X-l//'`
+                    if test "X$dep" != Xc \
+                       || case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) false ;;
+                            *)                          true ;;
+                          esac; then
+                      names_next_round="$names_next_round $dep"
+                    fi
                     ;;
                   *.la)
                                                                                 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
@@ -21741,8 +21751,9 @@ int
 main (void)
 {
 int result = 0;
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
+  /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from
+     successful returns.  This is even documented in
+     <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */
   {
     iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
     if (cd_utf8_to_88591 != (iconv_t)(-1))
@@ -22324,7 +22335,14 @@ fi
                     fi
                     ;;
                   -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                                                                                                                                                                dep=`echo "X$dep" | sed -e 's/^X-l//'`
+                    if test "X$dep" != Xc \
+                       || case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) false ;;
+                            *)                          true ;;
+                          esac; then
+                      names_next_round="$names_next_round $dep"
+                    fi
                     ;;
                   *.la)
                                                                                 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
@@ -32768,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.4, which was
+This file was extended by NetworkManager $as_me 1.40.6, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -32836,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.4
+NetworkManager config.status 1.40.6
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
@@ -34859,7 +34877,9 @@ _LT_EOF
                 #      presentlang can be used as a fallback for messages
                 #      which are not translated in the desiredlang catalog).
                 case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
+                  "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
+                    useit=yes
+                    ;;
                 esac
               done
               if test $useit = yes; then
diff --git a/configure.ac b/configure.ac
index 75faec9a..c71e34bf 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], [4])
+m4_define([nm_micro_version], [6])
 m4_define([nm_version],
           [nm_major_version.nm_minor_version.nm_micro_version])
 
diff --git a/debian/changelog b/debian/changelog
index 0f59a7d2..ee1bb985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+network-manager (1.40.6-1) unstable; urgency=medium
+
+  * New upstream version 1.40.6
+  * Depend on polkitd in preference to policykit-1.
+    The latter is a deprecated, transitional package, that also pulls in
+    pkexec, which network-manager doesn't need. Keep policykit-1 as an
+    alternative dependency to make backports easier.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 30 Nov 2022 22:59:25 +0100
+
 network-manager (1.40.4-1ubuntu2) lunar; urgency=medium
 
   * Fix network-manager-config-connectivity-ubuntu.postinst
diff --git a/debian/control b/debian/control
index b717dae8..66ef9185 100644
--- a/debian/control
+++ b/debian/control
@@ -58,7 +58,7 @@ Depends: ${shlibs:Depends},
          default-dbus-system-bus | dbus-system-bus,
          udev,
          adduser,
-         policykit-1
+         polkitd | policykit-1
 Recommends: ppp,
             dnsmasq-base,
             modemmanager,
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index b4911392..ad46bacb 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.4
+      for NetworkManager 1.40.6
 
       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/version.xml b/docs/api/version.xml
index 77926ffe..4adfc24b 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.40.4
+1.40.6
diff --git a/docs/libnm/html/NMSettingEthtool.html b/docs/libnm/html/NMSettingEthtool.html
index c99302eb..d7f53331 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 <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
+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
 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/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html
index 1aeca777..bacd8318 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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionState"><span class="returnvalue">NMVpnConnectionState</span></a>
+<a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState"><span class="returnvalue">NMVpnConnectionState</span></a>
 </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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionState"><span class="type">NMVpnConnectionState</span></a></td>
+<td class="property_type"><a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState"><span class="type">NMVpnConnectionState</span></a></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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionState"><span class="returnvalue">NMVpnConnectionState</span></a>
+<pre class="programlisting"><a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState"><span class="returnvalue">NMVpnConnectionState</span></a>
 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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionState"><span class="type">NMVpnConnectionState</span></a></pre>
+<pre class="programlisting">  “vpn-state”                <a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState"><span class="type">NMVpnConnectionState</span></a></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 276d337b..c66e3496 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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnServiceState"><span class="returnvalue">NMVpnServiceState</span></a>
+<a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="returnvalue">NMVpnServiceState</span></a>
 </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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a></td>
+<td class="property_type"><a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a></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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnServiceState"><span class="returnvalue">NMVpnServiceState</span></a>
+<pre class="programlisting"><a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="returnvalue">NMVpnServiceState</span></a>
 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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a> state</code></em>);</pre>
+                             <em class="parameter"><code><a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a> 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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnPluginFailure"><span class="type">NMVpnPluginFailure</span></a> reason</code></em>);</pre>
+                           <em class="parameter"><code><a href="libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure"><span class="type">NMVpnPluginFailure</span></a> 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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a></pre>
+<pre class="programlisting">  “state”                    <a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a></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 6349d207..fea3574a 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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a></td>
+<td class="property_type"><a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a></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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnPluginFailure"><span class="type">NMVpnPluginFailure</span></a> reason</code></em>);</pre>
+                               <em class="parameter"><code><a href="libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure"><span class="type">NMVpnPluginFailure</span></a> 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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a></pre>
+<pre class="programlisting">  “state”                    <a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"><span class="type">NMVpnServiceState</span></a></pre>
 <p>The state of the plugin.</p>
 <p>Owner: NMVpnServicePlugin</p>
 <p>Flags: Read / Write</p>
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index 7d9bbb3b..33cd7161 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -3765,11 +3765,11 @@ NMUtilsPredicateStr, user_function in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionState">NMVpnConnectionState</a>, enum in nm-vpn-dbus-interface
+<a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState">NMVpnConnectionState</a>, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>, enum in nm-vpn-dbus-interface
+<a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>, 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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnPluginFailure">NMVpnPluginFailure</a>, enum in nm-vpn-dbus-interface
+<a href="libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure">NMVpnPluginFailure</a>, 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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnServiceState">NMVpnServiceState</a>, enum in nm-vpn-dbus-interface
+<a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState">NMVpnServiceState</a>, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -4237,7 +4237,7 @@ NMUtilsPredicateStr, user_function in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-NM_API_VERSION, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-API-VERSION:CAPS">NM_API_VERSION</a>, 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>
-NM_CHECK_VERSION, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-CHECK-VERSION:CAPS">NM_CHECK_VERSION</a>, 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>
-nm_conn_wireguard_import, function in nm-conn-utils
+<a href="libnm-nm-conn-utils.html#nm-conn-wireguard-import">nm_conn_wireguard_import</a>, function in nm-conn-utils
 </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>
-NM_ENCODE_VERSION, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-ENCODE-VERSION:CAPS">NM_ENCODE_VERSION</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_ADAPTIVE_RX, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_ADAPTIVE_TX, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_PKT_RATE_HIGH, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_PKT_RATE_LOW, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_RX_FRAMES, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_RX_FRAMES_HIGH, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_RX_FRAMES_IRQ, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_RX_FRAMES_LOW, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_RX_USECS, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_RX_USECS_HIGH, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_RX_USECS_IRQ, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_RX_USECS_LOW, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_SAMPLE_INTERVAL, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_STATS_BLOCK_USECS, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_TX_FRAMES, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_TX_FRAMES_HIGH, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_TX_FRAMES_IRQ, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_TX_FRAMES_LOW, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_TX_USECS, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_TX_USECS_HIGH, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_TX_USECS_IRQ, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_COALESCE_TX_USECS_LOW, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_ESP_HW_OFFLOAD, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_ESP_TX_CSUM_HW_OFFLOAD, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_FCOE_MTU, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_GRO, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-GRO:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_GRO</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_GSO, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-GSO:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_GSO</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_HIGHDMA, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-HIGHDMA:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_HIGHDMA</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_HW_TC_OFFLOAD, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_L2_FWD_OFFLOAD, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_LOOPBACK, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-LOOPBACK:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_LOOPBACK</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_LRO, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-LRO:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_LRO</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_MACSEC_HW_OFFLOAD, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_NTUPLE, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-NTUPLE:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_NTUPLE</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_RX, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RX:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RX</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_RXHASH, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RXHASH:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RXHASH</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_RXVLAN, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-RXVLAN:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_RXVLAN</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_RX_ALL, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_RX_FCS, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_RX_GRO_HW, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_RX_GRO_LIST, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_RX_UDP_GRO_FORWARDING, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_RX_UDP_TUNNEL_PORT_OFFLOAD, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_FILTER, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_STAG_FILTER, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_STAG_HW_PARSE, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_SG, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-SG:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_SG</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TLS_HW_RECORD, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TLS_HW_RX_OFFLOAD, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TLS_HW_TX_OFFLOAD, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TSO, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TSO:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TSO</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TX:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TX</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TXVLAN, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-TXVLAN:CAPS">NM_ETHTOOL_OPTNAME_FEATURE_TXVLAN</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_FCOE_CRC, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IPV4, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IPV6, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IP_GENERIC, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_SCTP, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_ESP_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_FCOE_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_GRE_CSUM_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_GRE_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_GSO_LIST, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_GSO_PARTIAL, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_GSO_ROBUST, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_IPXIP4_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_IPXIP6_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_NOCACHE_COPY, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_SCATTER_GATHER, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_SCATTER_GATHER_FRAGLIST, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_SCTP_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP6_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_ECN_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_MANGLEID_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_TUNNEL_REMCSUM_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_TNL_CSUM_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_TNL_SEGMENTATION, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_FEATURE_TX_VLAN_STAG_HW_INSERT, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
@@ -7525,31 +7525,31 @@ NM_ETHTOOL_OPTNAME_FEATURE_TX_VLAN_STAG_HW_INSERT, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_PAUSE_AUTONEG, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-PAUSE-AUTONEG:CAPS">NM_ETHTOOL_OPTNAME_PAUSE_AUTONEG</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_PAUSE_RX, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-PAUSE-RX:CAPS">NM_ETHTOOL_OPTNAME_PAUSE_RX</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_PAUSE_TX, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-PAUSE-TX:CAPS">NM_ETHTOOL_OPTNAME_PAUSE_TX</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_RING_RX, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-RING-RX:CAPS">NM_ETHTOOL_OPTNAME_RING_RX</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_RING_RX_JUMBO, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_RING_RX_MINI, macro in nm-ethtool-utils
+<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
 </dt>
 <dd></dd>
 <dt>
-NM_ETHTOOL_OPTNAME_RING_TX, macro in nm-ethtool-utils
+<a href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-RING-TX:CAPS">NM_ETHTOOL_OPTNAME_RING_TX</a>, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
@@ -8209,7 +8209,7 @@ NM_ETHTOOL_OPTNAME_RING_TX, macro in nm-ethtool-utils
 </dt>
 <dd></dd>
 <dt>
-NM_MAJOR_VERSION, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-MAJOR-VERSION:CAPS">NM_MAJOR_VERSION</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
@@ -8221,11 +8221,11 @@ NM_MAJOR_VERSION, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_MICRO_VERSION, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-MICRO-VERSION:CAPS">NM_MICRO_VERSION</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_MINOR_VERSION, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-MINOR-VERSION:CAPS">NM_MINOR_VERSION</a>, 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>
-NM_VERSION, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION:CAPS">NM_VERSION</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_0_9_10, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-0-9-10:CAPS">NM_VERSION_0_9_10</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_0_9_8, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-0-9-8:CAPS">NM_VERSION_0_9_8</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_0, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-0:CAPS">NM_VERSION_1_0</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_10, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-10:CAPS">NM_VERSION_1_10</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_12, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-12:CAPS">NM_VERSION_1_12</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_14, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-14:CAPS">NM_VERSION_1_14</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_16, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-16:CAPS">NM_VERSION_1_16</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_18, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-18:CAPS">NM_VERSION_1_18</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_2, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-2:CAPS">NM_VERSION_1_2</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_20, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-20:CAPS">NM_VERSION_1_20</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_22, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-22:CAPS">NM_VERSION_1_22</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_24, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-24:CAPS">NM_VERSION_1_24</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_26, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-26:CAPS">NM_VERSION_1_26</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_28, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-28:CAPS">NM_VERSION_1_28</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_30, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-30:CAPS">NM_VERSION_1_30</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_32, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-32:CAPS">NM_VERSION_1_32</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_34, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-34:CAPS">NM_VERSION_1_34</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_36, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-36:CAPS">NM_VERSION_1_36</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_38, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-38:CAPS">NM_VERSION_1_38</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_4, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-4:CAPS">NM_VERSION_1_4</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_40, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-40:CAPS">NM_VERSION_1_40</a>, 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>
-NM_VERSION_1_6, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-6:CAPS">NM_VERSION_1_6</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_1_8, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-1-8:CAPS">NM_VERSION_1_8</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_CUR_STABLE, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-CUR-STABLE:CAPS">NM_VERSION_CUR_STABLE</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
@@ -14441,7 +14441,7 @@ NM_VERSION_CUR_STABLE, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VERSION_NEXT_STABLE, macro in nm-version-macros
+<a href="libnm-nm-version-macros.html#NM-VERSION-NEXT-STABLE:CAPS">NM_VERSION_NEXT_STABLE</a>, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
@@ -14561,7 +14561,7 @@ NM_VERSION_NEXT_STABLE, macro in nm-version-macros
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CONFIG_PROXY_PAC, macro in nm-vpn-dbus-interface
+<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
 </dt>
 <dd></dd>
 <dt>
@@ -14753,7 +14753,7 @@ NM_VPN_PLUGIN_CONFIG_PROXY_PAC, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
+<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
 </dt>
 <dd></dd>
 <dt>
@@ -14801,7 +14801,7 @@ NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
+<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
 </dt>
 <dd></dd>
 <dt>
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index 1ed84f22..b8099088 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.4
+      for libnm 1.40.6
 
       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-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 43c80849..1eab93bc 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -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 <code class="literal">NM_VERSION</code>
+<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>
 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 ebc3205c..518a390a 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="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionState">NMVpnConnectionState</a>
-    <span class="lineart">├──</span> <a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>
-    <span class="lineart">├──</span> <a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnPluginFailure">NMVpnPluginFailure</a>
-    <span class="lineart">├──</span> <a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnServiceState">NMVpnServiceState</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> <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 7b11c68f..9e47ca3e 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.4
+  NetworkManager version: 1.40.6
 
   <code class="prompt">$ </code></pre>
 <p>
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index 77926ffe..4adfc24b 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.40.4
+1.40.6
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 4f25a27d..f4492405 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 71 (gettext-0.20.2)
+# gettext.m4 serial 72 (gettext-0.21.1)
 dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -55,22 +55,22 @@ dnl
 AC_DEFUN([AM_GNU_GETTEXT],
 [
   dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [use-libtool], ,
+  m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], ,
     [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
 ])])])])
-  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
+  m4_if(m4_if([$1], [], [old])[]m4_if([$1], [no-libtool], [old]), [old],
     [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported.
 ])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+  m4_if([$2], [], , [m4_if([$2], [need-ngettext], , [m4_if([$2], [need-formatstring-macros], ,
     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
 ])])])])
   define([gt_included_intl],
-    ifelse([$1], [external], [no], [yes]))
+    m4_if([$1], [external], [no], [yes]))
   gt_NEEDS_INIT
   AM_GNU_GETTEXT_NEED([$2])
 
   AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
+  m4_if(gt_included_intl, yes, [
     AC_REQUIRE([AM_INTL_SUBDIR])dnl
   ])
 
@@ -88,7 +88,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
   dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
   dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
   dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
+  m4_if(gt_included_intl, yes, , [
     AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
   ])
 
@@ -98,7 +98,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
   dnl Set USE_NLS.
   AC_REQUIRE([AM_NLS])
 
-  ifelse(gt_included_intl, yes, [
+  m4_if(gt_included_intl, yes, [
     BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
   ])
@@ -118,7 +118,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
   dnl If we use NLS figure out what method
   if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
+    m4_if(gt_included_intl, yes, [
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH([included-gettext],
         [  --with-included-gettext use the GNU gettext library included here],
@@ -174,7 +174,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
           dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
+          m4_if(gt_included_intl, yes, , [
             AM_ICONV_LINK
           ])
           dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
@@ -261,7 +261,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
           INCINTL=
         fi
 
-    ifelse(gt_included_intl, yes, [
+    m4_if(gt_included_intl, yes, [
         if test "$gt_use_preinstalled_gnugettext" != "yes"; then
           dnl GNU gettext is not found in the C library.
           dnl Fall back on included GNU gettext library.
@@ -273,8 +273,8 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
         dnl Mark actions used to generate GNU NLS library.
         BUILD_INCLUDED_LIBINTL=yes
         USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD"
+        LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
+        LTLIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD"
         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
@@ -341,7 +341,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
     POSUB=po
   fi
 
-  ifelse(gt_included_intl, yes, [
+  m4_if(gt_included_intl, yes, [
     dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes'
     dnl because some of the testsuite requires it.
     BUILD_INCLUDED_LIBINTL=yes
diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4
index 6db2aa25..b9223241 100644
--- a/m4/host-cpu-c-abi.m4
+++ b/m4/host-cpu-c-abi.m4
@@ -1,5 +1,5 @@
-# host-cpu-c-abi.m4 serial 13
-dnl Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# host-cpu-c-abi.m4 serial 15
+dnl Copyright (C) 2002-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -211,7 +211,7 @@ changequote([,])dnl
          # be generating 64-bit code.
          AC_COMPILE_IFELSE(
            [AC_LANG_SOURCE(
-              [[#if defined __powerpc64__ || defined _ARCH_PPC64
+              [[#if defined __powerpc64__ || defined __LP64__
                  int ok;
                 #else
                  error fail
@@ -382,6 +382,9 @@ EOF
 #ifndef __ia64__
 #undef __ia64__
 #endif
+#ifndef __loongarch64__
+#undef __loongarch64__
+#endif
 #ifndef __m68k__
 #undef __m68k__
 #endif
@@ -605,7 +608,7 @@ changequote([,])dnl
            # be generating 64-bit code.
            AC_COMPILE_IFELSE(
              [AC_LANG_SOURCE(
-                [[#if defined __powerpc64__ || defined _ARCH_PPC64
+                [[#if defined __powerpc64__ || defined __LP64__
                    int ok;
                   #else
                    error fail
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index e593b727..00057953 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,5 +1,5 @@
-# iconv.m4 serial 21
-dnl Copyright (C) 2000-2002, 2007-2014, 2016-2020 Free Software Foundation,
+# iconv.m4 serial 24
+dnl Copyright (C) 2000-2002, 2007-2014, 2016-2022 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,6 +7,12 @@ dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
+AC_PREREQ([2.64])
+
+dnl Note: AM_ICONV is documented in the GNU gettext manual
+dnl <https://www.gnu.org/software/gettext/manual/html_node/AM_005fICONV.html>.
+dnl Don't make changes that are incompatible with that documentation!
+
 AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
 [
   dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
@@ -86,8 +92,9 @@ AC_DEFUN([AM_ICONV_LINK],
 #endif
              ]],
              [[int result = 0;
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
+  /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from
+     successful returns.  This is even documented in
+     <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */
   {
     iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
     if (cd_utf8_to_88591 != (iconv_t)(-1))
@@ -225,8 +232,7 @@ AC_DEFUN([AM_ICONV_LINK],
   AC_SUBST([LTLIBICONV])
 ])
 
-dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
-dnl avoid warnings like
+dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like
 dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
 dnl This is tricky because of the way 'aclocal' is implemented:
 dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
@@ -234,54 +240,43 @@ dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
 dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
 dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
 dnl   warnings.
-m4_define([gl_iconv_AC_DEFUN],
-  m4_version_prereq([2.64],
-    [[AC_DEFUN_ONCE(
-        [$1], [$2])]],
-    [m4_ifdef([gl_00GNULIB],
-       [[AC_DEFUN_ONCE(
-           [$1], [$2])]],
-       [[AC_DEFUN(
-           [$1], [$2])]])]))
-gl_iconv_AC_DEFUN([AM_ICONV],
+AC_DEFUN_ONCE([AM_ICONV],
 [
   AM_ICONV_LINK
   if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL([am_cv_proto_iconv], [
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
+    AC_CACHE_CHECK([whether iconv is compatible with its POSIX signature],
+      [gl_cv_iconv_nonconst],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[
 #include <stdlib.h>
 #include <iconv.h>
 extern
 #ifdef __cplusplus
 "C"
 #endif
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-           ]],
-           [[]])],
-        [am_cv_proto_iconv_arg1=""],
-        [am_cv_proto_iconv_arg1="const"])
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([
-         $am_cv_proto_iconv])
+            ]],
+            [[]])],
+         [gl_cv_iconv_nonconst=yes],
+         [gl_cv_iconv_nonconst=no])
+      ])
   else
     dnl When compiling GNU libiconv on a system that does not have iconv yet,
     dnl pick the POSIX compliant declaration without 'const'.
-    am_cv_proto_iconv_arg1=""
+    gl_cv_iconv_nonconst=yes
+  fi
+  if test $gl_cv_iconv_nonconst = yes; then
+    iconv_arg1=""
+  else
+    iconv_arg1="const"
   fi
-  AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
+  AC_DEFINE_UNQUOTED([ICONV_CONST], [$iconv_arg1],
     [Define as const if the declaration of iconv() needs const.])
   dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
   m4_ifdef([gl_ICONV_H_DEFAULTS],
     [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
-     if test -n "$am_cv_proto_iconv_arg1"; then
+     if test $gl_cv_iconv_nonconst != yes; then
        ICONV_CONST="const"
      fi
     ])
diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4
index ebd9937c..ecc88d6e 100644
--- a/m4/intlmacosx.m4
+++ b/m4/intlmacosx.m4
@@ -1,5 +1,5 @@
 # intlmacosx.m4 serial 8 (gettext-0.20.2)
-dnl Copyright (C) 2004-2014, 2016, 2019-2020 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014, 2016, 2019-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index 98c348fa..934207a7 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,5 +1,5 @@
-# lib-ld.m4 serial 9
-dnl Copyright (C) 1996-2003, 2009-2020 Free Software Foundation, Inc.
+# lib-ld.m4 serial 10
+dnl Copyright (C) 1996-2003, 2009-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -122,7 +122,7 @@ else
       *-*-aix*)
         AC_COMPILE_IFELSE(
           [AC_LANG_SOURCE(
-             [[#if defined __powerpc64__ || defined _ARCH_PPC64
+             [[#if defined __powerpc64__ || defined __LP64__
                 int ok;
                #else
                 error fail
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index eecf70ec..3b75bcd0 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,5 +1,5 @@
-# lib-link.m4 serial 31
-dnl Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# lib-link.m4 serial 33
+dnl Copyright (C) 2001-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -196,8 +196,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
   ])
   AC_ARG_WITH(PACK[-prefix],
-[[  --with-]]PACK[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
-  --without-]]PACK[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
+[[  --with-]]PACK[[-prefix[=DIR]  search for ]]PACKLIBS[[ in DIR/include and DIR/lib
+  --without-]]PACK[[-prefix     don't search for ]]PACKLIBS[[ in includedir and libdir]],
 [
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -631,7 +631,20 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     ;;
                   -l*)
                     dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    dnl But on GNU systems, ignore -lc options, because
+                    dnl   - linking with libc is the default anyway,
+                    dnl   - linking with libc.a may produce an error
+                    dnl     "/usr/bin/ld: dynamic STT_GNU_IFUNC symbol `strcmp' with pointer equality in `/usr/lib/libc.a(strcmp.o)' can not be used when making an executable; recompile with -fPIE and relink with -pie"
+                    dnl     or may produce an executable that always crashes, see
+                    dnl     <https://lists.gnu.org/archive/html/grep-devel/2020-09/msg00052.html>.
+                    dep=`echo "X$dep" | sed -e 's/^X-l//'`
+                    if test "X$dep" != Xc \
+                       || case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) false ;;
+                            *)                          true ;;
+                          esac; then
+                      names_next_round="$names_next_round $dep"
+                    fi
                     ;;
                   *.la)
                     dnl Handle this in the next round. Throw away the .la's
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index c8a0b464..999f712f 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,5 +1,5 @@
-# lib-prefix.m4 serial 17
-dnl Copyright (C) 2001-2005, 2008-2020 Free Software Foundation, Inc.
+# lib-prefix.m4 serial 20
+dnl Copyright (C) 2001-2005, 2008-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -174,14 +174,14 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
 
   AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf],
     [AC_EGREP_CPP([Extensible Linking Format],
-       [#ifdef __ELF__
+       [#if defined __ELF__ || (defined __linux__ && defined __EDG__)
         Extensible Linking Format
         #endif
        ],
        [gl_cv_elf=yes],
        [gl_cv_elf=no])
-     ])
-  if test $gl_cv_elf; then
+    ])
+  if test $gl_cv_elf = yes; then
     # Extract the ELF class of a file (5th byte) in decimal.
     # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
     if od -A x < /dev/null >/dev/null 2>/dev/null; then
@@ -198,20 +198,23 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
         echo
       }
     fi
+    # Use 'expr', not 'test', to compare the values of func_elfclass, because on
+    # Solaris 11 OpenIndiana and Solaris 11 OmniOS, the result is 001 or 002,
+    # not 1 or 2.
 changequote(,)dnl
     case $HOST_CPU_C_ABI_32BIT in
       yes)
         # 32-bit ABI.
         acl_is_expected_elfclass ()
         {
-          test "`func_elfclass | sed -e 's/[ 	]//g'`" = 1
+          expr "`func_elfclass | sed -e 's/[ 	]//g'`" = 1 > /dev/null
         }
         ;;
       no)
         # 64-bit ABI.
         acl_is_expected_elfclass ()
         {
-          test "`func_elfclass | sed -e 's/[ 	]//g'`" = 2
+          expr "`func_elfclass | sed -e 's/[ 	]//g'`" = 2 > /dev/null
         }
         ;;
       *)
diff --git a/m4/nls.m4 b/m4/nls.m4
index 5a506fc4..7c11c90f 100644
--- a/m4/nls.m4
+++ b/m4/nls.m4
@@ -1,5 +1,5 @@
 # nls.m4 serial 6 (gettext-0.20.2)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2020 Free
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2022 Free
 dnl Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/po.m4 b/m4/po.m4
index 3778fd7a..2f14f8e2 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,5 +1,5 @@
-# po.m4 serial 31 (gettext-0.20.2)
-dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc.
+# po.m4 serial 32 (gettext-0.21.1)
+dnl Copyright (C) 1995-2014, 2016, 2018-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -179,7 +179,9 @@ changequote([,])dnl
                 #      presentlang can be used as a fallback for messages
                 #      which are not translated in the desiredlang catalog).
                 case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
+                  "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
+                    useit=yes
+                    ;;
                 esac
               done
               if test $useit = yes; then
@@ -379,7 +381,9 @@ changequote([,])dnl
         #      presentlang can be used as a fallback for messages
         #      which are not translated in the desiredlang catalog).
         case "$desiredlang" in
-          "$presentlang"*) useit=yes;;
+          "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
+            useit=yes
+            ;;
         esac
       done
       if test $useit = yes; then
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index f28010ae..4a5b0b4c 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -1,5 +1,5 @@
-# progtest.m4 serial 8 (gettext-0.20.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2020 Free Software Foundation, Inc.
+# progtest.m4 serial 9 (gettext-0.21.1)
+dnl Copyright (C) 1996-2003, 2005, 2008-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -16,7 +16,7 @@ dnl They are *not* in the public domain.
 dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-AC_PREREQ([2.50])
+AC_PREREQ([2.53])
 
 # Search path for a program which passes the given test.
 
@@ -61,7 +61,7 @@ AC_CACHE_VAL([ac_cv_path_$1],
     ;;
   *)
     ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    for ac_dir in m4_if([$5], , $PATH, [$5]); do
       IFS="$ac_save_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
@@ -77,12 +77,12 @@ AC_CACHE_VAL([ac_cv_path_$1],
     IFS="$ac_save_IFS"
 dnl If no 4th arg is given, leave the cache variable unset,
 dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+m4_if([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
 ])dnl
     ;;
 esac])dnl
 $1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+if test m4_if([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
   AC_MSG_RESULT([$][$1])
 else
   AC_MSG_RESULT([no])
diff --git a/man/NetworkManager-dispatcher.8 b/man/NetworkManager-dispatcher.8
index b43bfbe3..d3f63517 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager-dispatcher 1.40.4
+.\"    Source: NetworkManager-dispatcher 1.40.6
 .\"  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 919efeb4..d9f16857 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager-wait-online.service 1.40.4
+.\"    Source: NetworkManager-wait-online.service 1.40.6
 .\"  Language: English
 .\"
 .TH "NETWORKMANAGER\-WAIT\-ONLINE\&" "8" "" "NetworkManager\-wait\-online\&" "Network management daemons"
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index ccc74e72..f2ab69e6 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.40.4
+.\"    Source: NetworkManager 1.40.6
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.40\&.4" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.40\&.6" "Network management daemons"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 0b8dbab9..3373214a 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.40.4
+.\"    Source: NetworkManager 1.40.6
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.40\&.4" "Configuration"
+.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.40\&.6" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-cloud-setup.8 b/man/nm-cloud-setup.8
index 39209fb8..a750efaa 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: Automatic Network Configuration in Cloud with NetworkManager
-.\"    Source: NetworkManager 1.40.4
+.\"    Source: NetworkManager 1.40.6
 .\"  Language: English
 .\"
-.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.40\&.4" "Automatic Network Configuratio"
+.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.40\&.6" "Automatic Network Configuratio"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-initrd-generator.8 b/man/nm-initrd-generator.8
index 5ddd198c..f3b45def 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: System Administration
-.\"    Source: NetworkManager 1.40.4
+.\"    Source: NetworkManager 1.40.6
 .\"  Language: English
 .\"
-.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.40\&.4" "System Administration"
+.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.40\&.6" "System Administration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-online.1 b/man/nm-online.1
index 28c4d277..03bb9cfb 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.40.4
+.\"    Source: NetworkManager 1.40.6
 .\"  Language: English
 .\"
-.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.40\&.4" "General Commands Manual"
+.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.40\&.6" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7
index dc407104..73ea2a99 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: Open vSwitch support overview
-.\"    Source: NetworkManager 1.40.4
+.\"    Source: NetworkManager 1.40.6
 .\"  Language: English
 .\"
-.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.40\&.4" "Open vSwitch support overview"
+.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.40\&.6" "Open vSwitch support overview"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-dbus.5 b/man/nm-settings-dbus.5
index 63fe0d33..57bcba96 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.40.4
+.\"    Source: NetworkManager 1.40.6
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.40\&.4" "Configuration"
+.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.40\&.6" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-dbus.xml b/man/nm-settings-dbus.xml
index 5901b8c8..d02addff 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.4</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.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>
           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
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index fe1899e0..90fa6662 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.40.4
+.\"    Source: NetworkManager 1.40.6
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.40\&.4" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.40\&.6" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index 15e7698d..8106d703 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.4</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.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>
           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 d57dd77f..90ee1456 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.40.4
+.\"    Source: NetworkManager 1.40.6
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.40\&.4" "Configuration"
+.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.40\&.6" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index 77d52369..45e78cab 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.4</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.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>
           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 5ae4274f..20b571b6 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.40.4
+.\"    Source: NetworkManager 1.40.6
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.40\&.4" "Configuration"
+.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.40\&.6" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-nmcli.xml b/man/nm-settings-nmcli.xml
index 083bfb4a..a0bfd8d9 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.4</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.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>
           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
diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7
index b871f32b..65bcd698 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.40.4
+.\"    Source: NetworkManager 1.40.6
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.40\&.4" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.40\&.6" "Examples"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmcli.1 b/man/nmcli.1
index 2d7e5c6f..f11bc34f 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.40.4
+.\"    Source: NetworkManager 1.40.6
 .\"  Language: English
 .\"
-.TH "NMCLI" "1" "" "NetworkManager 1\&.40\&.4" "General Commands Manual"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.40\&.6" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmtui.1 b/man/nmtui.1
index fca2d6e8..f126a124 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/18/2022
+.\"      Date: 11/30/2022
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.40.4
+.\"    Source: NetworkManager 1.40.6
 .\"  Language: English
 .\"
-.TH "NMTUI" "1" "" "NetworkManager 1\&.40\&.4" "General Commands Manual"
+.TH "NMTUI" "1" "" "NetworkManager 1\&.40\&.6" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/meson.build b/meson.build
index 246359a5..fbf4bf8d 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.4',
+  version: '1.40.6',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
diff --git a/po/NetworkManager.pot b/po/NetworkManager.pot
index b234313b..495cdac6 100644
--- a/po/NetworkManager.pot
+++ b/po/NetworkManager.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager 1.40.4\n"
+"Project-Id-Version: NetworkManager 1.40.6\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/NetworkManager/"
 "NetworkManager/issues\n"
-"POT-Creation-Date: 2022-11-18 10:02+0100\n"
+"POT-Creation-Date: 2022-11-30 16:29+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"
@@ -297,7 +297,7 @@ msgstr ""
 msgid "WPAN connection"
 msgstr ""
 
-#: src/core/devices/team/nm-device-team.c:130
+#: src/core/devices/team/nm-device-team.c:131
 msgid "Team connection"
 msgstr ""
 
diff --git a/src/core/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c
index e6d34266..4e073ddf 100644
--- a/src/core/devices/team/nm-device-team.c
+++ b/src/core/devices/team/nm-device-team.c
@@ -43,6 +43,7 @@ typedef struct {
     bool               kill_in_progress : 1;
     GFileMonitor      *usock_monitor;
     NMDeviceStageState stage1_state : 3;
+    GHashTable        *port_configs;
 } NMDeviceTeamPrivate;
 
 struct _NMDeviceTeam {
@@ -138,20 +139,44 @@ complete_connection(NMDevice            *device,
 }
 
 static gboolean
+_update_port_config(NMDeviceTeam *self, const char *port_iface, const char *sanitized_config)
+{
+    NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE(self);
+    int                  err;
+
+    err = teamdctl_port_config_update_raw(priv->tdc, port_iface, sanitized_config);
+    if (err != 0) {
+        _LOGE(LOGD_TEAM, "failed to update config for port %s (err=%d)", port_iface, err);
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+static gboolean
 ensure_teamd_connection(NMDevice *device)
 {
     NMDeviceTeam         *self  = NM_DEVICE_TEAM(device);
     NMDeviceTeamPrivate  *priv  = NM_DEVICE_TEAM_GET_PRIVATE(self);
     gs_free_error GError *error = NULL;
+    const char           *port_iface;
+    const char           *port_config;
+    GHashTableIter        iter;
 
     if (priv->tdc)
         return TRUE;
 
     priv->tdc = _tdc_connect_new(self, nm_device_get_iface(device), &error);
-    if (!priv->tdc)
+    if (!priv->tdc) {
         _LOGE(LOGD_TEAM, "failed to connect to teamd: %s", error->message);
+        return FALSE;
+    }
 
-    return !!priv->tdc;
+    g_hash_table_iter_init(&iter, priv->port_configs);
+    while (g_hash_table_iter_next(&iter, (gpointer *) &port_iface, (gpointer *) &port_config))
+        _update_port_config(self, port_iface, port_config);
+
+    return TRUE;
 }
 
 static const char *
@@ -840,28 +865,20 @@ attach_port(NMDevice                  *device,
 
         s_team_port = nm_connection_get_setting_team_port(connection);
         if (s_team_port) {
-            const char *config = nm_setting_team_port_get_config(s_team_port);
-
-            if (config) {
-                if (!priv->tdc) {
-                    _LOGW(LOGD_TEAM,
-                          "attached team port %s config not changed, not connected to teamd",
-                          port_iface);
-                } else {
-                    gs_free char *sanitized_config = NULL;
-                    int           err;
-
-                    sanitized_config = g_strdup(config);
-                    g_strdelimit(sanitized_config, "\r\n", ' ');
-                    err = teamdctl_port_config_update_raw(priv->tdc, port_iface, sanitized_config);
-                    if (err != 0) {
-                        _LOGE(LOGD_TEAM,
-                              "failed to update config for port %s (err=%d)",
-                              port_iface,
-                              err);
-                        return FALSE;
-                    }
-                }
+            char *sanitized_config;
+
+            sanitized_config = g_strdup(nm_setting_team_port_get_config(s_team_port) ?: "{}");
+            g_strdelimit(sanitized_config, "\r\n", ' ');
+
+            g_hash_table_insert(priv->port_configs, g_strdup(port_iface), sanitized_config);
+
+            if (!priv->tdc) {
+                _LOGW(LOGD_TEAM,
+                      "attached team port %s config not changed, not connected to teamd",
+                      port_iface);
+            } else {
+                if (!_update_port_config(self, port_iface, sanitized_config))
+                    return FALSE;
             }
         }
         success = nm_platform_link_enslave(nm_device_get_platform(device),
@@ -885,8 +902,9 @@ attach_port(NMDevice                  *device,
 static void
 detach_port(NMDevice *device, NMDevice *port, gboolean configure)
 {
-    NMDeviceTeam        *self = NM_DEVICE_TEAM(device);
-    NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE(self);
+    NMDeviceTeam        *self       = NM_DEVICE_TEAM(device);
+    NMDeviceTeamPrivate *priv       = NM_DEVICE_TEAM_GET_PRIVATE(self);
+    const char          *port_iface = nm_device_get_ip_iface(port);
     gboolean             do_release, success;
     NMSettingTeamPort   *s_port;
     int                  ifindex_port;
@@ -902,36 +920,36 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure)
     ifindex_port = nm_device_get_ip_ifindex(port);
 
     if (ifindex_port <= 0) {
-        _LOGD(LOGD_TEAM, "team port %s is already detached", nm_device_get_ip_iface(port));
+        _LOGD(LOGD_TEAM, "team port %s is already detached", port_iface);
     } else if (do_release) {
         success = nm_platform_link_release(nm_device_get_platform(device),
                                            nm_device_get_ip_ifindex(device),
                                            ifindex_port);
         if (success)
-            _LOGI(LOGD_TEAM, "detached team port %s", nm_device_get_ip_iface(port));
+            _LOGI(LOGD_TEAM, "detached team port %s", port_iface);
         else
-            _LOGW(LOGD_TEAM, "failed to detach team port %s", nm_device_get_ip_iface(port));
+            _LOGW(LOGD_TEAM, "failed to detach team port %s", port_iface);
 
         /* Kernel team code "closes" the port when releasing it, (which clears
          * 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)) {
-            _LOGW(LOGD_TEAM,
-                  "detached team port %s could not be brought up",
-                  nm_device_get_ip_iface(port));
+            _LOGW(LOGD_TEAM, "detached team port %s could not be brought up", port_iface);
         }
 
         nm_clear_g_source(&priv->teamd_read_timeout);
         priv->teamd_read_timeout = g_timeout_add_seconds(5, teamd_read_timeout_cb, self);
     } else
-        _LOGI(LOGD_TEAM, "team port %s was detached", nm_device_get_ip_iface(port));
+        _LOGI(LOGD_TEAM, "team port %s was detached", port_iface);
 
     /* Delete any port configuration we previously set */
     if (configure && priv->tdc
         && (s_port = nm_device_get_applied_setting(port, NM_TYPE_SETTING_TEAM_PORT))
-        && (nm_setting_team_port_get_config(s_port)))
-        teamdctl_port_config_update_raw(priv->tdc, nm_device_get_ip_iface(port), "{}");
+        && (nm_setting_team_port_get_config(s_port))) {
+        _update_port_config(self, port_iface, "{}");
+        g_hash_table_remove(priv->port_configs, port_iface);
+    }
 }
 
 static gboolean
@@ -995,6 +1013,8 @@ constructed(GObject *object)
 
     G_OBJECT_CLASS(nm_device_team_parent_class)->constructed(object);
 
+    priv->port_configs = g_hash_table_new_full(nm_str_hash, g_str_equal, g_free, g_free);
+
     if (nm_dbus_manager_get_dbus_connection(nm_dbus_manager_get())) {
         /* Register D-Bus name watcher */
         tmp_str = g_strdup_printf("org.libteam.teamd.%s", nm_device_get_ip_iface(device));
@@ -1054,6 +1074,7 @@ dispose(GObject *object)
 
     teamd_cleanup(self, TRUE);
     nm_clear_g_free(&priv->config);
+    nm_clear_pointer(&priv->port_configs, g_hash_table_destroy);
 
     G_OBJECT_CLASS(nm_device_team_parent_class)->dispose(object);
 }
diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c
index be6ad4de..1c6d36c2 100644
--- a/src/libnm-core-impl/nm-utils.c
+++ b/src/libnm-core-impl/nm-utils.c
@@ -147,7 +147,7 @@ nm_sock_addr_endpoint_new(const char *endpoint)
     gsize               i;
     gs_free char       *host_clone = NULL;
     const char         *host;
-    guint16             port;
+    guint16             port = 0;
 
     g_return_val_if_fail(endpoint, NULL);
 
diff --git a/src/libnm-core-public/nm-version-macros.h b/src/libnm-core-public/nm-version-macros.h
index 4dce57f6..04fce5df 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 (4)
+#define NM_MICRO_VERSION (6)
 
 /**
  * NM_CHECK_VERSION: