Imported Upstream version 1.2.0 upstream/1.2.0

author: Michael Biebl <biebl@debian.org> 2016-04-20 21:11:10 +0200
committer: Michael Biebl <biebl@debian.org> 2016-04-20 21:11:10 +0200
commit: 78c3b8801ecf4975e5da1af3b10ae20dd2d876de (patch)
tree: 19b80fbe9429f554a48ed126911026d4fa8a4b3f
parent: 288a08a3672a89a9bfdb8354b6863cc039759fc2 (diff)
108 files changed, 1586 insertions, 1275 deletions
diff --git a/configure b/configure
index 2788d1f1..fd20c533 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.69 for NetworkManager 1.1.94.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.2.0.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager'
 PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='1.1.94'
-PACKAGE_STRING='NetworkManager 1.1.94'
+PACKAGE_VERSION='1.2.0'
+PACKAGE_STRING='NetworkManager 1.2.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1685,7 +1685,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.1.94 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.2.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1755,7 +1755,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.1.94:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.2.0:";;
    esac
   cat <<\_ACEOF
 
@@ -2062,7 +2062,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.1.94
+NetworkManager configure 1.2.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2789,7 +2789,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.1.94, which was
+It was created by NetworkManager $as_me 1.2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3659,7 +3659,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.1.94'
+ VERSION='1.2.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17539,10 +17539,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=1
-NM_MICRO_VERSION=94
-NM_VERSION=1.1.94
-NM_GIT_SHA=304f676e6e355ac581eca20f4d987c627ec2458b
+NM_MINOR_VERSION=2
+NM_MICRO_VERSION=0
+NM_VERSION=1.2.0
+NM_GIT_SHA=d3d648f9ef1086fdba8f5c320b380ff962f674db
 
 
 
@@ -27298,7 +27298,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.1.94, which was
+This file was extended by NetworkManager $as_me 1.2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27364,7 +27364,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-NetworkManager config.status 1.1.94
+NetworkManager config.status 1.2.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 3ef50261..ab2993a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ AC_PREREQ([2.63])
 
 dnl The NM version number
 m4_define([nm_major_version], [1])
-m4_define([nm_minor_version], [1])
-m4_define([nm_micro_version], [94])
+m4_define([nm_minor_version], [2])
+m4_define([nm_micro_version], [0])
 m4_define([nm_version],
           [nm_major_version.nm_minor_version.nm_micro_version])
 m4_define([nm_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])])
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
index ccf36e84..8669fdc9 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
@@ -87,7 +87,7 @@ Flags  readable   u
 </pre>
 <p>        Flags describing the capabilities of the access point.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211ApFlags">NM80211ApFlags</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApFlags">NM80211ApFlags</a>
 </p>
 </div>
 <hr>
@@ -99,7 +99,7 @@ WpaFlags  readable   u
 <p>        Flags describing the access point's capabilities according to WPA (Wifi
         Protected Access).
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211ApSecurityFlags">NM80211ApSecurityFlags</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags">NM80211ApSecurityFlags</a>
 </p>
 </div>
 <hr>
@@ -111,7 +111,7 @@ RsnFlags  readable   u
 <p>        Flags describing the access point's capabilities according to the RSN
         (Robust Secure Network) protocol.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211ApSecurityFlags">NM80211ApSecurityFlags</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags">NM80211ApSecurityFlags</a>
 </p>
 </div>
 <hr>
@@ -149,7 +149,7 @@ Mode  readable   u
 </pre>
 <p>        Describes the operating mode of the access point.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211Mode">NM80211Mode</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode">NM80211Mode</a>
 </p>
 </div>
 <hr>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
index b32df401..91c82cd9 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
@@ -86,7 +86,7 @@ RegisterWithCapabilities (IN  s identifier,
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN u <em class="parameter"><code>capabilities</code></em></code>:</span></p></td>
-<td><p>(<a href="https://developer.gnome.org/libnm-glib/0.9/NMSecretAgent.html#NMSecretAgentCapabilities">NMSecretAgentCapabilities</a>) Indicates various agent capabilities to NetworkManager.</p></td>
+<td><p>(<a href="/usr/share/gtk-doc/html/libnm-glib/NMSecretAgent.html#NMSecretAgentCapabilities">NMSecretAgentCapabilities</a>) Indicates various agent capabilities to NetworkManager.</p></td>
 </tr>
 </tbody>
 </table></div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
index 394b34fb..5078108b 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
@@ -166,7 +166,7 @@ State  readable   u
 </pre>
 <p>        The state of this active connection.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMActiveConnectionState">NMActiveConnectionState</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMActiveConnectionState">NMActiveConnectionState</a>
 </p>
 </div>
 <hr>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
index bf8d3abd..96d7124e 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
@@ -98,7 +98,7 @@ BtCapabilities  readable   u
 </pre>
 <p>        Bluetooth capabilities of the device (either DUN or NAP).
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMBluetoothCapabilities">NMBluetoothCapabilities</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities">NMBluetoothCapabilities</a>
 </p>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
index cc18c40f..d375b528 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
@@ -82,7 +82,7 @@ ModemCapabilities  readable   u
         firmware reload or other reinitialization to switch between eg CDMA/EVDO
         and GSM/UMTS.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceModemCapabilities">NMDeviceModemCapabilities</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities">NMDeviceModemCapabilities</a>
 </p>
 </div>
 <hr>
@@ -94,7 +94,7 @@ CurrentCapabilities  readable   u
 <p>        The generic family of access technologies the modem currently supports
         without a firmware reload or reinitialization.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceModemCapabilities">NMDeviceModemCapabilities</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities">NMDeviceModemCapabilities</a>
 </p>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
index b13c244c..afe7fec5 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
@@ -214,7 +214,7 @@ Mode  readable   u
 </pre>
 <p>        The operating mode of the wireless device.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211Mode">NM80211Mode</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode">NM80211Mode</a>
 </p>
 </div>
 <hr>
@@ -253,7 +253,7 @@ WirelessCapabilities  readable   u
 </pre>
 <p>        The capabilities of the wireless device.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceWifiCapabilities">NMDeviceWifiCapabilities</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceWifiCapabilities">NMDeviceWifiCapabilities</a>
 </p>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
index 3acd8a78..4bcc0ccb 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
@@ -217,15 +217,15 @@ StateChanged (u new_state,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>new_state</code></em></code>:</span></p></td>
-<td><p>(<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a>) The new state of the device.</p></td>
+<td><p>(<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a>) The new state of the device.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>old_state</code></em></code>:</span></p></td>
-<td><p>(<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a>) The previous state of the device.</p></td>
+<td><p>(<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a>) The previous state of the device.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>reason</code></em></code>:</span></p></td>
-<td><p>(<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceStateReason">NMDeviceStateReason</a>) A reason for the state transition.</p></td>
+<td><p>(<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceStateReason">NMDeviceStateReason</a>) A reason for the state transition.</p></td>
 </tr>
 </tbody>
 </table></div>
@@ -307,7 +307,7 @@ Capabilities  readable   u
 </pre>
 <p>        Flags describing the capabilities of the device.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceCapabilities">NMDeviceCapabilities</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceCapabilities">NMDeviceCapabilities</a>
 </p>
 </div>
 <hr>
@@ -328,7 +328,7 @@ State  readable   u
 </pre>
 <p>        The current state of the device.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a>
 </p>
 </div>
 <hr>
@@ -339,7 +339,7 @@ StateReason  readable   (uu)
 </pre>
 <p>        The current state and reason for changing to that state.
 </p>
-<p>        Returns: A tuple of  <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a> and  <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceStateReason">NMDeviceStateReason</a>.
+<p>        Returns: A tuple of  <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a> and  <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceStateReason">NMDeviceStateReason</a>.
 </p>
 </div>
 <hr>
@@ -451,7 +451,7 @@ DeviceType  readable   u
 </pre>
 <p>        The general type of the network device; ie Ethernet, WiFi, etc.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceType">NMDeviceType</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceType">NMDeviceType</a>
 </p>
 </div>
 <hr>
@@ -494,7 +494,7 @@ Metered  readable   u
 <p>        Whether the amount of traffic flowing through the device is subject to
         limitations, for example set by service providers.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm/1.0/libnm-nm-dbus-interface.html#NMMetered">NMMetered</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMMetered">NMMetered</a>
 </p>
 </div>
 <hr>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
index 6022ef16..23201a1f 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
@@ -105,7 +105,7 @@ GetSecrets (IN  a{sa{sv}} connection,
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN u <em class="parameter"><code>flags</code></em></code>:</span></p></td>
-<td><p>(<a href="https://developer.gnome.org/libnm-glib/0.9/NMSecretAgent.html#NMSecretAgentGetSecretsFlags">NMSecretAgentGetSecretsFlags</a>) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.</p></td>
+<td><p>(<a href="/usr/share/gtk-doc/html/libnm-glib/NMSecretAgent.html#NMSecretAgentGetSecretsFlags">NMSecretAgentGetSecretsFlags</a>) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">OUT a{sa{sv}} <em class="parameter"><code>secrets</code></em></code>:</span></p></td>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
index ebaad8d8..4bb08ff8 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
@@ -89,11 +89,11 @@ VpnStateChanged (u state,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>state</code></em></code>:</span></p></td>
-<td><p>(<a href="https://developer.gnome.org/libnm/1.0/libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState">NMVpnConnectionState</a>) The new state of the VPN connection.</p></td>
+<td><p>(<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState">NMVpnConnectionState</a>) The new state of the VPN connection.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>reason</code></em></code>:</span></p></td>
-<td><p>(<a href="https://developer.gnome.org/libnm/1.0/libnm-nm-vpn-dbus-interface.html#NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>) Reason code describing the change to the new state.</p></td>
+<td><p>(<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-vpn-dbus-interface.html#NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>) Reason code describing the change to the new state.</p></td>
 </tr>
 </tbody>
 </table></div>
@@ -108,7 +108,7 @@ VpnState  readable   u
 </pre>
 <p>        The VPN-specific state of the connection.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm/1.0/libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState">NMVpnConnectionState</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState">NMVpnConnectionState</a>
 </p>
 </div>
 <hr>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
index a5dc49ec..87db2178 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
@@ -272,7 +272,7 @@ StateChanged (u state);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>state</code></em></code>:</span></p></td>
-<td><p>(<a href="https://developer.gnome.org/libnm/1.0/libnm-nm-vpn-dbus-interface.html#NMVpnServiceState">NMVpnServiceState</a>) The new state of the plugin.</p></td>
+<td><p>(<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-vpn-dbus-interface.html#NMVpnServiceState">NMVpnServiceState</a>) The new state of the plugin.</p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -395,7 +395,7 @@ Failure (u reason);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>reason</code></em></code>:</span></p></td>
-<td><p>(<a href="https://developer.gnome.org/libnm/1.0/libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure">NMVpnPluginFailure</a>) Reason code for the failure.</p></td>
+<td><p>(<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure">NMVpnPluginFailure</a>) Reason code for the failure.</p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -409,7 +409,7 @@ State  readable   u
 </pre>
 <p>        The state of the plugin.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm/1.0/libnm-nm-vpn-dbus-interface.html#NMVpnServiceState">NMVpnServiceState</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-vpn-dbus-interface.html#NMVpnServiceState">NMVpnServiceState</a>
 </p>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
index 4fd2675c..a3468b7e 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
@@ -398,7 +398,7 @@ CheckConnectivity (OUT u connectivity);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">OUT u <em class="parameter"><code>connectivity</code></em></code>:</span></p></td>
-<td><p>(<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMConnectivityState">NMConnectivityState</a>) The current connectivity state.</p></td>
+<td><p>(<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState">NMConnectivityState</a>) The current connectivity state.</p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -418,7 +418,7 @@ state (OUT u state);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">OUT u <em class="parameter"><code>state</code></em></code>:</span></p></td>
-<td><p><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMState">NMState</a></p></td>
+<td><p><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState">NMState</a></p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -449,7 +449,7 @@ StateChanged (u state);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>state</code></em></code>:</span></p></td>
-<td><p>(<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMState">NMState</a>) The new state of NetworkManager.</p></td>
+<td><p>(<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState">NMState</a>) The new state of NetworkManager.</p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -643,7 +643,7 @@ Metered  readable   u
 <p>        Indicates whether the connectivity is metered. This is equivalent to the
         metered property of the device associated with the primary connection.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm/1.0/libnm-nm-dbus-interface.html#NMMetered">NMMetered</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMMetered">NMMetered</a>
 </p>
 </div>
 <hr>
@@ -685,7 +685,7 @@ State  readable   u
 </pre>
 <p>        The overall state of the NetworkManager daemon.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMState">NMState</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState">NMState</a>
 </p>
 </div>
 <hr>
@@ -696,7 +696,7 @@ Connectivity  readable   u
 </pre>
 <p>        The network connectivity state.
 </p>
-<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMConnectivityState">NMConnectivityState</a>
+<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState">NMConnectivityState</a>
 </p>
 </div>
 <hr>
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index c3c1b2dc..e31a7500 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -14,7 +14,7 @@
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">Version 1.1.94
+<div><p class="releaseinfo">Version 1.2.0
 </p></div>
 <div><p class="copyright">Copyright © 2012, 2013, 2014, 2015, 2016 The NetworkManager Authors</p></div>
 <div><div class="legalnotice">
diff --git a/docs/api/version.xml b/docs/api/version.xml
index ead65f0a..26aaba0e 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.1.94
+1.2.0
diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index a178775a..9b26174f 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -51,7 +51,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211ApFlags"><span class="returnvalue">NM80211ApFlags</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApFlags"><span class="returnvalue">NM80211ApFlags</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMAccessPoint.html#nm-access-point-get-flags" title="nm_access_point_get_flags ()">nm_access_point_get_flags</a> <span class="c_punctuation">()</span>
@@ -59,7 +59,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMAccessPoint.html#nm-access-point-get-wpa-flags" title="nm_access_point_get_wpa_flags ()">nm_access_point_get_wpa_flags</a> <span class="c_punctuation">()</span>
@@ -67,7 +67,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMAccessPoint.html#nm-access-point-get-rsn-flags" title="nm_access_point_get_rsn_flags ()">nm_access_point_get_rsn_flags</a> <span class="c_punctuation">()</span>
@@ -97,7 +97,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMAccessPoint.html#nm-access-point-get-mode" title="nm_access_point_get_mode ()">nm_access_point_get_mode</a> <span class="c_punctuation">()</span>
@@ -327,7 +327,7 @@ nm_access_point_new (<em class="parameter"><code><a href="/usr/share/gtk-doc/htm
 <hr>
 <div class="refsect2">
 <a name="nm-access-point-get-flags"></a><h3>nm_access_point_get_flags ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211ApFlags"><span class="returnvalue">NM80211ApFlags</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApFlags"><span class="returnvalue">NM80211ApFlags</span></a>
 nm_access_point_get_flags (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the flags of the access point.</p>
 <div class="refsect3">
@@ -353,7 +353,7 @@ nm_access_point_get_flags (<em class="parameter"><code><a class="link" href="NMA
 <hr>
 <div class="refsect2">
 <a name="nm-access-point-get-wpa-flags"></a><h3>nm_access_point_get_wpa_flags ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
 nm_access_point_get_wpa_flags (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the WPA (version 1) flags of the access point.</p>
 <div class="refsect3">
@@ -379,7 +379,7 @@ nm_access_point_get_wpa_flags (<em class="parameter"><code><a class="link" href=
 <hr>
 <div class="refsect2">
 <a name="nm-access-point-get-rsn-flags"></a><h3>nm_access_point_get_rsn_flags ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
 nm_access_point_get_rsn_flags (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access
 point.</p>
@@ -486,7 +486,7 @@ nm_access_point_get_frequency (<em class="parameter"><code><a class="link" href=
 <hr>
 <div class="refsect2">
 <a name="nm-access-point-get-mode"></a><h3>nm_access_point_get_mode ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
 nm_access_point_get_mode (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the mode of the access point.</p>
 <div class="refsect3">
@@ -622,7 +622,7 @@ filter that list with this function.</p>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
 <td class="parameter_description"><p> a list of
-<a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> objects to filter. </p></td>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> objects to filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
 </tbody>
@@ -631,7 +631,7 @@ filter that list with this function.</p>
 <div class="refsect3">
 <a name="id-1.3.19.8.13.7"></a><h4>Returns</h4>
 <p> a
-list of <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> objects that could be activated with the given <em class="parameter"><code>ap</code></em>
+list of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> objects that could be activated with the given <em class="parameter"><code>ap</code></em>
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
@@ -644,7 +644,7 @@ be freed with <code class="function">g_slist_free()</code> when it is no longer
 <a name="nm-access-point-connection-valid"></a><h3>nm_access_point_connection_valid ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_access_point_connection_valid (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>,
-                                  <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                                  <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Validates a given connection against a given Wi-Fi access point to ensure that
 the connection may be activated with that AP.  The connection must match the
 <em class="parameter"><code>ap</code></em>
@@ -667,7 +667,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>ap</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>ap</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index 51037dca..895f4e7b 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -93,7 +93,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMActiveConnectionState"><span class="returnvalue">NMActiveConnectionState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMActiveConnectionState"><span class="returnvalue">NMActiveConnectionState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMActiveConnection.html#nm-active-connection-get-state" title="nm_active_connection_get_state ()">nm_active_connection_get_state</a> <span class="c_punctuation">()</span>
@@ -386,7 +386,7 @@ nm_active_connection_new (<em class="parameter"><code><a href="/usr/share/gtk-do
 <a name="nm-active-connection-get-connection"></a><h3>nm_active_connection_get_connection ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_connection (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>'s DBus object path.  This is often used with
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>'s DBus object path.  This is often used with
 <a class="link" href="NMRemoteSettings.html#nm-remote-settings-get-connection-by-path" title="nm_remote_settings_get_connection_by_path ()"><code class="function">nm_remote_settings_get_connection_by_path()</code></a> to retrieve the
 <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> object that describes the connection.</p>
 <div class="refsect3">
@@ -406,7 +406,7 @@ nm_active_connection_get_connection (<em class="parameter"><code><a class="link"
 </div>
 <div class="refsect3">
 <a name="id-1.3.3.8.3.6"></a><h4>Returns</h4>
-<p> the object path of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> which this <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>
+<p> the object path of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> which this <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>
 is an active instance of.  This is the internal string used by the
 connection, and must not be modified.</p>
 </div>
@@ -416,7 +416,7 @@ connection, and must not be modified.</p>
 <a name="nm-active-connection-get-id"></a><h3>nm_active_connection_get_id ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_id (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>'s ID.</p>
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>'s ID.</p>
 <div class="refsect3">
 <a name="id-1.3.3.8.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -434,7 +434,7 @@ nm_active_connection_get_id (<em class="parameter"><code><a class="link" href="N
 </div>
 <div class="refsect3">
 <a name="id-1.3.3.8.4.6"></a><h4>Returns</h4>
-<p> the ID of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<p> the ID of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
 </div>
 <p class="since">Since: 0.9.10</p>
@@ -444,7 +444,7 @@ This is the internal string used by the connection, and must not be modified.</p
 <a name="nm-active-connection-get-uuid"></a><h3>nm_active_connection_get_uuid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_uuid (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>'s UUID.</p>
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>'s UUID.</p>
 <div class="refsect3">
 <a name="id-1.3.3.8.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -462,7 +462,7 @@ nm_active_connection_get_uuid (<em class="parameter"><code><a class="link" href=
 </div>
 <div class="refsect3">
 <a name="id-1.3.3.8.5.6"></a><h4>Returns</h4>
-<p> the UUID of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<p> the UUID of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
 </div>
 </div>
@@ -472,7 +472,7 @@ This is the internal string used by the connection, and must not be modified.</p
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_connection_type
                                (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>'s type.</p>
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>'s type.</p>
 <div class="refsect3">
 <a name="id-1.3.3.8.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -490,7 +490,7 @@ nm_active_connection_get_connection_type
 </div>
 <div class="refsect3">
 <a name="id-1.3.3.8.6.6"></a><h4>Returns</h4>
-<p> the type of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<p> the type of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
 </div>
 <p class="since">Since: 0.9.10</p>
@@ -554,7 +554,7 @@ This is the internal copy used by the connection, and must not be modified. </p>
 <hr>
 <div class="refsect2">
 <a name="nm-active-connection-get-state"></a><h3>nm_active_connection_get_state ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMActiveConnectionState"><span class="returnvalue">NMActiveConnectionState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMActiveConnectionState"><span class="returnvalue">NMActiveConnectionState</span></a>
 nm_active_connection_get_state (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>Gets the active connection's state.</p>
 <div class="refsect3">
@@ -655,7 +655,7 @@ nm_active_connection_get_ip4_config (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.3.3.8.12.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a>, or <code class="literal">NULL</code> if the
-connection is not in the <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
+connection is not in the <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
 state. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -687,7 +687,7 @@ nm_active_connection_get_dhcp4_config (<em class="parameter"><code><a class="lin
 <a name="id-1.3.3.8.13.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a>, or <code class="literal">NULL</code> if the
 connection does not use DHCP, or is not in the
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </p>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 <p class="since">Since: 0.9.10</p>
@@ -743,7 +743,7 @@ nm_active_connection_get_ip6_config (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.3.3.8.15.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a>, or <code class="literal">NULL</code> if the
-connection is not in the <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
+connection is not in the <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
 state. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -775,7 +775,7 @@ nm_active_connection_get_dhcp6_config (<em class="parameter"><code><a class="lin
 <a name="id-1.3.3.8.16.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a>, or <code class="literal">NULL</code> if the
 connection does not use DHCPv6, or is not in the
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </p>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 <p class="since">Since: 0.9.10</p>
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 865c607a..3d92860f 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -241,7 +241,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMState"><span class="returnvalue">NMState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState"><span class="returnvalue">NMState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMClient.html#nm-client-get-state" title="nm_client_get_state ()">nm_client_get_state</a> <span class="c_punctuation">()</span>
@@ -304,7 +304,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMClient.html#nm-client-get-connectivity" title="nm_client_get_connectivity ()">nm_client_get_connectivity</a> <span class="c_punctuation">()</span>
@@ -312,7 +312,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMClient.html#nm-client-check-connectivity" title="nm_client_check_connectivity ()">nm_client_check_connectivity</a> <span class="c_punctuation">()</span>
@@ -328,7 +328,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMClient.html#nm-client-check-connectivity-finish" title="nm_client_check_connectivity_finish ()">nm_client_check_connectivity_finish</a> <span class="c_punctuation">()</span>
@@ -861,7 +861,7 @@ or <code class="literal">NULL</code> if none is found. </p>
 <a name="nm-client-activate-connection"></a><h3>nm_client_activate_connection ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_client_activate_connection (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                               <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                               <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                <em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                <em class="parameter"><code>const <span class="type">char</span> *specific_object</code></em>,
                                <em class="parameter"><code><a class="link" href="NMClient.html#NMClientActivateFn" title="NMClientActivateFn ()"><span class="type">NMClientActivateFn</span></a> callback</code></em>,
@@ -899,7 +899,7 @@ track the activation to its completion.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p> an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>. </p></td>
+<td class="parameter_description"><p> an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
@@ -948,7 +948,7 @@ details of the newly added connection. </p></td>
 <a name="nm-client-add-and-activate-connection"></a><h3>nm_client_add_and_activate_connection ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_client_add_and_activate_connection (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                       <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *partial</code></em>,
+                                       <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *partial</code></em>,
                                        <em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                        <em class="parameter"><code>const <span class="type">char</span> *specific_object</code></em>,
                                        <em class="parameter"><code><a class="link" href="NMClient.html#NMClientAddActivateFn" title="NMClientAddActivateFn ()"><span class="type">NMClientAddActivateFn</span></a> callback</code></em>,
@@ -977,7 +977,7 @@ track the activation to its completion.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>partial</p></td>
-<td class="parameter_description"><p> an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to add; the connection may be
+<td class="parameter_description"><p> an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to add; the connection may be
 partially filled (or even <code class="literal">NULL</code>) and will be completed by NetworkManager
 using the given <em class="parameter"><code>device</code></em>
 and <em class="parameter"><code>specific_object</code></em>
@@ -1379,7 +1379,7 @@ nm_client_get_version (<em class="parameter"><code><a class="link" href="NMClien
 <hr>
 <div class="refsect2">
 <a name="nm-client-get-state"></a><h3>nm_client_get_state ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMState"><span class="returnvalue">NMState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState"><span class="returnvalue">NMState</span></a>
 nm_client_get_state (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Gets the current daemon state.</p>
 <div class="refsect3">
@@ -1399,7 +1399,7 @@ nm_client_get_state (<em class="parameter"><code><a class="link" href="NMClient.
 </div>
 <div class="refsect3">
 <a name="id-1.3.2.9.27.6"></a><h4>Returns</h4>
-<p> the current <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMState"><code class="literal">NMState</code></a></p>
+<p> the current <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState"><code class="literal">NMState</code></a></p>
 </div>
 </div>
 <hr>
@@ -1649,7 +1649,7 @@ domains separated by ",". (<code class="literal">NULL</code> or an empty string
 <hr>
 <div class="refsect2">
 <a name="nm-client-get-connectivity"></a><h3>nm_client_get_connectivity ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 nm_client_get_connectivity (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Gets the current network connectivity state. Contrast
 <a class="link" href="NMClient.html#nm-client-check-connectivity" title="nm_client_check_connectivity ()"><code class="function">nm_client_check_connectivity()</code></a> and
@@ -1679,7 +1679,7 @@ connectivity state first before returning any information.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-client-check-connectivity"></a><h3>nm_client_check_connectivity ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 nm_client_check_connectivity (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
                               <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
                               <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
@@ -1772,7 +1772,7 @@ re-checking, and <a class="link" href="NMClient.html#nm-client-check-connectivit
 <hr>
 <div class="refsect2">
 <a name="nm-client-check-connectivity-finish"></a><h3>nm_client_check_connectivity_finish ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 nm_client_check_connectivity_finish (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
                                      <em class="parameter"><code><span class="type">GAsyncResult</span> *result</code></em>,
                                      <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index 7506b557..f92c1585 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -74,7 +74,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceType"><span class="returnvalue">NMDeviceType</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceType"><span class="returnvalue">NMDeviceType</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-device-type" title="nm_device_get_device_type ()">nm_device_get_device_type</a> <span class="c_punctuation">()</span>
@@ -124,7 +124,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceCapabilities"><span class="returnvalue">NMDeviceCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceCapabilities"><span class="returnvalue">NMDeviceCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-capabilities" title="nm_device_get_capabilities ()">nm_device_get_capabilities</a> <span class="c_punctuation">()</span>
@@ -204,7 +204,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-state" title="nm_device_get_state ()">nm_device_get_state</a> <span class="c_punctuation">()</span>
@@ -212,7 +212,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-state-reason" title="nm_device_get_state_reason ()">nm_device_get_state_reason</a> <span class="c_punctuation">()</span>
@@ -766,7 +766,7 @@ used by the device, and must not be modified.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-device-type"></a><h3>nm_device_get_device_type ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceType"><span class="returnvalue">NMDeviceType</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceType"><span class="returnvalue">NMDeviceType</span></a>
 nm_device_get_device_type (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Returns the numeric type of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>, ie Ethernet, Wi-Fi, etc.</p>
 <div class="refsect3">
@@ -960,7 +960,7 @@ This is the internal string used by the device, and must not be modified.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-capabilities"></a><h3>nm_device_get_capabilities ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceCapabilities"><span class="returnvalue">NMDeviceCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceCapabilities"><span class="returnvalue">NMDeviceCapabilities</span></a>
 nm_device_get_capabilities (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the device' capabilities.</p>
 <div class="refsect3">
@@ -1249,7 +1249,7 @@ using DHCP. </p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-state"></a><h3>nm_device_get_state ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
 nm_device_get_state (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the current <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> state.</p>
 <div class="refsect3">
@@ -1275,9 +1275,9 @@ nm_device_get_state (<em class="parameter"><code><a class="link" href="NMDevice.
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-state-reason"></a><h3>nm_device_get_state_reason ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
 nm_device_get_state_reason (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                            <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceStateReason"><span class="type">NMDeviceStateReason</span></a> *reason</code></em>);</pre>
+                            <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceStateReason"><span class="type">NMDeviceStateReason</span></a> *reason</code></em>);</pre>
 <p>Gets the current <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> state (return value) and the reason for entering
 the state (<em class="parameter"><code>reason</code></em>
  argument).</p>
@@ -1297,7 +1297,7 @@ the state (<em class="parameter"><code>reason</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>reason</p></td>
-<td class="parameter_description"><p> location to store reason (<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceStateReason"><span class="type">NMDeviceStateReason</span></a>), or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_description"><p> location to store reason (<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceStateReason"><span class="type">NMDeviceStateReason</span></a>), or <code class="literal">NULL</code>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -1725,7 +1725,7 @@ incompatible with the device. To get the full list of connections see
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p> a list of <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> objects to filter. </p></td>
+<td class="parameter_description"><p> a list of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> objects to filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
 </tbody>
@@ -1734,7 +1734,7 @@ incompatible with the device. To get the full list of connections see
 <div class="refsect3">
 <a name="id-1.3.4.9.38.6"></a><h4>Returns</h4>
 <p> a
-list of <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> objects that could be activated with the given <em class="parameter"><code>device</code></em>
+list of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> objects that could be activated with the given <em class="parameter"><code>device</code></em>
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
@@ -1747,7 +1747,7 @@ be freed with <code class="function">g_slist_free()</code> when it is no longer
 <a name="nm-device-connection-valid"></a><h3>nm_device_connection_valid ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_connection_valid (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                            <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                            <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Validates a given connection for a given <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> object and returns
 whether the connection may be activated with the device. For example if
 <em class="parameter"><code>device</code></em>
@@ -1773,7 +1773,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -1791,7 +1791,7 @@ if is incompatible with the device's capabilities and characteristics.</p>
 <a name="nm-device-connection-compatible"></a><h3>nm_device_connection_compatible ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_connection_compatible (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                                 <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Validates a given connection for a given <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> object and returns
 whether the connection may be activated with the device. For example if
@@ -1821,7 +1821,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -1844,7 +1844,7 @@ if is incompatible with the device's capabilities and characteristics.</p>
 <a name="nm-device-get-setting-type"></a><h3>nm_device_get_setting_type ()</h3>
 <pre class="programlisting"><span class="returnvalue">GType</span>
 nm_device_get_setting_type (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
-<p>Gets the (primary) <a href="https://developer.gnome.org/libnm-util/0.9/NMSetting.html"><span class="type">NMSetting</span></a> subtype associated with connections
+<p>Gets the (primary) <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html"><span class="type">NMSetting</span></a> subtype associated with connections
 that can be used on <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
@@ -1865,7 +1865,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect3">
 <a name="id-1.3.4.9.41.6"></a><h4>Returns</h4>
 <p> <em class="parameter"><code>device</code></em>
-'s associated <a href="https://developer.gnome.org/libnm-util/0.9/NMSetting.html"><span class="type">NMSetting</span></a> type</p>
+'s associated <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html"><span class="type">NMSetting</span></a> type</p>
 </div>
 <p class="since">Since: 0.9.10</p>
 </div>
diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index 8a0df6b0..75e07531 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -73,7 +73,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="returnvalue">NMBluetoothCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="returnvalue">NMBluetoothCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceBt.html#nm-device-bt-get-capabilities" title="nm_device_bt_get_capabilities ()">nm_device_bt_get_capabilities</a> <span class="c_punctuation">()</span>
@@ -256,7 +256,7 @@ nm_device_bt_get_name (<em class="parameter"><code><a class="link" href="NMDevic
 <hr>
 <div class="refsect2">
 <a name="nm-device-bt-get-capabilities"></a><h3>nm_device_bt_get_capabilities ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="returnvalue">NMBluetoothCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="returnvalue">NMBluetoothCapabilities</span></a>
 nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><span class="type">NMDeviceBt</span></a> *device</code></em>);</pre>
 <p>Returns the Bluetooth device's usable capabilities.</p>
 <div class="refsect3">
@@ -276,7 +276,7 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 </div>
 <div class="refsect3">
 <a name="id-1.3.8.8.6.6"></a><h4>Returns</h4>
-<p> a combination of <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a></p>
+<p> a combination of <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a></p>
 </div>
 </div>
 </div>
@@ -369,7 +369,7 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <div class="refsect2">
 <a name="NMDeviceBt--bt-capabilities"></a><h3>The <code class="literal">“bt-capabilities”</code> property</h3>
 <pre class="programlisting">  “bt-capabilities”          <span class="type">guint</span></pre>
-<p>The device's bluetooth capabilities, a combination of <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a>.</p>
+<p>The device's bluetooth capabilities, a combination of <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a>.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index 15fe2aa1..2c05df00 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -51,7 +51,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceModem.html#nm-device-modem-get-modem-capabilities" title="nm_device_modem_get_modem_capabilities ()">nm_device_modem_get_modem_capabilities</a> <span class="c_punctuation">()</span>
@@ -59,7 +59,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceModem.html#nm-device-modem-get-current-capabilities" title="nm_device_modem_get_current_capabilities ()">nm_device_modem_get_current_capabilities</a> <span class="c_punctuation">()</span>
@@ -143,7 +143,7 @@ nm_device_modem_error_quark (<em class="parameter"><code><span class="type">void
 <hr>
 <div class="refsect2">
 <a name="nm-device-modem-get-modem-capabilities"></a><h3>nm_device_modem_get_modem_capabilities ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
 nm_device_modem_get_modem_capabilities
                                (<em class="parameter"><code><a class="link" href="NMDeviceModem.html" title="NMDeviceModem"><span class="type">NMDeviceModem</span></a> *self</code></em>);</pre>
 <p>Returns a bitfield of the generic access technology families the modem
@@ -172,7 +172,7 @@ may require a firmware reload or reinitialization.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-modem-get-current-capabilities"></a><h3>nm_device_modem_get_current_capabilities ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
 nm_device_modem_get_current_capabilities
                                (<em class="parameter"><code><a class="link" href="NMDeviceModem.html" title="NMDeviceModem"><span class="type">NMDeviceModem</span></a> *self</code></em>);</pre>
 <p>Returns a bitfield of the generic access technology families the modem
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index d739d92a..1c0223aa 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -74,7 +74,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-mode" title="nm_device_wifi_get_mode ()">nm_device_wifi_get_mode</a> <span class="c_punctuation">()</span>
@@ -90,7 +90,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceWifiCapabilities"><span class="returnvalue">NMDeviceWifiCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceWifiCapabilities"><span class="returnvalue">NMDeviceWifiCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-capabilities" title="nm_device_wifi_get_capabilities ()">nm_device_wifi_get_capabilities</a> <span class="c_punctuation">()</span>
@@ -374,7 +374,7 @@ device, and must not be modified.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-wifi-get-mode"></a><h3>nm_device_wifi_get_mode ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
 nm_device_wifi_get_mode (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>Gets the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> mode.</p>
 <div class="refsect3">
@@ -426,7 +426,7 @@ nm_device_wifi_get_bitrate (<em class="parameter"><code><a class="link" href="NM
 <hr>
 <div class="refsect2">
 <a name="nm-device-wifi-get-capabilities"></a><h3>nm_device_wifi_get_capabilities ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceWifiCapabilities"><span class="returnvalue">NMDeviceWifiCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceWifiCapabilities"><span class="returnvalue">NMDeviceWifiCapabilities</span></a>
 nm_device_wifi_get_capabilities (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>Gets the Wi-Fi capabilities of the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a>.</p>
 <div class="refsect3">
diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index b7b318e1..edc746b6 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -288,7 +288,7 @@ nm_ip4_config_get_addresses (<em class="parameter"><code><a class="link" href="N
 </div>
 <div class="refsect3">
 <a name="id-1.3.20.8.4.6"></a><h4>Returns</h4>
-<p> the <span class="type">GSList</span> containing <a href="https://developer.gnome.org/libnm-util/0.9/NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a>es.
+<p> the <span class="type">GSList</span> containing <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a>es.
 This is the internal copy used by the configuration and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMIP4Address]</span></p>
 </div>
@@ -317,7 +317,7 @@ nm_ip4_config_get_routes (<em class="parameter"><code><a class="link" href="NMIP
 <div class="refsect3">
 <a name="id-1.3.20.8.5.6"></a><h4>Returns</h4>
 <p> the <span class="type">GSList</span> containing
-<a href="https://developer.gnome.org/libnm-util/0.9/NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Routes</span></a>. This is the internal copy used by the configuration,
+<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Routes</span></a>. This is the internal copy used by the configuration,
 and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMIP4Route]</span></p>
 </div>
@@ -487,7 +487,7 @@ modified. </p>
 <div class="refsect2">
 <a name="NMIP4Config--addresses"></a><h3>The <code class="literal">“addresses”</code> property</h3>
 <pre class="programlisting">  “addresses”                <span class="type">gpointer</span></pre>
-<p>The <span class="type">GPtrArray</span> containing <a href="https://developer.gnome.org/libnm-util/0.9/NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a>es of the configuration.</p>
+<p>The <span class="type">GPtrArray</span> containing <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a>es of the configuration.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index ed97f3e5..53718105 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -289,7 +289,7 @@ nm_ip6_config_get_addresses (<em class="parameter"><code><a class="link" href="N
 <div class="refsect3">
 <a name="id-1.3.21.8.4.6"></a><h4>Returns</h4>
 <p> the <span class="type">GSList</span> containing
-<a href="https://developer.gnome.org/libnm-util/0.9/NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a>es. This is the internal copy used by the configuration
+<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a>es. This is the internal copy used by the configuration
 and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMIP6Address]</span></p>
 </div>
@@ -318,7 +318,7 @@ nm_ip6_config_get_routes (<em class="parameter"><code><a class="link" href="NMIP
 <div class="refsect3">
 <a name="id-1.3.21.8.5.6"></a><h4>Returns</h4>
 <p> the <span class="type">GSList</span> containing
-<a href="https://developer.gnome.org/libnm-util/0.9/NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Routes</span></a>. This is the internal copy used by the configuration,
+<a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Routes</span></a>. This is the internal copy used by the configuration,
 and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMIP6Route]</span></p>
 </div>
@@ -519,7 +519,7 @@ This is the internal copy used by the configuration, and must not be modified. <
 <a name="NMIP6Config--addresses"></a><h3>The <code class="literal">“addresses”</code> property</h3>
 <pre class="programlisting">  “addresses”                <span class="type">NMIP6AddressObjectArray</span> *</pre>
 <p>The <span class="type">GPtrArray</span> containing the IPv6 addresses;  use
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-nm-utils.html#nm-utils-ip6-addresses-from-gvalue"><code class="function">nm_utils_ip6_addresses_from_gvalue()</code></a> to return a <span class="type">GSList</span> of
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-nm-utils.html#nm-utils-ip6-addresses-from-gvalue"><code class="function">nm_utils_ip6_addresses_from_gvalue()</code></a> to return a <span class="type">GSList</span> of
 <span class="type">NMSettingIP6Address</span> objects that is more usable than the raw data.</p>
 <p>Flags: Read</p>
 </div>
@@ -552,7 +552,7 @@ contain the addresses of nameservers of the configuration.</p>
 <a name="NMIP6Config--routes"></a><h3>The <code class="literal">“routes”</code> property</h3>
 <pre class="programlisting">  “routes”                   <span class="type">NMIP6RouteObjectArray</span> *</pre>
 <p>The <span class="type">GPtrArray</span> containing the IPv6 routes;  use
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-nm-utils.html#nm-utils-ip6-routes-from-gvalue"><code class="function">nm_utils_ip6_routes_from_gvalue()</code></a> to return a <span class="type">GSList</span> of
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-nm-utils.html#nm-utils-ip6-routes-from-gvalue"><code class="function">nm_utils_ip6_routes_from_gvalue()</code></a> to return a <span class="type">GSList</span> of
 <span class="type">NMSettingIP6Address</span> objects that is more usable than the raw data.</p>
 <p>Flags: Read</p>
 </div>
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index c099c3df..ee5bfa0c 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -229,7 +229,7 @@
 <div class="refsect1">
 <a name="NMRemoteConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="screen">    GObject
-    <span class="lineart">╰──</span> <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html">NMConnection</a>
+    <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html">NMConnection</a>
         <span class="lineart">╰──</span> NMRemoteConnection
 </pre>
 </div>
@@ -554,7 +554,7 @@ nm_remote_connection_get_secrets (<em class="parameter"><code><a class="link" hr
 </tr>
 <tr>
 <td class="parameter_name"><p>setting_name</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMSetting.html"><span class="type">NMSetting</span></a> object name to get secrets for</p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html"><span class="type">NMSetting</span></a> object name to get secrets for</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -716,7 +716,7 @@ invisible to the current user.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -748,7 +748,7 @@ still visible to the user.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index ebc67526..0e1a4139 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -284,13 +284,13 @@
 which stores network configuration and allows authenticated clients to
 add, delete, and modify that configuration.  The data required to connect
 to a specific network is called a "connection" and encapsulated by the
-<a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> object.  Once a connection is known to NetworkManager, having
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object.  Once a connection is known to NetworkManager, having
 either been added by a user or read from on-disk storage, the
 <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> object creates a <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> object which
 represents this stored connection.  Use the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> object to
 perform any operations like modification or deletion.</p>
 <p>To add a new network connection to the NetworkManager settings service, first
-build up a template <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> object.  Since this connection is not yet
+build up a template <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object.  Since this connection is not yet
 added to NetworkManager, it is known only to your program and is not yet
 an <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a>.  Then ask <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> to add your connection.
 When the connection is added successfully, the supplied callback is called
@@ -368,7 +368,7 @@ the stored object known to NetworkManager.</p>
 <span class="normal">   </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">error</span><span class="symbol">)</span>
 <span class="normal">       </span><span class="function">g_print</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Error adding connection: %s"</span><span class="symbol">,</span><span class="normal"> error</span><span class="symbol">-&gt;</span><span class="normal">message</span><span class="symbol">);</span>
 <span class="normal">   </span><span class="keyword">else</span><span class="normal"> </span><span class="cbracket">{</span>
-<span class="normal">       </span><span class="function">g_print</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Added: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html#nm-connection-get-path">nm_connection_get_path</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function">NM_CONNECTION</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">remote</span><span class="symbol">)));</span>
+<span class="normal">       </span><span class="function">g_print</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Added: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-get-path">nm_connection_get_path</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function">NM_CONNECTION</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">remote</span><span class="symbol">)));</span>
 <span class="normal">       </span><span class="comment">/* Use 'remote' with nm_remote_connection_commit_changes() to save</span>
 <span class="comment">        * changes and nm_remote_connection_delete() to delete the connection */</span>
 <span class="normal">   </span><span class="cbracket">}</span>
@@ -383,28 +383,28 @@ the stored object known to NetworkManager.</p>
 <span class="normal">   </span><span class="type">char</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">uuid</span><span class="symbol">;</span>
 <span class="normal">   </span><span class="usertype">gboolean</span><span class="normal"> success</span><span class="symbol">;</span>
 
-<span class="normal">   <a href="/usr/share/gtk-doc/html/NetworkManager/nmcli.html#connection">connection</a> </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html#nm-connection-new">nm_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">   <a href="/usr/share/gtk-doc/html/NetworkManager/nmcli.html#connection">connection</a> </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-new">nm_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
 
 <span class="normal">   </span><span class="comment">/* Build up the 'connection' setting */</span>
-<span class="normal">   s_con </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="https://developer.gnome.org/libnm-util/0.9/NMSettingConnection.html">NMSettingConnection</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMSettingConnection.html#nm-setting-connection-new">nm_setting_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
-<span class="normal">   uuid </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-nm-utils.html#nm-utils-uuid-generate">nm_utils_uuid_generate</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">   s_con </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html">NMSettingConnection</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#nm-setting-connection-new">nm_setting_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">   uuid </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-nm-utils.html#nm-utils-uuid-generate">nm_utils_uuid_generate</a></span><span class="normal"> </span><span class="symbol">();</span>
 <span class="normal">   </span><span class="function">g_object_set</span><span class="normal"> </span><span class="symbol">(</span><span class="function">G_OBJECT</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_con</span><span class="symbol">),</span>
-<span class="normal">                 <a href="https://developer.gnome.org/libnm-util/0.9/NMSettingConnection.html#NM-SETTING-CONNECTION-UUID:CAPS">NM_SETTING_CONNECTION_UUID</a></span><span class="symbol">,</span><span class="normal"> uuid</span><span class="symbol">,</span>
-<span class="normal">                 <a href="https://developer.gnome.org/libnm-util/0.9/NMSettingConnection.html#NM-SETTING-CONNECTION-ID:CAPS">NM_SETTING_CONNECTION_ID</a></span><span class="symbol">,</span><span class="normal"> human_name</span><span class="symbol">,</span>
-<span class="normal">                 <a href="https://developer.gnome.org/libnm-util/0.9/NMSettingConnection.html#NM-SETTING-CONNECTION-TYPE:CAPS">NM_SETTING_CONNECTION_TYPE</a></span><span class="symbol">,</span><span class="normal"> <a href="https://developer.gnome.org/libnm-util/0.9/NMSettingWired.html#NM-SETTING-WIRED-SETTING-NAME:CAPS">NM_SETTING_WIRED_SETTING_NAME</a></span><span class="symbol">,</span>
+<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-UUID:CAPS">NM_SETTING_CONNECTION_UUID</a></span><span class="symbol">,</span><span class="normal"> uuid</span><span class="symbol">,</span>
+<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ID:CAPS">NM_SETTING_CONNECTION_ID</a></span><span class="symbol">,</span><span class="normal"> human_name</span><span class="symbol">,</span>
+<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-TYPE:CAPS">NM_SETTING_CONNECTION_TYPE</a></span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NM-SETTING-WIRED-SETTING-NAME:CAPS">NM_SETTING_WIRED_SETTING_NAME</a></span><span class="symbol">,</span>
 <span class="normal">                 NULL</span><span class="symbol">);</span>
 <span class="normal">   </span><span class="function">g_free</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">uuid</span><span class="symbol">);</span>
-<span class="normal">   </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/NetworkManager/nmcli.html#connection">connection</a></span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_con</span><span class="symbol">));</span>
+<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/NetworkManager/nmcli.html#connection">connection</a></span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_con</span><span class="symbol">));</span>
 
 <span class="normal">   </span><span class="comment">/* Add the required 'wired' setting as this is a wired connection */</span>
-<span class="normal">   </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/NetworkManager/nmcli.html#connection">connection</a></span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMSettingWired.html#nm-setting-wired-new">nm_setting_wired_new</a></span><span class="normal"> </span><span class="symbol">());</span>
+<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/NetworkManager/nmcli.html#connection">connection</a></span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#nm-setting-wired-new">nm_setting_wired_new</a></span><span class="normal"> </span><span class="symbol">());</span>
 
 <span class="normal">   </span><span class="comment">/* Add an 'ipv4' setting using AUTO configuration (eg DHCP) */</span>
-<span class="normal">   s_ip4 </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="https://developer.gnome.org/libnm-util/0.9/NMSettingIP4Config.html">NMSettingIP4Config</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMSettingIP4Config.html#nm-setting-ip4-config-new">nm_setting_ip4_config_new</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">   s_ip4 </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html">NMSettingIP4Config</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#nm-setting-ip4-config-new">nm_setting_ip4_config_new</a></span><span class="normal"> </span><span class="symbol">();</span>
 <span class="normal">   </span><span class="function">g_object_set</span><span class="normal"> </span><span class="symbol">(</span><span class="function">G_OBJECT</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_ip4</span><span class="symbol">),</span>
-<span class="normal">                 <a href="https://developer.gnome.org/libnm-util/0.9/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD:CAPS">NM_SETTING_IP4_CONFIG_METHOD</a></span><span class="symbol">,</span><span class="normal"> <a href="https://developer.gnome.org/libnm-util/0.9/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-AUTO:CAPS">NM_SETTING_IP4_CONFIG_METHOD_AUTO</a></span><span class="symbol">,</span>
+<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD:CAPS">NM_SETTING_IP4_CONFIG_METHOD</a></span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-AUTO:CAPS">NM_SETTING_IP4_CONFIG_METHOD_AUTO</a></span><span class="symbol">,</span>
 <span class="normal">                 NULL</span><span class="symbol">);</span>
-<span class="normal">   </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/NetworkManager/nmcli.html#connection">connection</a></span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_ip4</span><span class="symbol">));</span>
+<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/NetworkManager/nmcli.html#connection">connection</a></span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_ip4</span><span class="symbol">));</span>
 
 <span class="normal">   </span><span class="comment">/* Ask NetworkManager to store the connection */</span>
 <span class="normal">   success </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="NMRemoteSettings.html#nm-remote-settings-add-connection">nm_remote_settings_add_connection</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">settings</span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/NetworkManager/nmcli.html#connection">connection</a></span><span class="symbol">,</span><span class="normal"> added_cb</span><span class="symbol">,</span><span class="normal"> loop</span><span class="symbol">);</span>
@@ -725,7 +725,7 @@ not known. </p>
 <a name="nm-remote-settings-add-connection"></a><h3>nm_remote_settings_add_connection ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_remote_settings_add_connection (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
-                                   <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code><a class="link" href="NMRemoteSettings.html#NMRemoteSettingsAddConnectionFunc" title="NMRemoteSettingsAddConnectionFunc ()"><span class="type">NMRemoteSettingsAddConnectionFunc</span></a> callback</code></em>,
                                    <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Requests that the remote settings service add the given settings to a new
@@ -785,7 +785,7 @@ added, not the object itself</p></td>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_remote_settings_add_connection_unsaved
                                (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a class="link" href="NMRemoteSettings.html#NMRemoteSettingsAddConnectionFunc" title="NMRemoteSettingsAddConnectionFunc ()"><span class="type">NMRemoteSettingsAddConnectionFunc</span></a> callback</code></em>,
                                 <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Requests that the remote settings service add the given settings to a new
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index 8acd02c1..ebb7e858 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -247,7 +247,7 @@ nm_secret_agent_error_quark (<em class="parameter"><code><span class="type">void
 <a name="NMSecretAgentGetSecretsFunc"></a><h3>NMSecretAgentGetSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentGetSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><span class="type">GHashTable</span> *secrets</code></em>,
                                 <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                                 <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
@@ -283,13 +283,13 @@ something like this:</p>
 <span class="usertype">NMSettingWirelessSecurity</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">s_wsec</span><span class="symbol">;</span>
 <span class="usertype">GHashTable</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">secrets_hash</span><span class="symbol">;</span>
 
-<span class="normal">secrets </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html#nm-connection-new">nm_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
-<span class="normal">s_wsec </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="https://developer.gnome.org/libnm-util/0.9/NMSettingWirelessSecurity.html">NMSettingWirelessSecurity</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMSettingWirelessSecurity.html#nm-setting-wireless-security-new">nm_setting_wireless_security_new</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">secrets </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-new">nm_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">s_wsec </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html">NMSettingWirelessSecurity</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-new">nm_setting_wireless_security_new</a></span><span class="normal"> </span><span class="symbol">();</span>
 <span class="function">g_object_set</span><span class="normal"> </span><span class="symbol">(</span><span class="function">G_OBJECT</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_wsec</span><span class="symbol">),</span>
-<span class="normal">              <a href="https://developer.gnome.org/libnm-util/0.9/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS">NM_SETTING_WIRELESS_SECURITY_PSK</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"my really cool PSK"</span><span class="symbol">,</span>
+<span class="normal">              <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS">NM_SETTING_WIRELESS_SECURITY_PSK</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"my really cool PSK"</span><span class="symbol">,</span>
 <span class="normal">              NULL</span><span class="symbol">);</span>
-<span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_wsec</span><span class="symbol">));</span>
-<span class="normal">secrets_hash </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html#nm-connection-to-hash">nm_connection_to_hash</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> <a href="https://developer.gnome.org/libnm-util/0.9/NMSetting.html#NM-SETTING-HASH-FLAG-ALL:CAPS">NM_SETTING_HASH_FLAG_ALL</a></span><span class="symbol">);</span>
+<span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_wsec</span><span class="symbol">));</span>
+<span class="normal">secrets_hash </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-to-hash">nm_connection_to_hash</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NM-SETTING-HASH-FLAG-ALL:CAPS">NM_SETTING_HASH_FLAG_ALL</a></span><span class="symbol">);</span>
 
 <span class="symbol">(</span><span class="normal">call the NMSecretAgentGetSecretsFunc </span><span class="usertype">with</span><span class="normal"> secrets_hash</span><span class="symbol">)</span>
 
@@ -326,9 +326,9 @@ has returned. </p></td>
 <tr>
 <td class="parameter_name"><p>secrets</p></td>
 <td class="parameter_description"><p> the <span class="type">GHashTable</span> containing
-the requested secrets in the same format as an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> hash (as
-created by <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html#nm-connection-to-hash"><code class="function">nm_connection_to_hash()</code></a> for example).  Each key in <em class="parameter"><code>secrets</code></em>
-should be the name of a <a href="https://developer.gnome.org/libnm-util/0.9/NMSetting.html"><span class="type">NMSetting</span></a> object (like "802-11-wireless-security")
+the requested secrets in the same format as an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> hash (as
+created by <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-to-hash"><code class="function">nm_connection_to_hash()</code></a> for example).  Each key in <em class="parameter"><code>secrets</code></em>
+should be the name of a <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html"><span class="type">NMSetting</span></a> object (like "802-11-wireless-security")
 and each value should be a <span class="type">GHashTable</span>.  The sub-hashes map string:<span class="type">GValue</span>
 where the string is the setting property name (like "psk") and the value
 is the secret. </p></td>
@@ -353,7 +353,7 @@ is the secret. </p></td>
 <a name="NMSecretAgentSaveSecretsFunc"></a><h3>NMSecretAgentSaveSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentSaveSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
-                                 <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                                  <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Called as a result of a request by NM to save secrets.  When the
@@ -400,7 +400,7 @@ has returned. </p></td>
 <a name="NMSecretAgentDeleteSecretsFunc"></a><h3>NMSecretAgentDeleteSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentDeleteSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
-                                   <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                                    <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Called as a result of a request by NM to delete secrets.  When the
@@ -532,7 +532,7 @@ nm_secret_agent_get_registered (<em class="parameter"><code><a class="link" href
 <a name="nm-secret-agent-get-secrets"></a><h3>nm_secret_agent_get_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_get_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
-                             <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                             <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                              <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
                              <em class="parameter"><code>const <span class="type">char</span> **hints</code></em>,
                              <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags"><span class="type">NMSecretAgentGetSecretsFlags</span></a> flags</code></em>,
@@ -563,7 +563,7 @@ secrets from the user.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> for which we're asked secrets</p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> for which we're asked secrets</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -601,7 +601,7 @@ secrets from the user.</p>
 <a name="nm-secret-agent-save-secrets"></a><h3>nm_secret_agent_save_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_save_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
-                              <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                              <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                               <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentSaveSecretsFunc" title="NMSecretAgentSaveSecretsFunc ()"><span class="type">NMSecretAgentSaveSecretsFunc</span></a> callback</code></em>,
                               <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Asyncronously ensure that all secrets inside <em class="parameter"><code>connection</code></em>
@@ -624,7 +624,7 @@ are stored to disk.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -647,7 +647,7 @@ are stored to disk.</p>
 <a name="nm-secret-agent-delete-secrets"></a><h3>nm_secret_agent_delete_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_delete_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentDeleteSecretsFunc" title="NMSecretAgentDeleteSecretsFunc ()"><span class="type">NMSecretAgentDeleteSecretsFunc</span></a> callback</code></em>,
                                 <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Asynchronously ask the agent to delete all saved secrets belonging to
@@ -670,7 +670,7 @@ nm_secret_agent_delete_secrets (<em class="parameter"><code><a class="link" href
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index 7562a519..8be2954c 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -52,7 +52,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManagerVPN.html#NMVPNConnectionState"><span class="returnvalue">NMVPNConnectionState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.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>
@@ -175,7 +175,7 @@ nm_vpn_connection_new (<em class="parameter"><code><a href="/usr/share/gtk-doc/h
 <hr>
 <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="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManagerVPN.html#NMVPNConnectionState"><span class="returnvalue">NMVPNConnectionState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.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">
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index 91cdbfee..d473ec6c 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -297,7 +297,7 @@ returned connections will match the <em class="parameter"><code>nsp</code></em>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
 <td class="parameter_description"><p> a list of
-<a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> objects to filter. </p></td>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> objects to filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
 </tbody>
@@ -306,7 +306,7 @@ returned connections will match the <em class="parameter"><code>nsp</code></em>
 <div class="refsect3">
 <a name="id-1.3.18.8.6.6"></a><h4>Returns</h4>
 <p> a
-list of <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> objects that could be activated with the given <em class="parameter"><code>nsp</code></em>
+list of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> objects that could be activated with the given <em class="parameter"><code>nsp</code></em>
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
@@ -319,7 +319,7 @@ be freed with <code class="function">g_slist_free()</code> when it is no longer
 <a name="nm-wimax-nsp-connection-valid"></a><h3>nm_wimax_nsp_connection_valid ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_wimax_nsp_connection_valid (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>,
-                               <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                               <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Validates a given connection against a given WiMAX NSP to ensure that the
 connection may be activated with that NSP.  The connection must match the
 <em class="parameter"><code>nsp</code></em>
@@ -341,7 +341,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>nsp</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>nsp</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 5df1127b..33e38b22 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -15,10 +15,10 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-glib Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-glib 1.1.94
+      for libnm-glib 1.2.0
 
       The latest version of this documentation can be found on-line at
-      <a class="ulink" href="https://developer.gnome.org/libnm-glib/0.9/" target="_top">https://developer.gnome.org/libnm-glib/0.9/</a>.
+      <a class="ulink" href="https://developer.gnome.org/libnm-glib/stable/" target="_top">https://developer.gnome.org/libnm-glib/stable/</a>.
     </p></div>
 <div><p class="copyright">Copyright © 2012-2013 The NetworkManager Authors</p></div>
 <div><div class="legalnotice">
diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index 5d95d5cb..984704d5 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -1,4 +1,3 @@
-<ONLINE href="https://developer.gnome.org/libnm-glib/0.9/">
 <ANCHOR id="NMClient" href="libnm-glib/NMClient.html">
 <ANCHOR id="NMClient.functions" href="libnm-glib/NMClient.html#NMClient.functions">
 <ANCHOR id="NMClient.properties" href="libnm-glib/NMClient.html#NMClient.properties">
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index e0523b6f..a3f3fadc 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -57,7 +57,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="returnvalue">NMVPNServiceState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="returnvalue">NMVPNServiceState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-get-state" title="nm_vpn_plugin_get_state ()">nm_vpn_plugin_get_state</a> <span class="c_punctuation">()</span>
@@ -172,7 +172,7 @@ nm_vpn_plugin_get_connection (<em class="parameter"><code><span class="type">NMV
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-plugin-get-state"></a><h3>nm_vpn_plugin_get_state ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="returnvalue">NMVPNServiceState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="returnvalue">NMVPNServiceState</span></a>
 nm_vpn_plugin_get_state (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>);</pre>
 </div>
 <hr>
@@ -180,7 +180,7 @@ nm_vpn_plugin_get_state (<em class="parameter"><code><span class="type">NMVPNPlu
 <a name="nm-vpn-plugin-set-state"></a><h3>nm_vpn_plugin_set_state ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_set_state (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>,
-                         <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="type">NMVPNServiceState</span></a> state</code></em>);</pre>
+                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="type">NMVPNServiceState</span></a> state</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2">
@@ -235,7 +235,7 @@ nm_vpn_plugin_set_login_banner (<em class="parameter"><code><span class="type">N
 <a name="nm-vpn-plugin-failure"></a><h3>nm_vpn_plugin_failure ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_failure (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>,
-                       <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManagerVPN.html#NMVPNPluginFailure"><span class="type">NMVPNPluginFailure</span></a> reason</code></em>);</pre>
+                       <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNPluginFailure"><span class="type">NMVPNPluginFailure</span></a> reason</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2">
diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
index a4343675..cd633c5d 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
@@ -73,7 +73,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#nm-vpn-plugin-ui-interface-import" title="nm_vpn_plugin_ui_interface_import ()">nm_vpn_plugin_ui_interface_import</a> <span class="c_punctuation">()</span>
@@ -262,7 +262,7 @@ nm_vpn_plugin_ui_factory (<em class="parameter"><code><span class="type">GError<
 <a name="nm-vpn-plugin-ui-interface-ui-factory"></a><h3>nm_vpn_plugin_ui_interface_ui_factory ()</h3>
 <pre class="programlisting"><span class="returnvalue">NMVpnPluginUiWidgetInterface</span> *
 nm_vpn_plugin_ui_interface_ui_factory (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
-                                       <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                       <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                        <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 </div>
 <hr>
@@ -275,7 +275,7 @@ nm_vpn_plugin_ui_interface_get_capabilities
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-plugin-ui-interface-import"></a><h3>nm_vpn_plugin_ui_interface_import ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
 nm_vpn_plugin_ui_interface_import (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
                                    <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
                                    <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
@@ -286,7 +286,7 @@ nm_vpn_plugin_ui_interface_import (<em class="parameter"><code><span class="type
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_vpn_plugin_ui_interface_export (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
                                    <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
-                                   <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 </div>
 <hr>
@@ -295,7 +295,7 @@ nm_vpn_plugin_ui_interface_export (<em class="parameter"><code><span class="type
 <pre class="programlisting"><span class="returnvalue">char</span> *
 nm_vpn_plugin_ui_interface_get_suggested_name
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2">
@@ -303,7 +303,7 @@ nm_vpn_plugin_ui_interface_get_suggested_name
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_vpn_plugin_ui_interface_delete_connection
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <div class="warning"><p><code class="literal">nm_vpn_plugin_ui_interface_delete_connection</code> is deprecated and should not be used in newly-written code.</p></div>
 </div>
@@ -320,7 +320,7 @@ nm_vpn_plugin_ui_widget_interface_get_widget
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_vpn_plugin_ui_widget_interface_update_connection
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiWidgetInterface</span> *iface</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 </div>
 <hr>
@@ -329,7 +329,7 @@ nm_vpn_plugin_ui_widget_interface_update_connection
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_vpn_plugin_ui_widget_interface_save_secrets
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiWidgetInterface</span> *iface</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <div class="warning"><p><code class="literal">nm_vpn_plugin_ui_widget_interface_save_secrets</code> is deprecated and should not be used in newly-written code.</p></div>
 </div>
diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
index b03e5987..83f198f6 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
@@ -111,11 +111,11 @@ an applet when the applet calls the authentication dialog of the VPN plugin.</p>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_vpn_plugin_utils_get_secret_flags (<em class="parameter"><code><span class="type">GHashTable</span> *data</code></em>,
                                       <em class="parameter"><code>const <span class="type">char</span> *secret_name</code></em>,
-                                      <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMSetting.html#NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> *out_flags</code></em>);</pre>
+                                      <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> *out_flags</code></em>);</pre>
 <p>Given a VPN secret key name, attempts to find the corresponding flags data
 item in <em class="parameter"><code>data</code></em>
 .  If found, converts the flags data item to
-<a href="https://developer.gnome.org/libnm-util/0.9/NMSetting.html#NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> and returns it.</p>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> and returns it.</p>
 <div class="refsect3">
 <a name="id-1.3.32.5.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index c6ea9297..acd89edf 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -49,7 +49,7 @@
     <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config">NMDHCP4Config</a>
     <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config">NMDHCP6Config</a>
     <span class="lineart">├──</span> <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
-    <span class="lineart">├──</span> <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html">NMConnection</a>
+    <span class="lineart">├──</span> <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html">NMConnection</a>
     <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
     <span class="lineart">╰──</span> <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
 </pre>
diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml
index 76119246..798ea5f8 100644
--- a/docs/libnm-glib/libnm-glib-docs.xml
+++ b/docs/libnm-glib/libnm-glib-docs.xml
@@ -10,7 +10,7 @@
     <releaseinfo>
       for libnm-glib &version;
       The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="https://developer.gnome.org/libnm-glib/0.9/">https://developer.gnome.org/libnm-glib/0.9/</ulink>.
+      <ulink url="https://developer.gnome.org/libnm-glib/stable/">https://developer.gnome.org/libnm-glib/stable/</ulink>.
     </releaseinfo>
 
     <copyright>
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index ead65f0a..26aaba0e 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-1.1.94
+1.2.0
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 85c39759..7572c017 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -1730,7 +1730,7 @@ nm_connection_get_connection_type (<em class="parameter"><code><a class="link" h
 <pre class="programlisting"><span class="returnvalue">char</span> *
 nm_connection_get_virtual_device_description
                                (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>Returns the name that <a href="https://developer.gnome.org/libnm-glib/0.9/NMDevice.html#nm-device-disambiguate-names"><code class="function">nm_device_disambiguate_names()</code></a> would
+<p>Returns the name that <a href="/usr/share/gtk-doc/html/libnm-glib/NMDevice.html#nm-device-disambiguate-names"><code class="function">nm_device_disambiguate_names()</code></a> would
 return for the virtual device that would be created for <em class="parameter"><code>connection</code></em>
 .
 Eg, "VLAN (eth1.1)".</p>
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index b50fbdbd..974ce75b 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,10 +15,10 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-util Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-util 1.1.94
+      for libnm-util 1.2.0
 
       The latest version of this documentation can be found on-line at
-      <a class="ulink" href="https://developer.gnome.org/libnm-util/0.9/" target="_top">https://developer.gnome.org/libnm-util/0.9/</a>.
+      <a class="ulink" href="https://developer.gnome.org/libnm-util/stable/" target="_top">https://developer.gnome.org/libnm-util/stable/</a>.
     </p></div>
 <div><p class="copyright">Copyright © 2012 The NetworkManager Authors</p></div>
 <div><div class="legalnotice">
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index d1e0be2d..c95acf87 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -1,4 +1,3 @@
-<ONLINE href="https://developer.gnome.org/libnm-util/0.9/">
 <ANCHOR id="NMConnection" href="libnm-util/NMConnection.html">
 <ANCHOR id="NMConnection.functions" href="libnm-util/NMConnection.html#NMConnection.functions">
 <ANCHOR id="NMConnection.properties" href="libnm-util/NMConnection.html#NMConnection.properties">
diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html
index b525e187..aaaadc84 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManager.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManager.html
@@ -644,7 +644,7 @@
 <div class="refsect2">
 <a name="NMDeviceType"></a><h3>enum NMDeviceType</h3>
 <p><a class="link" href="libnm-util-NetworkManager.html#NMDeviceType" title="enum NMDeviceType"><span class="type">NMDeviceType</span></a> values indicate the type of hardware represented by
-an <a href="https://developer.gnome.org/libnm-glib/0.9/NMDevice.html"><span class="type">NMDevice</span></a>.</p>
+an <a href="/usr/share/gtk-doc/html/libnm-glib/NMDevice.html"><span class="type">NMDevice</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.2.31.6.45.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml
index 14139181..9ec760eb 100644
--- a/docs/libnm-util/libnm-util-docs.sgml
+++ b/docs/libnm-util/libnm-util-docs.sgml
@@ -11,7 +11,7 @@
     <releaseinfo>
       for libnm-util &version;
       The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="https://developer.gnome.org/libnm-util/0.9/">https://developer.gnome.org/libnm-util/0.9/</ulink>.
+      <ulink url="https://developer.gnome.org/libnm-util/stable/">https://developer.gnome.org/libnm-util/stable/</ulink>.
     </releaseinfo>
 
     <copyright>
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index ead65f0a..26aaba0e 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.1.94
+1.2.0
diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html
index b1469048..2fbd6507 100644
--- a/docs/libnm/html/NMAccessPoint.html
+++ b/docs/libnm/html/NMAccessPoint.html
@@ -573,7 +573,7 @@ with this function.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p> an array of <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnections</span></a> to
+<td class="parameter_description"><p> an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> to
 filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
@@ -583,7 +583,7 @@ filter. </p></td>
 <div class="refsect3">
 <a name="id-1.5.23.8.12.7"></a><h4>Returns</h4>
 <p> an array of
-<a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>ap</code></em>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>ap</code></em>
 .  The array should
 be freed with <code class="function">g_ptr_array_unref()</code> when it is no longer required. </p>
 <p><span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
@@ -594,7 +594,7 @@ be freed with <code class="function">g_ptr_array_unref()</code> when it is no lo
 <a name="nm-access-point-connection-valid"></a><h3>nm_access_point_connection_valid ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_access_point_connection_valid (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>,
-                                  <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                                  <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Validates a given connection against a given Wi-Fi access point to ensure that
 the connection may be activated with that AP.  The connection must match the
 <em class="parameter"><code>ap</code></em>
@@ -617,7 +617,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>ap</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>ap</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index bcd2410d..55266de2 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -374,7 +374,7 @@ nm_active_connection_get_connection (<em class="parameter"><code><a class="link"
 <a name="nm-active-connection-get-id"></a><h3>nm_active_connection_get_id ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_id (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>'s ID.</p>
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>'s ID.</p>
 <div class="refsect3">
 <a name="id-1.5.20.8.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -392,7 +392,7 @@ nm_active_connection_get_id (<em class="parameter"><code><a class="link" href="N
 </div>
 <div class="refsect3">
 <a name="id-1.5.20.8.3.6"></a><h4>Returns</h4>
-<p> the ID of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<p> the ID of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
 </div>
 </div>
@@ -401,7 +401,7 @@ This is the internal string used by the connection, and must not be modified.</p
 <a name="nm-active-connection-get-uuid"></a><h3>nm_active_connection_get_uuid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_uuid (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>'s UUID.</p>
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>'s UUID.</p>
 <div class="refsect3">
 <a name="id-1.5.20.8.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -419,7 +419,7 @@ nm_active_connection_get_uuid (<em class="parameter"><code><a class="link" href=
 </div>
 <div class="refsect3">
 <a name="id-1.5.20.8.4.6"></a><h4>Returns</h4>
-<p> the UUID of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<p> the UUID of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
 </div>
 </div>
@@ -429,7 +429,7 @@ This is the internal string used by the connection, and must not be modified.</p
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_connection_type
                                (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>'s type.</p>
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>'s type.</p>
 <div class="refsect3">
 <a name="id-1.5.20.8.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -447,7 +447,7 @@ nm_active_connection_get_connection_type
 </div>
 <div class="refsect3">
 <a name="id-1.5.20.8.5.6"></a><h4>Returns</h4>
-<p> the type of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<p> the type of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
 </div>
 </div>
diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html
index 1e51c552..a990346a 100644
--- a/docs/libnm/html/NMClient.html
+++ b/docs/libnm/html/NMClient.html
@@ -2018,7 +2018,7 @@ any. </p>
 <a name="nm-client-activate-connection-async"></a><h3>nm_client_activate_connection_async ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_client_activate_connection_async (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                     <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                     <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                      <em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                      <em class="parameter"><code>const <span class="type">char</span> *specific_object</code></em>,
                                      <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
@@ -2058,7 +2058,7 @@ track the activation to its completion.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p> an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>. </p></td>
+<td class="parameter_description"><p> an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
@@ -2147,7 +2147,7 @@ will be set. </p>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_client_add_and_activate_connection_async
                                (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *partial</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *partial</code></em>,
                                 <em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                 <em class="parameter"><code>const <span class="type">char</span> *specific_object</code></em>,
                                 <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
@@ -2178,7 +2178,7 @@ track the activation to its completion.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>partial</p></td>
-<td class="parameter_description"><p> an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to add; the connection may be
+<td class="parameter_description"><p> an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to add; the connection may be
 partially filled (or even <code class="literal">NULL</code>) and will be completed by NetworkManager
 using the given <em class="parameter"><code>device</code></em>
 and <em class="parameter"><code>specific_object</code></em>
@@ -2232,7 +2232,7 @@ nm_client_add_and_activate_connection_finish
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMClient.html#nm-client-add-and-activate-connection-async" title="nm_client_add_and_activate_connection_async ()"><code class="function">nm_client_add_and_activate_connection_async()</code></a>.</p>
 <p>You can call <a class="link" href="NMActiveConnection.html#nm-active-connection-get-connection" title="nm_active_connection_get_connection ()"><code class="function">nm_active_connection_get_connection()</code></a> on the returned
-<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> to find the path of the created <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>.</p>
+<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> to find the path of the created <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.41.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -2556,7 +2556,7 @@ to <a class="link" href="libnm-NMConnection.html#nm-connection-verify" title="nm
 <a name="nm-client-add-connection-async"></a><h3>nm_client_add_connection_async ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_client_add_connection_async (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><span class="type">gboolean</span> save_to_disk</code></em>,
                                 <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
                                 <em class="parameter"><code><span class="type">GAsyncReadyCallback</span> callback</code></em>,
@@ -3609,7 +3609,7 @@ regular devices and placeholder devices.</p>
 user_function (<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>           *client,
                <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection,
                <span class="type">gpointer</span>            user_data)</pre>
-<p>Notifies that a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> has been added.</p>
+<p>Notifies that a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> has been added.</p>
 <div class="refsect3">
 <a name="id-1.3.2.12.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -3646,7 +3646,7 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
 user_function (<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>           *client,
                <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection,
                <span class="type">gpointer</span>            user_data)</pre>
-<p>Notifies that a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> has been removed.</p>
+<p>Notifies that a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> has been removed.</p>
 <div class="refsect3">
 <a name="id-1.3.2.12.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index 67f70037..6dd8dd36 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -327,7 +327,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-applied-connection" title="nm_device_get_applied_connection ()">nm_device_get_applied_connection</a> <span class="c_punctuation">()</span>
@@ -343,7 +343,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-applied-connection-finish" title="nm_device_get_applied_connection_finish ()">nm_device_get_applied_connection_finish</a> <span class="c_punctuation">()</span>
@@ -1781,7 +1781,7 @@ devices in <em class="parameter"><code>devices</code></em>
 <a name="nm-device-reapply"></a><h3>nm_device_reapply ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_reapply (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                   <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                    <em class="parameter"><code><span class="type">guint64</span> version_id</code></em>,
                    <em class="parameter"><code><span class="type">guint32</span> flags</code></em>,
                    <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
@@ -1804,7 +1804,7 @@ made since it was last applied.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to replace the applied settings with or <code class="literal">NULL</code> to reuse existing</p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to replace the applied settings with or <code class="literal">NULL</code> to reuse existing</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1844,7 +1844,7 @@ will be set.</p>
 <a name="nm-device-reapply-async"></a><h3>nm_device_reapply_async ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_device_reapply_async (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                         <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                          <em class="parameter"><code><span class="type">guint64</span> version_id</code></em>,
                          <em class="parameter"><code><span class="type">guint32</span> flags</code></em>,
                          <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
@@ -1868,7 +1868,7 @@ currently active connection made since it was last applied.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to replace the applied settings with or <code class="literal">NULL</code> to reuse existing</p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to replace the applied settings with or <code class="literal">NULL</code> to reuse existing</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1949,7 +1949,7 @@ will be set.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-applied-connection"></a><h3>nm_device_get_applied_connection ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
 nm_device_get_applied_connection (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                   <em class="parameter"><code><span class="type">guint32</span> flags</code></em>,
                                   <em class="parameter"><code><span class="type">guint64</span> *version_id</code></em>,
@@ -1996,7 +1996,7 @@ the applied connection. </p></td>
 </div>
 <div class="refsect3">
 <a name="id-1.5.2.10.39.6"></a><h4>Returns</h4>
-<p> a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><code class="literal">NMConnection</code></a> with the currently applied settings
+<p> a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><code class="literal">NMConnection</code></a> with the currently applied settings
 or <code class="literal">NULL</code> on error.</p>
 <p>The connection is as received from D-Bus and might not validate according
 to <a class="link" href="libnm-NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
@@ -2058,7 +2058,7 @@ nm_device_get_applied_connection_async
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-applied-connection-finish"></a><h3>nm_device_get_applied_connection_finish ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
 nm_device_get_applied_connection_finish
                                (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                 <em class="parameter"><code><span class="type">GAsyncResult</span> *result</code></em>,
@@ -2100,7 +2100,7 @@ connection. </p></td>
 </div>
 <div class="refsect3">
 <a name="id-1.5.2.10.41.6"></a><h4>Returns</h4>
-<p> a currently applied <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><code class="literal">NMConnection</code></a> or <code class="literal">NULL</code> in case
+<p> a currently applied <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><code class="literal">NMConnection</code></a> or <code class="literal">NULL</code> in case
 of error.</p>
 <p>The connection is as received from D-Bus and might not validate according
 to <a class="link" href="libnm-NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
@@ -2395,7 +2395,7 @@ incompatible with the device. To get the full list of connections see
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p> an array of <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnections</span></a> to filter. </p></td>
+<td class="parameter_description"><p> an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> to filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
 </tbody>
@@ -2404,7 +2404,7 @@ incompatible with the device. To get the full list of connections see
 <div class="refsect3">
 <a name="id-1.5.2.10.48.6"></a><h4>Returns</h4>
 <p> an array of
-<a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>device</code></em>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>device</code></em>
 .  The array
 should be freed with <code class="function">g_ptr_array_unref()</code> when it is no longer required. </p>
 <p><span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
@@ -2415,7 +2415,7 @@ should be freed with <code class="function">g_ptr_array_unref()</code> when it i
 <a name="nm-device-connection-valid"></a><h3>nm_device_connection_valid ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_connection_valid (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                            <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                            <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Validates a given connection for a given <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> object and returns
 whether the connection may be activated with the device. For example if
 <em class="parameter"><code>device</code></em>
@@ -2441,7 +2441,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -2459,7 +2459,7 @@ if is incompatible with the device's capabilities and characteristics.</p>
 <a name="nm-device-connection-compatible"></a><h3>nm_device_connection_compatible ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_connection_compatible (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                                 <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Validates a given connection for a given <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> object and returns
 whether the connection may be activated with the device. For example if
@@ -2489,7 +2489,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -3022,7 +3022,7 @@ operations like addressing and routing.</p>
 <div class="refsect2">
 <a name="NMDevice--ip4-config"></a><h3>The <code class="literal">“ip4-config”</code> property</h3>
 <pre class="programlisting">  “ip4-config”               <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> *</pre>
-<p>The <a href="https://developer.gnome.org/libnm-glib/0.9/NMIP4Config.html"><span class="type">NMIP4Config</span></a> of the device.</p>
+<p>The <a href="/usr/share/gtk-doc/html/libnm-glib/NMIP4Config.html"><span class="type">NMIP4Config</span></a> of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html
index dac135b3..48fc088c 100644
--- a/docs/libnm/html/NMRemoteConnection.html
+++ b/docs/libnm/html/NMRemoteConnection.html
@@ -795,7 +795,7 @@ nm_remote_connection_get_visible (<em class="parameter"><code><a class="link" hr
 connection is not visible then it is essentially useless; it will
 not contain any settings, and operations such as
 <a class="link" href="NMRemoteConnection.html#nm-remote-connection-save" title="nm_remote_connection_save ()"><code class="function">nm_remote_connection_save()</code></a> and <a class="link" href="NMRemoteConnection.html#nm-remote-connection-delete" title="nm_remote_connection_delete ()"><code class="function">nm_remote_connection_delete()</code></a> will
-always fail. (<a href="https://developer.gnome.org/libnm-glib/0.9/NMRemoteSettings.html"><span class="type">NMRemoteSettings</span></a> will not normally return
+always fail. (<a href="/usr/share/gtk-doc/html/libnm-glib/NMRemoteSettings.html"><span class="type">NMRemoteSettings</span></a> will not normally return
 non-visible connections to callers, but it is possible for a
 connection's visibility to change after you already have a
 reference to it.)</p>
@@ -865,7 +865,7 @@ to disk, <code class="literal">FALSE</code> if the connection is the same as its
 not.  If the connection is not visible then it is essentially useless; it
 will not contain any settings, and operations such as
 <a class="link" href="NMRemoteConnection.html#nm-remote-connection-save" title="nm_remote_connection_save ()"><code class="function">nm_remote_connection_save()</code></a> and <a class="link" href="NMRemoteConnection.html#nm-remote-connection-delete" title="nm_remote_connection_delete ()"><code class="function">nm_remote_connection_delete()</code></a> will always
-fail. (<a href="https://developer.gnome.org/libnm-glib/0.9/NMRemoteSettings.html"><span class="type">NMRemoteSettings</span></a> will not normally return non-visible connections
+fail. (<a href="/usr/share/gtk-doc/html/libnm-glib/NMRemoteSettings.html"><span class="type">NMRemoteSettings</span></a> will not normally return non-visible connections
 to callers, but it is possible for a connection's visibility to change
 after you already have a reference to it.)</p>
 <p>Flags: Read</p>
diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html
index c95971c3..3fb7ca3a 100644
--- a/docs/libnm/html/NMSecretAgentOld.html
+++ b/docs/libnm/html/NMSecretAgentOld.html
@@ -223,7 +223,7 @@
 <a name="NMSecretAgentOldGetSecretsFunc"></a><h3>NMSecretAgentOldGetSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentOldGetSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> *agent</code></em>,
-                                   <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code><span class="type">GVariant</span> *secrets</code></em>,
                                    <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                                    <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
@@ -328,7 +328,7 @@ and the value is the secret</p></td>
 <a name="NMSecretAgentOldSaveSecretsFunc"></a><h3>NMSecretAgentOldSaveSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentOldSaveSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> *agent</code></em>,
-                                    <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                    <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                     <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                                     <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Called as a result of a request by NM to save secrets.  When the
@@ -375,7 +375,7 @@ has returned. </p></td>
 <a name="NMSecretAgentOldDeleteSecretsFunc"></a><h3>NMSecretAgentOldDeleteSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentOldDeleteSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> *agent</code></em>,
-                                      <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                      <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                       <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                                       <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Called as a result of a request by NM to delete secrets.  When the
@@ -705,7 +705,7 @@ nm_secret_agent_old_get_registered (<em class="parameter"><code><a class="link"
 <a name="nm-secret-agent-old-get-secrets"></a><h3>nm_secret_agent_old_get_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_old_get_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> *self</code></em>,
-                                 <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
                                  <em class="parameter"><code>const <span class="type">char</span> **hints</code></em>,
                                  <em class="parameter"><code><a class="link" href="libnm-nm-dbus-interface.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags"><span class="type">NMSecretAgentGetSecretsFlags</span></a> flags</code></em>,
@@ -736,7 +736,7 @@ secrets from the user.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> for which we're asked secrets</p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> for which we're asked secrets</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -774,7 +774,7 @@ secrets from the user.</p>
 <a name="nm-secret-agent-old-save-secrets"></a><h3>nm_secret_agent_old_save_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_old_save_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> *self</code></em>,
-                                  <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                  <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                   <em class="parameter"><code><a class="link" href="NMSecretAgentOld.html#NMSecretAgentOldSaveSecretsFunc" title="NMSecretAgentOldSaveSecretsFunc ()"><span class="type">NMSecretAgentOldSaveSecretsFunc</span></a> callback</code></em>,
                                   <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Asynchronously ensures that all secrets inside <em class="parameter"><code>connection</code></em>
@@ -797,7 +797,7 @@ disk.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -820,7 +820,7 @@ disk.</p>
 <a name="nm-secret-agent-old-delete-secrets"></a><h3>nm_secret_agent_old_delete_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_old_delete_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> *self</code></em>,
-                                    <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                    <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                     <em class="parameter"><code><a class="link" href="NMSecretAgentOld.html#NMSecretAgentOldDeleteSecretsFunc" title="NMSecretAgentOldDeleteSecretsFunc ()"><span class="type">NMSecretAgentOldDeleteSecretsFunc</span></a> callback</code></em>,
                                     <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Asynchronously asks the agent to delete all saved secrets belonging to
@@ -843,7 +843,7 @@ nm_secret_agent_old_delete_secrets (<em class="parameter"><code><a class="link"
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html
index 65b56b96..1a8a870f 100644
--- a/docs/libnm/html/NMSetting.html
+++ b/docs/libnm/html/NMSetting.html
@@ -263,7 +263,7 @@
 <p>Each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> contains properties that describe configuration that applies
 to a specific network layer (like IPv4 or IPv6 configuration) or device type
 (like Ethernet, or Wi-Fi).  A collection of individual settings together
-make up an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>. Each property is strongly typed and usually has
+make up an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>. Each property is strongly typed and usually has
 a number of allowed values.  See each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass for a description
 of properties and allowed values.</p>
 </div>
@@ -467,7 +467,7 @@ like 'ppp' or 'wireless' or 'wired'.</p>
 <a name="nm-setting-verify"></a><h3>nm_setting_verify ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_setting_verify (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
-                   <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                    <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Validates the setting.  Each setting's properties have allowed values, and
 some are dependent on other values (hence the need for <em class="parameter"><code>connection</code></em>
@@ -490,7 +490,7 @@ failed validation, and in what way that property failed validation.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p> the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that <em class="parameter"><code>setting</code></em>
+<td class="parameter_description"><p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> that <em class="parameter"><code>setting</code></em>
 came from, or
 <code class="literal">NULL</code> if <em class="parameter"><code>setting</code></em>
 is being verified in isolation. </p></td>
@@ -514,7 +514,7 @@ is being verified in isolation. </p></td>
 <a name="nm-setting-verify-secrets"></a><h3>nm_setting_verify_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_setting_verify_secrets (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
-                           <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                           <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                            <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Verifies the secrets in the setting.
 The returned <span class="type">GError</span> contains information about which secret of the setting
@@ -537,7 +537,7 @@ in some cases connection failure is not desired just for the secrets.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p> the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that <em class="parameter"><code>setting</code></em>
+<td class="parameter_description"><p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> that <em class="parameter"><code>setting</code></em>
 came from, or
 <code class="literal">NULL</code> if <em class="parameter"><code>setting</code></em>
 is being verified in isolation. </p></td>
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index 8c845502..0cb7806e 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -484,8 +484,8 @@
 <div class="refsect1">
 <a name="NMSettingConnection.description"></a><h2>Description</h2>
 <p>The <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes
-properties that apply to all <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> objects, regardless of what type
-of network connection they describe.  Each <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> object must contain
+properties that apply to all <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> objects, regardless of what type
+of network connection they describe.  Each <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object must contain
 a <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> setting.</p>
 </div>
 <div class="refsect1">
@@ -1757,7 +1757,7 @@ provider, or <a class="link" href="NMSettingConnection.html#NMSettingConnection-
 <p>The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664"
 (ie, contains only hexadecimal characters and "-").  A suitable UUID may
 be generated by <a class="link" href="libnm-nm-utils.html#nm-utils-uuid-generate" title="nm_utils_uuid_generate ()"><code class="function">nm_utils_uuid_generate()</code></a> or
-<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-nm-utils.html#nm-utils-uuid-generate-from-string"><code class="function">nm_utils_uuid_generate_from_string()</code></a>.</p>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-nm-utils.html#nm-utils-uuid-generate-from-string"><code class="function">nm_utils_uuid_generate_from_string()</code></a>.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html
index f1975597..81cb154a 100644
--- a/docs/libnm/html/NMSettingGeneric.html
+++ b/docs/libnm/html/NMSettingGeneric.html
@@ -75,7 +75,7 @@
 optional properties that apply to "generic" devices (ie, devices that
 NetworkManager does not specifically recognize).</p>
 <p>There are currently no properties on this object; it exists only to be
-the "connection type" setting on <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnections</span></a> for generic devices.</p>
+the "connection type" setting on <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> for generic devices.</p>
 </div>
 <div class="refsect1">
 <a name="NMSettingGeneric.functions_details"></a><h2>Functions</h2>
diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html
index d596d39d..d6bf39e4 100644
--- a/docs/libnm/html/NMSimpleConnection.html
+++ b/docs/libnm/html/NMSimpleConnection.html
@@ -42,7 +42,7 @@
 <tbody>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMSimpleConnection.html#nm-simple-connection-new" title="nm_simple_connection_new ()">nm_simple_connection_new</a> <span class="c_punctuation">()</span>
@@ -50,7 +50,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMSimpleConnection.html#nm-simple-connection-new-from-dbus" title="nm_simple_connection_new_from_dbus ()">nm_simple_connection_new_from_dbus</a> <span class="c_punctuation">()</span>
@@ -58,7 +58,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMSimpleConnection.html#nm-simple-connection-new-clone" title="nm_simple_connection_new_clone ()">nm_simple_connection_new_clone</a> <span class="c_punctuation">()</span>
@@ -80,21 +80,21 @@
 <a name="NMSimpleConnection.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
 <a name="nm-simple-connection-new"></a><h3>nm_simple_connection_new ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
 nm_simple_connection_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>Creates a new <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection"><span class="type">NMSimpleConnection</span></a> object with no <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> objects. An
 <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection"><span class="type">NMSimpleConnection</span></a> does not directly represent a D-Bus-exported connection,
 but might be used in the process of creating a new one.</p>
 <div class="refsect3">
 <a name="id-1.4.3.6.2.5"></a><h4>Returns</h4>
-<p> the new empty <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> object. </p>
+<p> the new empty <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-simple-connection-new-from-dbus"></a><h3>nm_simple_connection_new_from_dbus ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
 nm_simple_connection_new_from_dbus (<em class="parameter"><code><span class="type">GVariant</span> *dict</code></em>,
                                     <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Creates a new <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection"><span class="type">NMSimpleConnection</span></a> from a hash table describing the
@@ -133,9 +133,9 @@ connection failed to normalize. </p>
 <hr>
 <div class="refsect2">
 <a name="nm-simple-connection-new-clone"></a><h3>nm_simple_connection_new_clone ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
-nm_simple_connection_new_clone (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>Clones an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> as an <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection"><span class="type">NMSimpleConnection</span></a>.</p>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+nm_simple_connection_new_clone (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+<p>Clones an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> as an <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection"><span class="type">NMSimpleConnection</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.3.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -146,15 +146,15 @@ nm_simple_connection_new_clone (<em class="parameter"><code><a href="https://dev
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to clone</p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to clone</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
 <a name="id-1.4.3.6.4.6"></a><h4>Returns</h4>
-<p> a new <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> containing the same settings
-and properties as the source <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>. </p>
+<p> a new <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> containing the same settings
+and properties as the source <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 </div>
diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index 13cc3db2..ad04d23d 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -77,7 +77,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMVpnEditorPlugin.html#nm-vpn-editor-plugin-import" title="nm_vpn_editor_plugin_import ()">nm_vpn_editor_plugin_import</a> <span class="c_punctuation">()</span>
@@ -226,7 +226,7 @@ nm_vpn_editor_plugin_factory (<em class="parameter"><code><span class="type">GEr
 <a name="nm-vpn-editor-plugin-get-editor"></a><h3>nm_vpn_editor_plugin_get_editor ()</h3>
 <pre class="programlisting"><a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor"><span class="returnvalue">NMVpnEditor</span></a> *
 nm_vpn_editor_plugin_get_editor (<em class="parameter"><code><a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> *plugin</code></em>,
-                                 <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <div class="refsect3">
 <a name="id-1.7.3.11.4.4"></a><h4>Parameters</h4>
@@ -244,7 +244,7 @@ nm_vpn_editor_plugin_get_editor (<em class="parameter"><code><a class="link" hre
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to be edited</p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to be edited</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -270,7 +270,7 @@ nm_vpn_editor_plugin_get_capabilities (<em class="parameter"><code><a class="lin
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-editor-plugin-import"></a><h3>nm_vpn_editor_plugin_import ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
 nm_vpn_editor_plugin_import (<em class="parameter"><code><a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> *plugin</code></em>,
                              <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
                              <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
@@ -290,7 +290,7 @@ nm_vpn_editor_plugin_import (<em class="parameter"><code><a class="link" href="N
 </tr>
 <tr>
 <td class="parameter_name"><p>path</p></td>
-<td class="parameter_description"><p>full path to the file to attempt to read into a new <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>full path to the file to attempt to read into a new <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -303,7 +303,7 @@ nm_vpn_editor_plugin_import (<em class="parameter"><code><a class="link" href="N
 </div>
 <div class="refsect3">
 <a name="id-1.7.3.11.6.5"></a><h4>Returns</h4>
-<p> a new <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> imported from <em class="parameter"><code>path</code></em>
+<p> a new <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> imported from <em class="parameter"><code>path</code></em>
 , or <code class="literal">NULL</code>
 on error or if the file at <em class="parameter"><code>path</code></em>
 was not recognized by this plugin. </p>
@@ -316,7 +316,7 @@ was not recognized by this plugin. </p>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_vpn_editor_plugin_export (<em class="parameter"><code><a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> *plugin</code></em>,
                              <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
-                             <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                             <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                              <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 </div>
 <hr>
@@ -325,24 +325,29 @@ nm_vpn_editor_plugin_export (<em class="parameter"><code><a class="link" href="N
 <pre class="programlisting"><span class="returnvalue">char</span> *
 nm_vpn_editor_plugin_get_suggested_filename
                                (<em class="parameter"><code><a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> *plugin</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-editor-plugin-load-from-file"></a><h3>nm_vpn_editor_plugin_load_from_file ()</h3>
 <pre class="programlisting"><a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin"><span class="returnvalue">NMVpnEditorPlugin</span></a> *
-nm_vpn_editor_plugin_load_from_file (<em class="parameter"><code>const <span class="type">char</span> *plugin_filename</code></em>,
+nm_vpn_editor_plugin_load_from_file (<em class="parameter"><code>const <span class="type">char</span> *plugin_name</code></em>,
                                      <em class="parameter"><code>const <span class="type">char</span> *check_service</code></em>,
                                      <em class="parameter"><code><span class="type">int</span> check_owner</code></em>,
                                      <em class="parameter"><code><a class="link" href="libnm-nm-utils.html#NMUtilsCheckFilePredicate" title="NMUtilsCheckFilePredicate ()"><span class="type">NMUtilsCheckFilePredicate</span></a> check_file</code></em>,
                                      <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>,
                                      <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
-<p>Load the shared libary <em class="parameter"><code>plugin_filename</code></em>
+<p>Load the shared libary <em class="parameter"><code>plugin_name</code></em>
  and create a new
 <a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> instace via the <a class="link" href="NMVpnEditorPlugin.html#NMVpnEditorPluginFactory" title="NMVpnEditorPluginFactory ()"><span class="type">NMVpnEditorPluginFactory</span></a>
 function.</p>
+<p>If <em class="parameter"><code>plugin_name</code></em>
+ is not an absolute path name, it assumes the file
+is in the plugin directory of NetworkManager. In any case, the call
+will do certain checks on the file before passing it to dlopen.
+A consequence for that is, that you cannot omit the ".so" suffix.</p>
 <div class="refsect3">
-<a name="id-1.7.3.11.9.5"></a><h4>Parameters</h4>
+<a name="id-1.7.3.11.9.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -351,14 +356,11 @@ function.</p>
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>plugin_filename</p></td>
-<td class="parameter_description"><p>The path to the share library to load.
-Apply some common heuristics to find the library, such as
-appending "so" file ending.
-If the path is not an absolute path or no matching module
-can be found, lookup inside a directory defined at compile time.
-Due to this, <em class="parameter"><code>check_file</code></em>
-might be called for two different paths.</p></td>
+<td class="parameter_name"><p>plugin_name</p></td>
+<td class="parameter_description"><p>The path or name of the shared library to load.
+The path must either be an absolute filename to an existing file.
+Alternatively, it can be the name (without path) of a library in the
+plugin directory of NetworkManager.</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -396,7 +398,7 @@ loading the shared library. </p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.7.3.11.9.6"></a><h4>Returns</h4>
+<a name="id-1.7.3.11.9.7"></a><h4>Returns</h4>
 <p> a new plugin instance or <code class="literal">NULL</code> on error. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -520,7 +522,7 @@ if non-<code class="literal">NULL</code>.</p></td>
 <tr>
 <td class="struct_member_name"><p><em class="structfield"><code><a name="NMVpnEditorPluginInterface.import-from-file"></a>import_from_file</code></em> ()</p></td>
 <td class="struct_member_description"><p>Try to import a connection from the specified path.  On
-success, return a partial <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> object.  On error, return <code class="literal">NULL</code> and
+success, return a partial <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object.  On error, return <code class="literal">NULL</code> and
 set <em class="parameter"><code>error</code></em>
 with additional information.  Note that <em class="parameter"><code>error</code></em>
 can be <code class="literal">NULL</code>, in
diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html
index ecaae0aa..6e343d65 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -249,7 +249,7 @@ connections will match the <em class="parameter"><code>nsp</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p> an array of <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnections</span></a> to
+<td class="parameter_description"><p> an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> to
 filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
@@ -259,7 +259,7 @@ filter. </p></td>
 <div class="refsect3">
 <a name="id-1.5.24.8.5.6"></a><h4>Returns</h4>
 <p> an array of
-<a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>nsp</code></em>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>nsp</code></em>
 .  The array should
 be freed with <code class="function">g_ptr_array_unref()</code> when it is no longer required. </p>
 <p><span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
@@ -270,7 +270,7 @@ be freed with <code class="function">g_ptr_array_unref()</code> when it is no lo
 <a name="nm-wimax-nsp-connection-valid"></a><h3>nm_wimax_nsp_connection_valid ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_wimax_nsp_connection_valid (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>,
-                               <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                               <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Validates a given connection against a given WiMAX NSP to ensure that the
 connection may be activated with that NSP.  The connection must match the
 <em class="parameter"><code>nsp</code></em>
@@ -292,7 +292,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>nsp</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>nsp</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index fe6ccbeb..8e4f01ca 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -8214,7 +8214,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a href="https://developer.gnome.org/libnm-glib/0.9/libnm-glib-NMVpnPluginUiWidget.html#NMVpnEditorInterface">NMVpnEditorInterface</a>, struct in <a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor">NMVpnEditor</a>
+<a href="/usr/share/gtk-doc/html/libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NMVpnEditorInterface">NMVpnEditorInterface</a>, struct in <a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor">NMVpnEditor</a>
 </dt>
 <dd></dd>
 <dt>
@@ -8282,7 +8282,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a href="https://developer.gnome.org/libnm-glib/0.9/libnm-glib-NMVpnPluginUiWidget.html#nm-vpn-editor-get-widget">nm_vpn_editor_get_widget</a>, function in <a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor">NMVpnEditor</a>
+<a href="/usr/share/gtk-doc/html/libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#nm-vpn-editor-get-widget">nm_vpn_editor_get_widget</a>, function in <a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor">NMVpnEditor</a>
 </dt>
 <dd></dd>
 <dt>
@@ -8326,7 +8326,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a href="https://developer.gnome.org/libnm-glib/0.9/libnm-glib-NMVpnPluginUiWidget.html#nm-vpn-editor-update-connection">nm_vpn_editor_update_connection</a>, function in <a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor">NMVpnEditor</a>
+<a href="/usr/share/gtk-doc/html/libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#nm-vpn-editor-update-connection">nm_vpn_editor_update_connection</a>, function in <a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor">NMVpnEditor</a>
 </dt>
 <dd></dd>
 <dt>
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index 1267d387..eec37428 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -15,10 +15,10 @@
 <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.1.94
+      for libnm 1.2.0
 
       The latest version of this documentation can be found on-line at
-      <a class="ulink" href="https://developer.gnome.org/libnm/1.0/" target="_top">https://developer.gnome.org/libnm/1.0/</a>.
+      <a class="ulink" href="https://developer.gnome.org/libnm/stable/" target="_top">https://developer.gnome.org/libnm/stable/</a>.
     </p></div>
 <div><p class="copyright">Copyright © 2012-2014 The NetworkManager Authors</p></div>
 <div><div class="legalnotice">
diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml
index f0c50d66..9aa08657 100644
--- a/docs/libnm/html/index.sgml
+++ b/docs/libnm/html/index.sgml
@@ -1,4 +1,3 @@
-<ONLINE href="https://developer.gnome.org/libnm/1.0/">
 <ANCHOR id="NMClient" href="libnm/NMClient.html">
 <ANCHOR id="NMClient.functions" href="libnm/NMClient.html#NMClient.functions">
 <ANCHOR id="NMClient.properties" href="libnm/NMClient.html#NMClient.properties">
diff --git a/docs/libnm/html/libnm-NMConnection.html b/docs/libnm/html/libnm-NMConnection.html
index 852c8876..5166dcf6 100644
--- a/docs/libnm/html/libnm-NMConnection.html
+++ b/docs/libnm/html/libnm-NMConnection.html
@@ -548,12 +548,12 @@
 </div>
 <div class="refsect1">
 <a name="libnm-NMConnection.description"></a><h2>Description</h2>
-<p>An <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> describes all the settings and configuration values that
+<p>An <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> describes all the settings and configuration values that
 are necessary to configure network devices for operation on a specific
 network.  Connections are the fundamental operating object for
-NetworkManager; no device is connected without a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>, or
-disconnected without having been connected with a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>.</p>
-<p>Each <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> contains a list of <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> objects usually referenced
+NetworkManager; no device is connected without a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>, or
+disconnected without having been connected with a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>.</p>
+<p>Each <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> contains a list of <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> objects usually referenced
 by name (using <a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()"><code class="function">nm_connection_get_setting_by_name()</code></a>) or by type (with
 <a class="link" href="libnm-NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()"><code class="function">nm_connection_get_setting()</code></a>).  The settings describe the actual parameters
 with which the network devices are configured, including device-specific
@@ -565,10 +565,10 @@ parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
 <div class="refsect2">
 <a name="nm-connection-add-setting"></a><h3>nm_connection_add_setting ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_add_setting (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_add_setting (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                            <em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
 <p>Adds a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to the connection, replacing any previous <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> of the
-same name which has previously been added to the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>.  The
+same name which has previously been added to the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>.  The
 connection takes ownership of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object and does not increase
 the setting object's reference count.</p>
 <div class="refsect3">
@@ -582,7 +582,7 @@ the setting object's reference count.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -598,9 +598,9 @@ the setting object's reference count.</p>
 <div class="refsect2">
 <a name="nm-connection-remove-setting"></a><h3>nm_connection_remove_setting ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_remove_setting (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_remove_setting (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                               <em class="parameter"><code><span class="type">GType</span> setting_type</code></em>);</pre>
-<p>Removes the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given <span class="type">GType</span> from the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>.  This
+<p>Removes the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given <span class="type">GType</span> from the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>.  This
 operation dereferences the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.3.5"></a><h4>Parameters</h4>
@@ -613,7 +613,7 @@ operation dereferences the <a class="link" href="NMSetting.html" title="NMSettin
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -629,10 +629,10 @@ operation dereferences the <a class="link" href="NMSetting.html" title="NMSettin
 <div class="refsect2">
 <a name="nm-connection-get-setting"></a><h3>nm_connection_get_setting ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
-nm_connection_get_setting (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_get_setting (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                            <em class="parameter"><code><span class="type">GType</span> setting_type</code></em>);</pre>
 <p>Gets the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given <span class="type">GType</span>, if one has been previously added
-to the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>.</p>
+to the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -644,7 +644,7 @@ to the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><s
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -658,7 +658,7 @@ to the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><s
 <div class="refsect3">
 <a name="id-1.4.2.7.4.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>, or <code class="literal">NULL</code> if no setting of that type was previously
-added to the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>. </p>
+added to the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -666,10 +666,10 @@ added to the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.ht
 <div class="refsect2">
 <a name="nm-connection-get-setting-by-name"></a><h3>nm_connection_get_setting_by_name ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
-nm_connection_get_setting_by_name (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_get_setting_by_name (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
 <p>Gets the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given name, if one has been previously added
-the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>.</p>
+the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -681,7 +681,7 @@ the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -695,7 +695,7 @@ the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span
 <div class="refsect3">
 <a name="id-1.4.2.7.5.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>, or <code class="literal">NULL</code> if no setting with that name was previously
-added to the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>. </p>
+added to the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -703,9 +703,9 @@ added to the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.ht
 <div class="refsect2">
 <a name="nm-connection-to-dbus"></a><h3>nm_connection_to_dbus ()</h3>
 <pre class="programlisting"><span class="returnvalue">GVariant</span> *
-nm_connection_to_dbus (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_to_dbus (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                        <em class="parameter"><code><a class="link" href="libnm-NMConnection.html#NMConnectionSerializationFlags" title="enum NMConnectionSerializationFlags"><span class="type">NMConnectionSerializationFlags</span></a> flags</code></em>);</pre>
-<p>Converts the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> into a <span class="type">GVariant</span> of type
+<p>Converts the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> into a <span class="type">GVariant</span> of type
 <code class="literal">NM_VARIANT_TYPE_CONNECTION</code> describing the connection, suitable for
 marshalling over D-Bus or otherwise serializing.</p>
 <div class="refsect3">
@@ -719,7 +719,7 @@ marshalling over D-Bus or otherwise serializing.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -741,7 +741,7 @@ its settings, and each setting's properties. </p>
 <div class="refsect2">
 <a name="nm-connection-replace-settings"></a><h3>nm_connection_replace_settings ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_replace_settings (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_replace_settings (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><span class="type">GVariant</span> *new_settings</code></em>,
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Replaces <em class="parameter"><code>connection</code></em>
@@ -760,7 +760,7 @@ need to result in a connection that passes <a class="link" href="libnm-NMConnect
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -789,8 +789,8 @@ will be unchanged).</p>
 <a name="nm-connection-replace-settings-from-connection"></a><h3>nm_connection_replace_settings_from_connection ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_connection_replace_settings_from_connection
-                               (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *new_connection</code></em>);</pre>
+                               (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *new_connection</code></em>);</pre>
 <p>Deep-copies the settings of <em class="parameter"><code>new_connection</code></em>
  and replaces the settings of <em class="parameter"><code>connection</code></em>
 
@@ -806,12 +806,12 @@ with the copied settings.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>new_connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to replace the settings of <em class="parameter"><code>connection</code></em>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to replace the settings of <em class="parameter"><code>connection</code></em>
 with</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -823,7 +823,7 @@ with</p></td>
 <div class="refsect2">
 <a name="nm-connection-clear-settings"></a><h3>nm_connection_clear_settings ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_clear_settings (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_clear_settings (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Deletes all of <em class="parameter"><code>connection</code></em>
 's settings.</p>
 <div class="refsect3">
@@ -836,7 +836,7 @@ nm_connection_clear_settings (<em class="parameter"><code><a href="https://devel
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -846,10 +846,10 @@ nm_connection_clear_settings (<em class="parameter"><code><a href="https://devel
 <div class="refsect2">
 <a name="nm-connection-compare"></a><h3>nm_connection_compare ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_compare (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *a</code></em>,
-                       <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *b</code></em>,
+nm_connection_compare (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *a</code></em>,
+                       <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *b</code></em>,
                        <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags"><span class="type">NMSettingCompareFlags</span></a> flags</code></em>);</pre>
-<p>Compares two <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> objects for similarity, with comparison behavior
+<p>Compares two <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> objects for similarity, with comparison behavior
 modified by a set of flags.  See <a class="link" href="NMSetting.html#nm-setting-compare" title="nm_setting_compare ()"><code class="function">nm_setting_compare()</code></a> for a description of
 each flag's behavior.</p>
 <div class="refsect3">
@@ -863,12 +863,12 @@ each flag's behavior.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>a</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>b</p></td>
-<td class="parameter_description"><p>a second <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to compare with the first</p></td>
+<td class="parameter_description"><p>a second <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to compare with the first</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -888,11 +888,11 @@ each flag's behavior.</p>
 <div class="refsect2">
 <a name="nm-connection-diff"></a><h3>nm_connection_diff ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_diff (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *a</code></em>,
-                    <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *b</code></em>,
+nm_connection_diff (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *a</code></em>,
+                    <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *b</code></em>,
                     <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags"><span class="type">NMSettingCompareFlags</span></a> flags</code></em>,
                     <em class="parameter"><code><span class="type">GHashTable</span> **out_settings</code></em>);</pre>
-<p>Compares two <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> objects for similarity, with comparison behavior
+<p>Compares two <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> objects for similarity, with comparison behavior
 modified by a set of flags.  See <a class="link" href="NMSetting.html#nm-setting-compare" title="nm_setting_compare ()"><code class="function">nm_setting_compare()</code></a> for a description of
 each flag's behavior.  If the connections differ, settings and keys within
 each setting that differ are added to the returned <em class="parameter"><code>out_settings</code></em>
@@ -909,12 +909,12 @@ No values are returned, only key names.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>a</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>b</p></td>
-<td class="parameter_description"><p>a second <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to compare with the first</p></td>
+<td class="parameter_description"><p>a second <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to compare with the first</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -943,7 +943,7 @@ not</p>
 <div class="refsect2">
 <a name="nm-connection-verify"></a><h3>nm_connection_verify ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_verify (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_verify (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                       <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Validates the connection and all its settings.  Each setting's properties
 have allowed values, and some values are dependent on other values.  For
@@ -965,7 +965,7 @@ setting and which property failed validation, and how it failed validation.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to verify</p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to verify</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -985,7 +985,7 @@ setting and which property failed validation, and how it failed validation.</p>
 <div class="refsect2">
 <a name="nm-connection-verify-secrets"></a><h3>nm_connection_verify_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_verify_secrets (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_verify_secrets (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                               <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Verifies the secrets in the connection.</p>
 <div class="refsect3">
@@ -999,7 +999,7 @@ nm_connection_verify_secrets (<em class="parameter"><code><a href="https://devel
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to verify in</p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to verify in</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1020,7 +1020,7 @@ nm_connection_verify_secrets (<em class="parameter"><code><a href="https://devel
 <div class="refsect2">
 <a name="nm-connection-normalize"></a><h3>nm_connection_normalize ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_normalize (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_normalize (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                          <em class="parameter"><code><span class="type">GHashTable</span> *parameters</code></em>,
                          <em class="parameter"><code><span class="type">gboolean</span> *modified</code></em>,
                          <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
@@ -1043,7 +1043,7 @@ cannot be normalized, the connection will not be modified.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> to normalize</p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to normalize</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1078,7 +1078,7 @@ why the connection is invalid, if the function returns an error.</p></td>
 <div class="refsect2">
 <a name="nm-connection-need-secrets"></a><h3>nm_connection_need_secrets ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_connection_need_secrets (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_need_secrets (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                             <em class="parameter"><code><span class="type">GPtrArray</span> **hints</code></em>);</pre>
 <p>Returns the name of the first setting object in the connection which would
 need secrets to make a successful connection.  The returned hints are only
@@ -1096,7 +1096,7 @@ secrets are needed.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1121,7 +1121,7 @@ missing secrets</p>
 <div class="refsect2">
 <a name="nm-connection-clear-secrets"></a><h3>nm_connection_clear_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_clear_secrets (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_clear_secrets (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Clears and frees any secrets that may be stored in the connection, to avoid
 keeping secret data in memory when not needed.</p>
 <div class="refsect3">
@@ -1134,7 +1134,7 @@ keeping secret data in memory when not needed.</p>
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1145,7 +1145,7 @@ keeping secret data in memory when not needed.</p>
 <a name="nm-connection-clear-secrets-with-flags"></a><h3>nm_connection_clear_secrets_with_flags ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_connection_clear_secrets_with_flags
-                               (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                               (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingClearSecretsWithFlagsFn" title="NMSettingClearSecretsWithFlagsFn ()"><span class="type">NMSettingClearSecretsWithFlagsFn</span></a> func</code></em>,
                                 <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Clears and frees secrets determined by <em class="parameter"><code>func</code></em>
@@ -1161,7 +1161,7 @@ nm_connection_clear_secrets_with_flags
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1184,7 +1184,7 @@ specific secret should be cleared or not. </p></td>
 <div class="refsect2">
 <a name="nm-connection-update-secrets"></a><h3>nm_connection_update_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_update_secrets (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_update_secrets (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                               <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
                               <em class="parameter"><code><span class="type">GVariant</span> *secrets</code></em>,
                               <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
@@ -1192,7 +1192,7 @@ nm_connection_update_secrets (<em class="parameter"><code><a href="https://devel
 intended for that setting (deserialized from D-Bus for example).  Will also
 extract the given setting's secrets hash if given a connection dictionary.
 If <em class="parameter"><code>setting_name</code></em>
- is <code class="literal">NULL</code>, expects a fully serialized <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> as
+ is <code class="literal">NULL</code>, expects a fully serialized <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> as
 returned by <a class="link" href="libnm-NMConnection.html#nm-connection-to-dbus" title="nm_connection_to_dbus ()"><code class="function">nm_connection_to_dbus()</code></a> and will update all secrets from all
 settings contained in <em class="parameter"><code>secrets</code></em>
 .</p>
@@ -1207,7 +1207,7 @@ settings contained in <em class="parameter"><code>secrets</code></em>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1239,10 +1239,10 @@ failed (tried to update secrets for a setting that doesn't exist, etc)</p>
 <div class="refsect2">
 <a name="nm-connection-set-path"></a><h3>nm_connection_set_path ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_set_path (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_set_path (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
 <p>Sets the D-Bus path of the connection.  This property is not serialized, and
-is only for the reference of the caller.  Sets the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html#NMConnection--path"><span class="type">“path”</span></a>
+is only for the reference of the caller.  Sets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection--path"><span class="type">“path”</span></a>
 property.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.19.5"></a><h4>Parameters</h4>
@@ -1255,7 +1255,7 @@ property.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1272,7 +1272,7 @@ which provides the connection</p></td>
 <div class="refsect2">
 <a name="nm-connection-get-path"></a><h3>nm_connection_get_path ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_connection_get_path (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_path (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Returns the connection's D-Bus path.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.20.5"></a><h4>Parameters</h4>
@@ -1284,7 +1284,7 @@ nm_connection_get_path (<em class="parameter"><code><a href="https://developer.g
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1299,7 +1299,7 @@ nm_connection_get_path (<em class="parameter"><code><a href="https://developer.g
 <div class="refsect2">
 <a name="nm-connection-get-interface-name"></a><h3>nm_connection_get_interface_name ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_connection_get_interface_name (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_interface_name (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Returns the interface name as stored in NMSettingConnection:interface_name.
 If the connection contains no NMSettingConnection, it will return <code class="literal">NULL</code>.</p>
 <p>For hardware devices and software devices created outside of NetworkManager,
@@ -1315,7 +1315,7 @@ NetworkManager, this is the name of the created interface.</p>
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>The <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>The <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1329,7 +1329,7 @@ NetworkManager, this is the name of the created interface.</p>
 <div class="refsect2">
 <a name="nm-connection-is-type"></a><h3>nm_connection_is_type ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_is_type (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_is_type (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                        <em class="parameter"><code>const <span class="type">char</span> *type</code></em>);</pre>
 <p>A convenience function to check if the given <em class="parameter"><code>connection</code></em>
  is a particular
@@ -1347,7 +1347,7 @@ property of the connection and matches that against <em class="parameter"><code>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1369,10 +1369,10 @@ property of the connection and matches that against <em class="parameter"><code>
 <div class="refsect2">
 <a name="nm-connection-for-each-setting-value"></a><h3>nm_connection_for_each_setting_value ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_for_each_setting_value (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_for_each_setting_value (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                       <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingValueIterFn" title="NMSettingValueIterFn ()"><span class="type">NMSettingValueIterFn</span></a> func</code></em>,
                                       <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
-<p>Iterates over the properties of each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object in the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>,
+<p>Iterates over the properties of each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object in the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>,
 calling the supplied user function for each property.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.23.5"></a><h4>Parameters</h4>
@@ -1385,7 +1385,7 @@ calling the supplied user function for each property.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1407,7 +1407,7 @@ at each invocation</p></td>
 <div class="refsect2">
 <a name="nm-connection-dump"></a><h3>nm_connection_dump ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_dump (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_dump (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Print the connection to stdout.  For debugging purposes ONLY, should NOT
 be used for serialization of the connection or machine-parsed in any way. The
 output format is not guaranteed to be stable and may change at any time.</p>
@@ -1421,7 +1421,7 @@ output format is not guaranteed to be stable and may change at any time.</p>
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1431,7 +1431,7 @@ output format is not guaranteed to be stable and may change at any time.</p>
 <div class="refsect2">
 <a name="nm-connection-get-uuid"></a><h3>nm_connection_get_uuid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_connection_get_uuid (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_uuid (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return the UUID from the connection's <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.25.5"></a><h4>Parameters</h4>
@@ -1443,7 +1443,7 @@ nm_connection_get_uuid (<em class="parameter"><code><a href="https://developer.g
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1457,7 +1457,7 @@ nm_connection_get_uuid (<em class="parameter"><code><a href="https://developer.g
 <div class="refsect2">
 <a name="nm-connection-get-id"></a><h3>nm_connection_get_id ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_connection_get_id (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_id (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return the ID from the connection's <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.26.5"></a><h4>Parameters</h4>
@@ -1469,7 +1469,7 @@ nm_connection_get_id (<em class="parameter"><code><a href="https://developer.gno
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1483,7 +1483,7 @@ nm_connection_get_id (<em class="parameter"><code><a href="https://developer.gno
 <div class="refsect2">
 <a name="nm-connection-get-connection-type"></a><h3>nm_connection_get_connection_type ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_connection_get_connection_type (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_connection_type (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return the type from the connection's <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.27.5"></a><h4>Parameters</h4>
@@ -1495,7 +1495,7 @@ nm_connection_get_connection_type (<em class="parameter"><code><a href="https://
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1509,7 +1509,7 @@ nm_connection_get_connection_type (<em class="parameter"><code><a href="https://
 <div class="refsect2">
 <a name="nm-connection-is-virtual"></a><h3>nm_connection_is_virtual ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_is_virtual (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_is_virtual (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Checks if <em class="parameter"><code>connection</code></em>
  refers to a virtual device (and thus can potentially be
 activated even if the device it refers to doesn't exist).</p>
@@ -1523,7 +1523,7 @@ activated even if the device it refers to doesn't exist).</p>
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1539,7 +1539,7 @@ refers to a virtual device</p>
 <a name="nm-connection-get-virtual-device-description"></a><h3>nm_connection_get_virtual_device_description ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *
 nm_connection_get_virtual_device_description
-                               (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                               (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Returns the name that <a class="link" href="NMDevice.html#nm-device-disambiguate-names" title="nm_device_disambiguate_names ()"><code class="function">nm_device_disambiguate_names()</code></a> would
 return for the virtual device that would be created for <em class="parameter"><code>connection</code></em>
 .
@@ -1554,7 +1554,7 @@ Eg, "VLAN (eth1.1)".</p>
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> for a virtual device type</p></td>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> for a virtual device type</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1572,7 +1572,7 @@ is not a virtual connection type. </p>
 <div class="refsect2">
 <a name="nm-connection-get-setting-802-1x"></a><h3>nm_connection_get_setting_802_1x ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="returnvalue">NMSetting8021x</span></a> *
-nm_connection_get_setting_802_1x (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_802_1x (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.30.5"></a><h4>Parameters</h4>
@@ -1584,7 +1584,7 @@ nm_connection_get_setting_802_1x (<em class="parameter"><code><a href="https://d
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1599,7 +1599,7 @@ nm_connection_get_setting_802_1x (<em class="parameter"><code><a href="https://d
 <div class="refsect2">
 <a name="nm-connection-get-setting-bluetooth"></a><h3>nm_connection_get_setting_bluetooth ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="returnvalue">NMSettingBluetooth</span></a> *
-nm_connection_get_setting_bluetooth (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_bluetooth (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="type">NMSettingBluetooth</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.31.5"></a><h4>Parameters</h4>
@@ -1611,7 +1611,7 @@ nm_connection_get_setting_bluetooth (<em class="parameter"><code><a href="https:
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1626,7 +1626,7 @@ nm_connection_get_setting_bluetooth (<em class="parameter"><code><a href="https:
 <div class="refsect2">
 <a name="nm-connection-get-setting-bond"></a><h3>nm_connection_get_setting_bond ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingBond.html" title="NMSettingBond"><span class="returnvalue">NMSettingBond</span></a> *
-nm_connection_get_setting_bond (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_bond (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingBond.html" title="NMSettingBond"><span class="type">NMSettingBond</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.32.5"></a><h4>Parameters</h4>
@@ -1638,7 +1638,7 @@ nm_connection_get_setting_bond (<em class="parameter"><code><a href="https://dev
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1653,7 +1653,7 @@ nm_connection_get_setting_bond (<em class="parameter"><code><a href="https://dev
 <div class="refsect2">
 <a name="nm-connection-get-setting-team"></a><h3>nm_connection_get_setting_team ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingTeam.html" title="NMSettingTeam"><span class="returnvalue">NMSettingTeam</span></a> *
-nm_connection_get_setting_team (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_team (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingTeam.html" title="NMSettingTeam"><span class="type">NMSettingTeam</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.33.5"></a><h4>Parameters</h4>
@@ -1665,7 +1665,7 @@ nm_connection_get_setting_team (<em class="parameter"><code><a href="https://dev
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1680,7 +1680,7 @@ nm_connection_get_setting_team (<em class="parameter"><code><a href="https://dev
 <div class="refsect2">
 <a name="nm-connection-get-setting-team-port"></a><h3>nm_connection_get_setting_team_port ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingTeamPort.html" title="NMSettingTeamPort"><span class="returnvalue">NMSettingTeamPort</span></a> *
-nm_connection_get_setting_team_port (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_team_port (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingTeamPort.html" title="NMSettingTeamPort"><span class="type">NMSettingTeamPort</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.34.5"></a><h4>Parameters</h4>
@@ -1692,7 +1692,7 @@ nm_connection_get_setting_team_port (<em class="parameter"><code><a href="https:
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1707,7 +1707,7 @@ nm_connection_get_setting_team_port (<em class="parameter"><code><a href="https:
 <div class="refsect2">
 <a name="nm-connection-get-setting-bridge"></a><h3>nm_connection_get_setting_bridge ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="returnvalue">NMSettingBridge</span></a> *
-nm_connection_get_setting_bridge (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_bridge (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.35.5"></a><h4>Parameters</h4>
@@ -1719,7 +1719,7 @@ nm_connection_get_setting_bridge (<em class="parameter"><code><a href="https://d
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1734,7 +1734,7 @@ nm_connection_get_setting_bridge (<em class="parameter"><code><a href="https://d
 <div class="refsect2">
 <a name="nm-connection-get-setting-bridge-port"></a><h3>nm_connection_get_setting_bridge_port ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="returnvalue">NMSettingBridgePort</span></a> *
-nm_connection_get_setting_bridge_port (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_bridge_port (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.36.5"></a><h4>Parameters</h4>
@@ -1746,7 +1746,7 @@ nm_connection_get_setting_bridge_port (<em class="parameter"><code><a href="http
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1761,7 +1761,7 @@ nm_connection_get_setting_bridge_port (<em class="parameter"><code><a href="http
 <div class="refsect2">
 <a name="nm-connection-get-setting-cdma"></a><h3>nm_connection_get_setting_cdma ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="returnvalue">NMSettingCdma</span></a> *
-nm_connection_get_setting_cdma (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_cdma (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.37.5"></a><h4>Parameters</h4>
@@ -1773,7 +1773,7 @@ nm_connection_get_setting_cdma (<em class="parameter"><code><a href="https://dev
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1788,7 +1788,7 @@ nm_connection_get_setting_cdma (<em class="parameter"><code><a href="https://dev
 <div class="refsect2">
 <a name="nm-connection-get-setting-connection"></a><h3>nm_connection_get_setting_connection ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="returnvalue">NMSettingConnection</span></a> *
-nm_connection_get_setting_connection (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_connection (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.38.5"></a><h4>Parameters</h4>
@@ -1800,7 +1800,7 @@ nm_connection_get_setting_connection (<em class="parameter"><code><a href="https
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1815,7 +1815,7 @@ nm_connection_get_setting_connection (<em class="parameter"><code><a href="https
 <div class="refsect2">
 <a name="nm-connection-get-setting-dcb"></a><h3>nm_connection_get_setting_dcb ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="returnvalue">NMSettingDcb</span></a> *
-nm_connection_get_setting_dcb (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_dcb (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="type">NMSettingDcb</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.39.5"></a><h4>Parameters</h4>
@@ -1827,7 +1827,7 @@ nm_connection_get_setting_dcb (<em class="parameter"><code><a href="https://deve
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1842,7 +1842,7 @@ nm_connection_get_setting_dcb (<em class="parameter"><code><a href="https://deve
 <div class="refsect2">
 <a name="nm-connection-get-setting-generic"></a><h3>nm_connection_get_setting_generic ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingGeneric.html" title="NMSettingGeneric"><span class="returnvalue">NMSettingGeneric</span></a> *
-nm_connection_get_setting_generic (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_generic (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingGeneric.html" title="NMSettingGeneric"><span class="type">NMSettingGeneric</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.40.5"></a><h4>Parameters</h4>
@@ -1854,7 +1854,7 @@ nm_connection_get_setting_generic (<em class="parameter"><code><a href="https://
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1869,7 +1869,7 @@ nm_connection_get_setting_generic (<em class="parameter"><code><a href="https://
 <div class="refsect2">
 <a name="nm-connection-get-setting-gsm"></a><h3>nm_connection_get_setting_gsm ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="returnvalue">NMSettingGsm</span></a> *
-nm_connection_get_setting_gsm (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_gsm (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.41.5"></a><h4>Parameters</h4>
@@ -1881,7 +1881,7 @@ nm_connection_get_setting_gsm (<em class="parameter"><code><a href="https://deve
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1896,7 +1896,7 @@ nm_connection_get_setting_gsm (<em class="parameter"><code><a href="https://deve
 <div class="refsect2">
 <a name="nm-connection-get-setting-infiniband"></a><h3>nm_connection_get_setting_infiniband ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingInfiniband.html" title="NMSettingInfiniband"><span class="returnvalue">NMSettingInfiniband</span></a> *
-nm_connection_get_setting_infiniband (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_infiniband (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingInfiniband.html" title="NMSettingInfiniband"><span class="type">NMSettingInfiniband</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.42.5"></a><h4>Parameters</h4>
@@ -1908,7 +1908,7 @@ nm_connection_get_setting_infiniband (<em class="parameter"><code><a href="https
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1923,7 +1923,7 @@ nm_connection_get_setting_infiniband (<em class="parameter"><code><a href="https
 <div class="refsect2">
 <a name="nm-connection-get-setting-ip-tunnel"></a><h3>nm_connection_get_setting_ip_tunnel ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel"><span class="returnvalue">NMSettingIPTunnel</span></a> *
-nm_connection_get_setting_ip_tunnel (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_ip_tunnel (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel"><span class="type">NMSettingIPTunnel</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.43.5"></a><h4>Parameters</h4>
@@ -1935,7 +1935,7 @@ nm_connection_get_setting_ip_tunnel (<em class="parameter"><code><a href="https:
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1951,7 +1951,7 @@ nm_connection_get_setting_ip_tunnel (<em class="parameter"><code><a href="https:
 <div class="refsect2">
 <a name="nm-connection-get-setting-ip4-config"></a><h3>nm_connection_get_setting_ip4_config ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="returnvalue">NMSettingIPConfig</span></a> *
-nm_connection_get_setting_ip4_config (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_ip4_config (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> the connection might contain.</p>
 <p>Note that it returns the value as type <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a>, since the vast
 majority of IPv4-setting-related methods are on that type, not
@@ -1966,7 +1966,7 @@ majority of IPv4-setting-related methods are on that type, not
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1982,7 +1982,7 @@ connection contains one, otherwise <code class="literal">NULL</code>. </p>
 <div class="refsect2">
 <a name="nm-connection-get-setting-ip6-config"></a><h3>nm_connection_get_setting_ip6_config ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="returnvalue">NMSettingIPConfig</span></a> *
-nm_connection_get_setting_ip6_config (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_ip6_config (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> the connection might contain.</p>
 <p>Note that it returns the value as type <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a>, since the vast
 majority of IPv6-setting-related methods are on that type, not
@@ -1997,7 +1997,7 @@ majority of IPv6-setting-related methods are on that type, not
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2013,7 +2013,7 @@ connection contains one, otherwise <code class="literal">NULL</code>. </p>
 <div class="refsect2">
 <a name="nm-connection-get-setting-macvlan"></a><h3>nm_connection_get_setting_macvlan ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingMacvlan.html" title="NMSettingMacvlan"><span class="returnvalue">NMSettingMacvlan</span></a> *
-nm_connection_get_setting_macvlan (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_macvlan (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingMacvlan.html" title="NMSettingMacvlan"><span class="type">NMSettingMacvlan</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.46.5"></a><h4>Parameters</h4>
@@ -2025,7 +2025,7 @@ nm_connection_get_setting_macvlan (<em class="parameter"><code><a href="https://
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2041,7 +2041,7 @@ nm_connection_get_setting_macvlan (<em class="parameter"><code><a href="https://
 <div class="refsect2">
 <a name="nm-connection-get-setting-olpc-mesh"></a><h3>nm_connection_get_setting_olpc_mesh ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="returnvalue">NMSettingOlpcMesh</span></a> *
-nm_connection_get_setting_olpc_mesh (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_olpc_mesh (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.47.5"></a><h4>Parameters</h4>
@@ -2053,7 +2053,7 @@ nm_connection_get_setting_olpc_mesh (<em class="parameter"><code><a href="https:
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2068,7 +2068,7 @@ nm_connection_get_setting_olpc_mesh (<em class="parameter"><code><a href="https:
 <div class="refsect2">
 <a name="nm-connection-get-setting-ppp"></a><h3>nm_connection_get_setting_ppp ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingPpp.html" title="NMSettingPpp"><span class="returnvalue">NMSettingPpp</span></a> *
-nm_connection_get_setting_ppp (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_ppp (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingPpp.html" title="NMSettingPpp"><span class="type">NMSettingPpp</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.48.5"></a><h4>Parameters</h4>
@@ -2080,7 +2080,7 @@ nm_connection_get_setting_ppp (<em class="parameter"><code><a href="https://deve
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2095,7 +2095,7 @@ nm_connection_get_setting_ppp (<em class="parameter"><code><a href="https://deve
 <div class="refsect2">
 <a name="nm-connection-get-setting-pppoe"></a><h3>nm_connection_get_setting_pppoe ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingPppoe.html" title="NMSettingPppoe"><span class="returnvalue">NMSettingPppoe</span></a> *
-nm_connection_get_setting_pppoe (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_pppoe (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingPppoe.html" title="NMSettingPppoe"><span class="type">NMSettingPppoe</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.49.5"></a><h4>Parameters</h4>
@@ -2107,7 +2107,7 @@ nm_connection_get_setting_pppoe (<em class="parameter"><code><a href="https://de
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2122,7 +2122,7 @@ nm_connection_get_setting_pppoe (<em class="parameter"><code><a href="https://de
 <div class="refsect2">
 <a name="nm-connection-get-setting-serial"></a><h3>nm_connection_get_setting_serial ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="returnvalue">NMSettingSerial</span></a> *
-nm_connection_get_setting_serial (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_serial (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.50.5"></a><h4>Parameters</h4>
@@ -2134,7 +2134,7 @@ nm_connection_get_setting_serial (<em class="parameter"><code><a href="https://d
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2149,7 +2149,7 @@ nm_connection_get_setting_serial (<em class="parameter"><code><a href="https://d
 <div class="refsect2">
 <a name="nm-connection-get-setting-tun"></a><h3>nm_connection_get_setting_tun ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingTun.html" title="NMSettingTun"><span class="returnvalue">NMSettingTun</span></a> *
-nm_connection_get_setting_tun (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_tun (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingTun.html" title="NMSettingTun"><span class="type">NMSettingTun</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.51.5"></a><h4>Parameters</h4>
@@ -2161,7 +2161,7 @@ nm_connection_get_setting_tun (<em class="parameter"><code><a href="https://deve
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2177,7 +2177,7 @@ nm_connection_get_setting_tun (<em class="parameter"><code><a href="https://deve
 <div class="refsect2">
 <a name="nm-connection-get-setting-vpn"></a><h3>nm_connection_get_setting_vpn ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingVpn.html" title="NMSettingVpn"><span class="returnvalue">NMSettingVpn</span></a> *
-nm_connection_get_setting_vpn (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_vpn (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingVpn.html" title="NMSettingVpn"><span class="type">NMSettingVpn</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.52.5"></a><h4>Parameters</h4>
@@ -2189,7 +2189,7 @@ nm_connection_get_setting_vpn (<em class="parameter"><code><a href="https://deve
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2204,7 +2204,7 @@ nm_connection_get_setting_vpn (<em class="parameter"><code><a href="https://deve
 <div class="refsect2">
 <a name="nm-connection-get-setting-wimax"></a><h3>nm_connection_get_setting_wimax ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingWimax.html" title="NMSettingWimax"><span class="returnvalue">NMSettingWimax</span></a> *
-nm_connection_get_setting_wimax (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_wimax (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingWimax.html" title="NMSettingWimax"><span class="type">NMSettingWimax</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.53.5"></a><h4>Parameters</h4>
@@ -2216,7 +2216,7 @@ nm_connection_get_setting_wimax (<em class="parameter"><code><a href="https://de
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2231,7 +2231,7 @@ nm_connection_get_setting_wimax (<em class="parameter"><code><a href="https://de
 <div class="refsect2">
 <a name="nm-connection-get-setting-adsl"></a><h3>nm_connection_get_setting_adsl ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="returnvalue">NMSettingAdsl</span></a> *
-nm_connection_get_setting_adsl (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_adsl (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.54.5"></a><h4>Parameters</h4>
@@ -2243,7 +2243,7 @@ nm_connection_get_setting_adsl (<em class="parameter"><code><a href="https://dev
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2258,7 +2258,7 @@ nm_connection_get_setting_adsl (<em class="parameter"><code><a href="https://dev
 <div class="refsect2">
 <a name="nm-connection-get-setting-wired"></a><h3>nm_connection_get_setting_wired ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="returnvalue">NMSettingWired</span></a> *
-nm_connection_get_setting_wired (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_wired (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.55.5"></a><h4>Parameters</h4>
@@ -2270,7 +2270,7 @@ nm_connection_get_setting_wired (<em class="parameter"><code><a href="https://de
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2285,7 +2285,7 @@ nm_connection_get_setting_wired (<em class="parameter"><code><a href="https://de
 <div class="refsect2">
 <a name="nm-connection-get-setting-wireless"></a><h3>nm_connection_get_setting_wireless ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="returnvalue">NMSettingWireless</span></a> *
-nm_connection_get_setting_wireless (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_wireless (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.56.5"></a><h4>Parameters</h4>
@@ -2297,7 +2297,7 @@ nm_connection_get_setting_wireless (<em class="parameter"><code><a href="https:/
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2313,7 +2313,7 @@ nm_connection_get_setting_wireless (<em class="parameter"><code><a href="https:/
 <a name="nm-connection-get-setting-wireless-security"></a><h3>nm_connection_get_setting_wireless_security ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="returnvalue">NMSettingWirelessSecurity</span></a> *
 nm_connection_get_setting_wireless_security
-                               (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                               (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.57.5"></a><h4>Parameters</h4>
@@ -2325,7 +2325,7 @@ nm_connection_get_setting_wireless_security
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2340,7 +2340,7 @@ nm_connection_get_setting_wireless_security
 <div class="refsect2">
 <a name="nm-connection-get-setting-vlan"></a><h3>nm_connection_get_setting_vlan ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingVlan.html" title="NMSettingVlan"><span class="returnvalue">NMSettingVlan</span></a> *
-nm_connection_get_setting_vlan (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_vlan (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingVlan.html" title="NMSettingVlan"><span class="type">NMSettingVlan</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.58.5"></a><h4>Parameters</h4>
@@ -2352,7 +2352,7 @@ nm_connection_get_setting_vlan (<em class="parameter"><code><a href="https://dev
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2367,7 +2367,7 @@ nm_connection_get_setting_vlan (<em class="parameter"><code><a href="https://dev
 <div class="refsect2">
 <a name="nm-connection-get-setting-vxlan"></a><h3>nm_connection_get_setting_vxlan ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingVxlan.html" title="NMSettingVxlan"><span class="returnvalue">NMSettingVxlan</span></a> *
-nm_connection_get_setting_vxlan (<em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_vxlan (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingVxlan.html" title="NMSettingVxlan"><span class="type">NMSettingVxlan</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.59.5"></a><h4>Parameters</h4>
@@ -2379,7 +2379,7 @@ nm_connection_get_setting_vxlan (<em class="parameter"><code><a href="https://de
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html
index 595a766b..eee7968d 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -284,7 +284,7 @@ nm_vpn_plugin_error_quark (<em class="parameter"><code><span class="type">void</
 <a name="NMAgentManagerError"></a><h3>enum NMAgentManagerError</h3>
 <p>Errors returned from the secret-agent manager.</p>
 <p>These errors may be returned from operations that could cause secrets to be
-requested (such as <a href="https://developer.gnome.org/libnm-glib/0.9/NMClient.html#nm-client-activate-connection"><code class="function">nm_client_activate_connection()</code></a>), and correspond to D-Bus
+requested (such as <a href="/usr/share/gtk-doc/html/libnm-glib/NMClient.html#nm-client-activate-connection"><code class="function">nm_client_activate_connection()</code></a>), and correspond to D-Bus
 errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.</p>
 <div class="refsect3">
 <a name="id-1.3.5.8.2.5"></a><h4>Members</h4>
@@ -349,9 +349,9 @@ errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.</p>
 <hr>
 <div class="refsect2">
 <a name="NMConnectionError"></a><h3>enum NMConnectionError</h3>
-<p>Describes errors that may result from operations involving a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a>
+<p>Describes errors that may result from operations involving a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>
 or its <a href="NMSetting.html"><span class="type">NMSettings</span></a>.</p>
-<p>These errors may be returned directly from <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> and <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>
+<p>These errors may be returned directly from <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> and <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>
 methods, or may be returned from D-Bus operations (eg on <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> or
 <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>), where they correspond to errors in the
 "org.freedesktop.NetworkManager.Settings.Connection" namespace.</p>
@@ -374,7 +374,7 @@ methods, or may be returned from D-Bus operations (eg on <a class="link" href="N
 <tr>
 <td class="enum_member_name"><p><a name="NM-CONNECTION-ERROR-SETTING-NOT-FOUND:CAPS"></a>NM_CONNECTION_ERROR_SETTING_NOT_FOUND</p></td>
 <td class="enum_member_description">
-<p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> object
+<p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object
   did not contain the specified <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object</p>
 </td>
 <td class="enum_member_annotations"> </td>
@@ -382,7 +382,7 @@ methods, or may be returned from D-Bus operations (eg on <a class="link" href="N
 <tr>
 <td class="enum_member_name"><p><a name="NM-CONNECTION-ERROR-PROPERTY-NOT-FOUND:CAPS"></a>NM_CONNECTION_ERROR_PROPERTY_NOT_FOUND</p></td>
 <td class="enum_member_description">
-<p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> did not contain the
+<p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> did not contain the
   requested <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> property</p>
 </td>
 <td class="enum_member_annotations"> </td>
@@ -398,7 +398,7 @@ methods, or may be returned from D-Bus operations (eg on <a class="link" href="N
 <tr>
 <td class="enum_member_name"><p><a name="NM-CONNECTION-ERROR-MISSING-SETTING:CAPS"></a>NM_CONNECTION_ERROR_MISSING_SETTING</p></td>
 <td class="enum_member_description">
-<p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> object is missing an
+<p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object is missing an
   <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> which is required for its configuration. The error message will
   always be prefixed with "&lt;setting-name&gt;: ", where "&lt;setting-name&gt;" is the
   name of the setting that is missing.</p>
@@ -408,7 +408,7 @@ methods, or may be returned from D-Bus operations (eg on <a class="link" href="N
 <tr>
 <td class="enum_member_name"><p><a name="NM-CONNECTION-ERROR-INVALID-SETTING:CAPS"></a>NM_CONNECTION_ERROR_INVALID_SETTING</p></td>
 <td class="enum_member_description">
-<p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> object contains an
+<p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object contains an
   invalid or inappropriate <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>. The error message will always be
   prefixed with "&lt;setting-name&gt;: ", where "&lt;setting-name&gt;" is the name of the
   setting that is invalid.</p>
@@ -418,7 +418,7 @@ methods, or may be returned from D-Bus operations (eg on <a class="link" href="N
 <tr>
 <td class="enum_member_name"><p><a name="NM-CONNECTION-ERROR-MISSING-PROPERTY:CAPS"></a>NM_CONNECTION_ERROR_MISSING_PROPERTY</p></td>
 <td class="enum_member_description">
-<p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> object is invalid
+<p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object is invalid
   because it is missing a required property. The error message will always be
   prefixed with "&lt;setting-name&gt;.&lt;property-name&gt;: ", where "&lt;setting-name&gt;" is
   the name of the setting with the missing property, and "&lt;property-name&gt;" is
@@ -429,7 +429,7 @@ methods, or may be returned from D-Bus operations (eg on <a class="link" href="N
 <tr>
 <td class="enum_member_name"><p><a name="NM-CONNECTION-ERROR-INVALID-PROPERTY:CAPS"></a>NM_CONNECTION_ERROR_INVALID_PROPERTY</p></td>
 <td class="enum_member_description">
-<p>the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> object is invalid
+<p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object is invalid
   because a property has an invalid value. The error message will always be
   prefixed with "&lt;setting-name&gt;.&lt;property-name&gt;: ", where "&lt;setting-name&gt;" is
   the name of the setting with the invalid property, and "&lt;property-name&gt;" is
@@ -725,7 +725,7 @@ errors in that namespace.</p>
 when they encounter problems retrieving secrets on behalf of NM. They
 correspond to errors in the "org.freedesktop.NetworkManager.SecretManager"
 namespace.</p>
-<p>Client APIs such as <a href="https://developer.gnome.org/libnm-glib/0.9/NMClient.html#nm-client-activate-connection"><code class="function">nm_client_activate_connection()</code></a> will not see these error
+<p>Client APIs such as <a href="/usr/share/gtk-doc/html/libnm-glib/NMClient.html#nm-client-activate-connection"><code class="function">nm_client_activate_connection()</code></a> will not see these error
 codes; instead, the secret agent manager will translate them to the
 corresponding <a class="link" href="libnm-nm-errors.html#NMAgentManagerError" title="enum NMAgentManagerError"><span class="type">NMAgentManagerError</span></a> codes.</p>
 <div class="refsect3">
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 864e8463..1ae50f34 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -1091,7 +1091,7 @@ metric).</p>
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>routes</p></td>
-<td class="parameter_description"><p> an array of <a href="https://developer.gnome.org/libnm-util/0.9/NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> objects. </p></td>
+<td class="parameter_description"><p> an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> objects. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMIPRoute]</span></td>
 </tr></tbody>
 </table></div>
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index 6629a241..fdc83666 100644
--- a/docs/libnm/libnm-docs.xml
+++ b/docs/libnm/libnm-docs.xml
@@ -10,7 +10,7 @@
     <releaseinfo>
       for libnm &version;
       The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="https://developer.gnome.org/libnm/1.0/">https://developer.gnome.org/libnm/1.0/</ulink>.
+      <ulink url="https://developer.gnome.org/libnm/stable/">https://developer.gnome.org/libnm/stable/</ulink>.
     </releaseinfo>
 
     <copyright>
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index ead65f0a..26aaba0e 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.1.94
+1.2.0
diff --git a/examples/C/glib/add-connection-libnm.c b/examples/C/glib/add-connection-libnm.c
index f206340e..7b20c9ab 100644
--- a/examples/C/glib/add-connection-libnm.c
+++ b/examples/C/glib/add-connection-libnm.c
@@ -37,7 +37,7 @@ added_cb (GObject *client,
 {
 	GMainLoop *loop = user_data;
 	NMRemoteConnection *remote;
-	GError *error;
+	GError *error = NULL;
 
 	/* NM responded to our request; either handle the resulting error or
 	 * print out the object path of the connection we just added.
diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am
index 23aa042d..58dc204b 100644
--- a/libnm-core/Makefile.am
+++ b/libnm-core/Makefile.am
@@ -11,6 +11,7 @@ AM_CPPFLAGS = \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DNMCONFDIR=\"$(nmconfdir)\" \
 	-DNMLIBDIR=\"$(nmlibdir)\" \
+	-DNMPLUGINDIR=\"$(pkglibdir)\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
 	$(GLIB_CFLAGS) \
 	$(CODE_COVERAGE_CFLAGS)
diff --git a/libnm-core/Makefile.in b/libnm-core/Makefile.in
index 62f1275f..bd66c069 100644
--- a/libnm-core/Makefile.in
+++ b/libnm-core/Makefile.in
@@ -592,6 +592,7 @@ SUBDIRS = . tests
 AM_CPPFLAGS = -I${top_srcdir}/shared -I${top_builddir}/shared \
 	-DG_LOG_DOMAIN=\""libnm"\" -DLOCALEDIR=\"$(datadir)/locale\" \
 	-DNMCONFDIR=\"$(nmconfdir)\" -DNMLIBDIR=\"$(nmlibdir)\" \
+	-DNMPLUGINDIR=\"$(pkglibdir)\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
 	$(GLIB_CFLAGS) $(CODE_COVERAGE_CFLAGS) $(am__append_1) \
 	$(am__append_4)
diff --git a/libnm-core/crypto.c b/libnm-core/crypto.c
index ecbe6c6e..c27f5c0d 100644
--- a/libnm-core/crypto.c
+++ b/libnm-core/crypto.c
@@ -641,6 +641,9 @@ crypto_is_pkcs12_data (const guint8 *data,
 	GError *local = NULL;
 	gboolean success;
 
+	if (!data_len)
+		return FALSE;
+
 	g_return_val_if_fail (data != NULL, FALSE);
 
 	if (!crypto_init (error))
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 082ebc9e..2041a1d3 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -72,6 +72,7 @@
 #include "nm-utils.h"
 #include "nm-vpn-dbus-interface.h"
 #include "nm-core-types-internal.h"
+#include "nm-vpn-editor-plugin.h"
 
 /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated
  * connection can be replaced by a already-defined connection. This flag only
diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c
index 5a1eed88..a49c3957 100644
--- a/libnm-core/nm-vpn-editor-plugin.c
+++ b/libnm-core/nm-vpn-editor-plugin.c
@@ -71,69 +71,59 @@ nm_vpn_editor_plugin_default_init (NMVpnEditorPluginInterface *iface)
 
 /*********************************************************************/
 
-/**
- * nm_vpn_editor_plugin_load_from_file:
- * @plugin_filename: The path to the share library to load.
- *  Apply some common heuristics to find the library, such as
- *  appending "so" file ending.
- *  If the path is not an absolute path or no matching module
- *  can be found, lookup inside a directory defined at compile time.
- *  Due to this, @check_file might be called for two different paths.
- * @check_service: if not-null, check that the loaded plugin advertises
- *  the given service.
- * @check_owner: if non-negative, check whether the file is owned
- *  by UID @check_owner or by root. In this case also check that
- *  the file is not writable by anybody else.
- * @check_file: (scope call): optional callback to validate the file prior to
- *   loading the shared library.
- * @user_data: user data for @check_file
- * @error: on failure the error reason.
- *
- * Load the shared libary @plugin_filename and create a new
- * #NMVpnEditorPlugin instace via the #NMVpnEditorPluginFactory
- * function.
- *
- * Returns: (transfer full): a new plugin instance or %NULL on error.
- *
- * Since: 1.2
- */
-NMVpnEditorPlugin *
-nm_vpn_editor_plugin_load_from_file  (const char *plugin_filename,
-                                      const char *check_service,
-                                      int check_owner,
-                                      NMUtilsCheckFilePredicate check_file,
-                                      gpointer user_data,
-                                      GError **error)
+static NMVpnEditorPlugin *
+_nm_vpn_editor_plugin_load (const char *plugin_name,
+                            gboolean do_file_checks,
+                            const char *check_service,
+                            int check_owner,
+                            NMUtilsCheckFilePredicate check_file,
+                            gpointer user_data,
+                            GError **error)
 {
 	GModule *module = NULL;
-	gs_free_error GError *local = NULL;
 	NMVpnEditorPluginFactory factory = NULL;
 	NMVpnEditorPlugin *editor_plugin = NULL;
+	gs_free char *plugin_filename_free = NULL;
+	const char *plugin_filename;
+
+	g_return_val_if_fail (plugin_name && *plugin_name, NULL);
 
-	g_return_val_if_fail (plugin_filename && *plugin_filename, NULL);
+	/* if @do_file_checks is FALSE, we pass plugin_name directly to
+	 * g_module_open().
+	 *
+	 * Otherwise, we allow for library names without path component.
+	 * In which case, we prepend the plugin directory and form an
+	 * absolute path. In that case, we perform checks on the file.
+	 *
+	 * One exception is that we don't allow for the "la" suffix. The
+	 * reason is that g_module_open() interprets files with this extension
+	 * special and we don't want that. */
+	plugin_filename = plugin_name;
+	if (do_file_checks) {
+		if (   !strchr (plugin_name, '/')
+		    && !g_str_has_suffix (plugin_name, ".la")) {
+			plugin_filename_free = g_module_build_path (NMPLUGINDIR, plugin_name);
+			plugin_filename = plugin_filename_free;
+		}
 
-	/* _nm_utils_check_module_file() fails with ENOENT if the plugin file
-	 * does not exist. That is relevant, because nm-applet checks for that. */
-	if (_nm_utils_check_module_file (plugin_filename,
-		                             check_owner,
-		                             check_file,
-		                             user_data,
-		                             &local))
-		module = g_module_open (plugin_filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+		/* _nm_utils_check_module_file() fails with ENOENT if the plugin file
+		 * does not exist. That is relevant, because nm-applet checks for that. */
+		if (!_nm_utils_check_module_file (plugin_filename,
+		                                  check_owner,
+		                                  check_file,
+		                                  user_data,
+		                                  error))
+			return NULL;
+	}
 
+	module = g_module_open (plugin_filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
 	if (!module) {
-		if (local) {
-			g_propagate_error (error, local);
-			local = NULL;
-		} else {
-			g_set_error (error,
-			             NM_VPN_PLUGIN_ERROR,
-			             NM_VPN_PLUGIN_ERROR_FAILED,
-			             _("cannot load plugin %s"), plugin_filename);
-		}
+		g_set_error (error,
+		             NM_VPN_PLUGIN_ERROR,
+		             NM_VPN_PLUGIN_ERROR_FAILED,
+		             _("cannot load plugin %s"), plugin_name);
 		return NULL;
 	}
-	g_clear_error (&local);
 
 	if (g_module_symbol (module, "nm_vpn_editor_plugin_factory", (gpointer) &factory)) {
 		gs_free_error GError *factory_error = NULL;
@@ -180,7 +170,7 @@ nm_vpn_editor_plugin_load_from_file  (const char *plugin_filename,
 				g_set_error (error,
 				             NM_VPN_PLUGIN_ERROR,
 				             NM_VPN_PLUGIN_ERROR_FAILED,
-				             _("unknown error initializing plugin %s"), plugin_filename);
+				             _("unknown error initializing plugin %s"), plugin_name);
 			}
 		}
 
@@ -201,6 +191,52 @@ nm_vpn_editor_plugin_load_from_file  (const char *plugin_filename,
 	return editor_plugin;
 }
 
+/**
+ * nm_vpn_editor_plugin_load_from_file:
+ * @plugin_name: The path or name of the shared library to load.
+ *  The path must either be an absolute filename to an existing file.
+ *  Alternatively, it can be the name (without path) of a library in the
+ *  plugin directory of NetworkManager.
+ * @check_service: if not-null, check that the loaded plugin advertises
+ *  the given service.
+ * @check_owner: if non-negative, check whether the file is owned
+ *  by UID @check_owner or by root. In this case also check that
+ *  the file is not writable by anybody else.
+ * @check_file: (scope call): optional callback to validate the file prior to
+ *   loading the shared library.
+ * @user_data: user data for @check_file
+ * @error: on failure the error reason.
+ *
+ * Load the shared libary @plugin_name and create a new
+ * #NMVpnEditorPlugin instace via the #NMVpnEditorPluginFactory
+ * function.
+ *
+ * If @plugin_name is not an absolute path name, it assumes the file
+ * is in the plugin directory of NetworkManager. In any case, the call
+ * will do certain checks on the file before passing it to dlopen.
+ * A consequence for that is, that you cannot omit the ".so" suffix.
+ *
+ * Returns: (transfer full): a new plugin instance or %NULL on error.
+ *
+ * Since: 1.2
+ */
+NMVpnEditorPlugin *
+nm_vpn_editor_plugin_load_from_file  (const char *plugin_name,
+                                      const char *check_service,
+                                      int check_owner,
+                                      NMUtilsCheckFilePredicate check_file,
+                                      gpointer user_data,
+                                      GError **error)
+{
+	return _nm_vpn_editor_plugin_load (plugin_name,
+	                                   TRUE,
+	                                   check_service,
+	                                   check_owner,
+	                                   check_file,
+	                                   user_data,
+	                                   error);
+}
+
 /*********************************************************************/
 
 /**
diff --git a/libnm-core/nm-vpn-editor-plugin.h b/libnm-core/nm-vpn-editor-plugin.h
index 16e9533d..9ff23a81 100644
--- a/libnm-core/nm-vpn-editor-plugin.h
+++ b/libnm-core/nm-vpn-editor-plugin.h
@@ -140,7 +140,7 @@ char         *nm_vpn_editor_plugin_get_suggested_filename (NMVpnEditorPlugin *pl
                                                            NMConnection *connection);
 
 NM_AVAILABLE_IN_1_2
-NMVpnEditorPlugin *nm_vpn_editor_plugin_load_from_file  (const char *plugin_filename,
+NMVpnEditorPlugin *nm_vpn_editor_plugin_load_from_file  (const char *plugin_name,
                                                          const char *check_service,
                                                          int check_owner,
                                                          NMUtilsCheckFilePredicate check_file,
diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c
index 53278fca..2e6275e3 100644
--- a/libnm-core/nm-vpn-plugin-info.c
+++ b/libnm-core/nm-vpn-plugin-info.c
@@ -620,12 +620,12 @@ nm_vpn_plugin_info_get_program (NMVpnPluginInfo *self)
 gboolean
 nm_vpn_plugin_info_supports_multiple (NMVpnPluginInfo *self)
 {
+	const char *s;
+
 	g_return_val_if_fail (NM_IS_VPN_PLUGIN_INFO (self), FALSE);
 
-	return g_key_file_get_boolean (NM_VPN_PLUGIN_INFO_GET_PRIVATE (self)->keyfile,
-	                               NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION,
-	                               "supports-multiple-connections",
-	                               NULL);
+	s = nm_vpn_plugin_info_lookup_property (self, NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION, "supports-multiple-connections");
+	return _nm_utils_ascii_str_to_bool (s, FALSE);
 }
 
 
@@ -877,15 +877,16 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
 		for (j = 0; keys && keys[j]; j++) {
 			char *s;
 
-			/* Lookup the value via get_string(). We want that behavior.
-			 * You could still lookup the original values via g_key_file_get_value()
-			 * based on priv->keyfile. */
+			/* Lookup the value via get_string(). We want that behavior for all our
+			 * values. */
 			s = g_key_file_get_string (priv->keyfile, groups[i], keys[j], NULL);
 			if (s)
 				g_hash_table_insert (priv->keys, _nm_utils_strstrdictkey_create (groups[i], keys[j]), s);
 		}
 	}
 
+	g_clear_pointer (&priv->keyfile, g_key_file_unref);
+
 	return TRUE;
 }
 
@@ -948,9 +949,10 @@ finalize (GObject *object)
 	g_free (priv->service);
 	g_strfreev (priv->aliases);
 	g_free (priv->filename);
-	g_key_file_unref (priv->keyfile);
 	g_hash_table_unref (priv->keys);
 
+	g_clear_pointer (&priv->keyfile, g_key_file_unref);
+
 	G_OBJECT_CLASS (nm_vpn_plugin_info_parent_class)->finalize (object);
 }
 
diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c
index 7fdf0f72..3dd89f95 100644
--- a/libnm-util/crypto.c
+++ b/libnm-util/crypto.c
@@ -654,6 +654,9 @@ crypto_is_pkcs12_data (const GByteArray *data)
 
 	g_return_val_if_fail (data != NULL, FALSE);
 
+	if (!data->len)
+		return FALSE;
+
 	success = crypto_verify_pkcs12 (data, NULL, &error);
 	if (success == FALSE) {
 		/* If the error was just a decryption error, then it's pkcs#12 */
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index 82e29ee8..bf4369e4 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/libnm/nm-vpn-service-plugin.c
@@ -994,19 +994,6 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
 	if (!proxy)
 		goto out;
 
-	ret = g_dbus_proxy_call_sync (proxy,
-	                              "RequestName",
-	                              g_variant_new ("(su)", priv->dbus_service_name, 0),
-	                              G_DBUS_CALL_FLAGS_NONE, -1,
-	                              cancellable, error);
-	g_object_unref (proxy);
-	if (!ret) {
-		if (error && *error)
-			g_dbus_error_strip_remote_error (*error);
-		goto out;
-	}
-	g_variant_unref (ret);
-
 	priv->dbus_vpn_service_plugin = nmdbus_vpn_plugin_skeleton_new ();
 	if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (priv->dbus_vpn_service_plugin),
 	                                       connection,
@@ -1030,6 +1017,19 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
 	nm_vpn_service_plugin_set_connection (plugin, connection);
 	nm_vpn_service_plugin_set_state (plugin, NM_VPN_SERVICE_STATE_INIT);
 
+	ret = g_dbus_proxy_call_sync (proxy,
+	                              "RequestName",
+	                              g_variant_new ("(su)", priv->dbus_service_name, 0),
+	                              G_DBUS_CALL_FLAGS_NONE, -1,
+	                              cancellable, error);
+	g_object_unref (proxy);
+	if (!ret) {
+		if (error && *error)
+			g_dbus_error_strip_remote_error (*error);
+		goto out;
+	}
+	g_variant_unref (ret);
+
 	success = TRUE;
 
  out:
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index 4c06ffa3..6fc58362 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/12/2016
+.\"      Date: 04/20/2016
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.1.94
+.\"    Source: NetworkManager 1.2.0
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.1\&.94" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.2\&.0" "Network management daemons"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 95e36983..b058e562 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/12/2016
+.\"      Date: 04/20/2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.1.94
+.\"    Source: NetworkManager 1.2.0
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CON" "5" "" "NetworkManager 1\&.1\&.94" "Configuration"
+.TH "NETWORKMANAGER\&.CON" "5" "" "NetworkManager 1\&.2\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-online.1 b/man/nm-online.1
index 7a0c8087..601433e9 100644
--- a/man/nm-online.1
+++ b/man/nm-online.1
@@ -2,12 +2,12 @@
 .\"     Title: nm-online
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/12/2016
+.\"      Date: 04/20/2016
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.1.94
+.\"    Source: NetworkManager 1.2.0
 .\"  Language: English
 .\"
-.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.1\&.94" "General Commands Manual"
+.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.2\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index 1dbc66dc..fddbc118 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 v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/12/2016
+.\"      Date: 04/20/2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.1.94
+.\"    Source: NetworkManager 1.2.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.1\&.94" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.2\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index b7af978f..23ed0018 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.1.94</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.2.0</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 5f187d5d..80b89d0d 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 v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/12/2016
+.\"      Date: 04/20/2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.1.94
+.\"    Source: NetworkManager 1.2.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.1\&.94" "Configuration"
+.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.2\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index f4c8e322..0af413a3 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.1.94</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.2.0</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.5 b/man/nm-settings.5
index 3f94730c..746a428c 100644
--- a/man/nm-settings.5
+++ b/man/nm-settings.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/12/2016
+.\"      Date: 04/20/2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.1.94
+.\"    Source: NetworkManager 1.2.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.1\&.94" "Configuration"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.2\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings.xml b/man/nm-settings.xml
index 4d51f648..d97c36fc 100644
--- a/man/nm-settings.xml
+++ b/man/nm-settings.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"><refentryinfo><title>nm-settings</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.1.94</refmiscinfo></refmeta><refnamediv><refname>nm-settings</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
+<refentry id="nm-settings"><refentryinfo><title>nm-settings</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.2.0</refmiscinfo></refmeta><refnamediv><refname>nm-settings</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles</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 9c173aff..ae3c8c0b 100644
--- a/man/nmcli-examples.7
+++ b/man/nmcli-examples.7
@@ -2,12 +2,12 @@
 .\"     Title: nmcli-examples
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/12/2016
+.\"      Date: 04/20/2016
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.1.94
+.\"    Source: NetworkManager 1.2.0
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.1\&.94" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.2\&.0" "Examples"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmcli.1 b/man/nmcli.1
index 85d7d1bd..ffeb3e9a 100644
--- a/man/nmcli.1
+++ b/man/nmcli.1
@@ -2,12 +2,12 @@
 .\"     Title: nmcli
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/12/2016
+.\"      Date: 04/20/2016
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.1.94
+.\"    Source: NetworkManager 1.2.0
 .\"  Language: English
 .\"
-.TH "NMCLI" "1" "" "NetworkManager 1\&.1\&.94" "General Commands Manual"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.2\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmtui.1 b/man/nmtui.1
index 3d99ddc5..2b825dfe 100644
--- a/man/nmtui.1
+++ b/man/nmtui.1
@@ -2,12 +2,12 @@
 .\"     Title: nmtui
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/12/2016
+.\"      Date: 04/20/2016
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.1.94
+.\"    Source: NetworkManager 1.2.0
 .\"  Language: English
 .\"
-.TH "NMTUI" "1" "" "NetworkManager 1\&.1\&.94" "General Commands Manual"
+.TH "NMTUI" "1" "" "NetworkManager 1\&.2\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/po/fr.po b/po/fr.po
index 128bbc2b..4041c462 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -104,7 +104,7 @@ msgstr "Erreur : l'initialisation de l'agent de secret a échoué"
 #: ../clients/cli/agent.c:166
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
-msgstr "Erreur : l'initialisation de l'agent polkit a échoué"
+msgstr "Erreur : l'initialisation de l'agent polkit a échoué : %s"
 
 #: ../clients/cli/agent.c:174
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index 545e4a13..32c35837 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 15:00+0200\n"
-"PO-Revision-Date: 2016-03-29 18:11+0200\n"
+"POT-Creation-Date: 2016-04-12 15:49+0200\n"
+"PO-Revision-Date: 2016-04-12 15:50+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -6958,7 +6958,7 @@ msgstr "Połączenie DSL %d"
 
 #: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
 #: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4190
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
 msgid "Bond"
 msgstr "Wiązane"
 
@@ -6969,7 +6969,7 @@ msgstr "Połączenie wiązane %d"
 
 #: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
 #: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4487
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
 msgid "Bridge"
 msgstr "Mostek"
 
@@ -6980,7 +6980,7 @@ msgstr "Połączenie mostkowane %d"
 
 #: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
 #: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4296
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
 msgid "Team"
 msgstr "Zespół"
 
@@ -8026,7 +8026,7 @@ msgstr "Znormalizowanie połączenia niespodziewanie się nie powiodło"
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2162
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -8267,7 +8267,7 @@ msgstr "nieprawidłowy klucz prywatny drugiego etapu"
 #: ../libnm-core/nm-setting-connection.c:844
 #: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
 #: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2169
+#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -8432,7 +8432,7 @@ msgstr "opcja „%s” jest prawidłowa tylko z trybem „%s”"
 #: ../libnm-core/nm-setting-bond.c:687
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
-msgstr ""
+msgstr "„%s” i „%s” nie mogą mieć różnych wartości"
 
 #: ../libnm-core/nm-setting-bond.c:703
 #, c-format
@@ -8632,55 +8632,55 @@ msgstr "Nieprawidłowy adres IPv4 „%s”"
 msgid "Invalid IPv6 address '%s'"
 msgstr "Nieprawidłowy adres IPv6 „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:152
+#: ../libnm-core/nm-setting-ip-config.c:153
 #, c-format
 msgid "Invalid IPv4 address prefix '%u'"
 msgstr "Nieprawidłowy przedrostek adresu IPv4 „%u”"
 
-#: ../libnm-core/nm-setting-ip-config.c:152
+#: ../libnm-core/nm-setting-ip-config.c:153
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
 msgstr "Nieprawidłowy przedrostek adresu IPv6 „%u”"
 
-#: ../libnm-core/nm-setting-ip-config.c:170
+#: ../libnm-core/nm-setting-ip-config.c:168
 #, c-format
 msgid "Invalid routing metric '%s'"
 msgstr "Nieprawidłowe parametry trasy „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:2182
+#: ../libnm-core/nm-setting-ip-config.c:2187
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. adres serwera DNS jest nieprawidłowy"
 
-#: ../libnm-core/nm-setting-ip-config.c:2198
+#: ../libnm-core/nm-setting-ip-config.c:2203
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. adres IP jest nieprawidłowy"
 
-#: ../libnm-core/nm-setting-ip-config.c:2210
+#: ../libnm-core/nm-setting-ip-config.c:2215
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. adres IP posiada właściwość „label” z nieprawidłowym typem"
 
-#: ../libnm-core/nm-setting-ip-config.c:2219
+#: ../libnm-core/nm-setting-ip-config.c:2224
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. adres IP posiada nieprawidłową etykietę „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:2233
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "brama nie może być ustawiona, jeśli nie skonfigurowano żadnych adresów"
 
-#: ../libnm-core/nm-setting-ip-config.c:2242
+#: ../libnm-core/nm-setting-ip-config.c:2247
 msgid "gateway is invalid"
 msgstr "brama jest nieprawidłowa"
 
-#: ../libnm-core/nm-setting-ip-config.c:2256
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. trasa jest nieprawidłowa"
 
-#: ../libnm-core/nm-setting-ip-config.c:2265
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr "%d trasa nie może być domyślną trasą"
@@ -8760,9 +8760,8 @@ msgid "property is not specified and neither is '%s:%s'"
 msgstr "właściwość nie została podana, tak jak i „%s:%s”"
 
 #: ../libnm-core/nm-setting-macvlan.c:192
-#, fuzzy
 msgid "non promiscuous operation is allowed only in passthru mode"
-msgstr "nierozwiązłe działanie jest dozwolone tylko w trybie przejścia\""
+msgstr "nierozwiązłe działanie jest dozwolone tylko w trybie przejścia"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
 #: ../libnm-core/nm-setting-wireless.c:739
@@ -9570,25 +9569,25 @@ msgid "Failed to read configuration: %s\n"
 msgstr "Odczytanie konfiguracji się nie powiodło: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:234 ../src/nm-iface-helper.c:297
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "Wyświetla wersję usługi NetworkManager i kończy działanie"
 
-#: ../src/main.c:235 ../src/nm-iface-helper.c:298
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "Bez zmiany w usługę"
 
-#: ../src/main.c:236 ../src/nm-iface-helper.c:300
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Poziom dziennika: jeden z [%s]"
 
-#: ../src/main.c:238 ../src/nm-iface-helper.c:302
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "Domeny dziennika oddzielone przez „,”: dowolne połączenie [%s]"
 
-#: ../src/main.c:240 ../src/nm-iface-helper.c:304
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "Wszystkie ostrzeżenia jako krytyczne"
 
@@ -9616,12 +9615,12 @@ msgstr ""
 "wybranie bezprzewodowych punktów dostępowych, z którymi karty\n"
 "sieciowe w komputerze powinny być powiązane."
 
-#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:392
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Parametr --help wyświetli listę prawidłowych opcji.\n"
 
-#: ../src/main.c:348 ../src/nm-iface-helper.c:397
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr ""
@@ -9639,7 +9638,7 @@ msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr ""
 "Ignorowanie nierozpoznanych domen dziennika „%s” z plików konfiguracji.\n"
 
-#: ../src/main.c:389 ../src/nm-iface-helper.c:407
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Nie można zmienić w usługę: %s [błąd %u]\n"
@@ -9989,7 +9988,7 @@ msgstr "Lista wtyczek oddzielonych „,”"
 msgid "Quit after initial configuration"
 msgstr "Kończy działanie po początkowej konfiguracji"
 
-#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:299
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 msgid "Don't become a daemon, and log to stderr"
 msgstr ""
 "Bez zmiany w usługę i zapisywanie dziennika do standardowego wyjścia błędów"
@@ -10008,87 +10007,87 @@ msgid "The expected start of the response"
 msgstr "Oczekiwany początek odpowiedzi"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:281
 msgid "The interface to manage"
 msgstr "Interfejs do zarządzania"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:281
 msgid "eth0"
 msgstr "eth0"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:282
 msgid "Connection UUID"
 msgstr "UUID połączenia"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:282
 msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 msgstr "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:283
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "Czy zarządzać SLAAC IPv6"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:284
 msgid "Whether SLAAC must be successful"
 msgstr "Czy SLAAC musi się powieść"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:285
 msgid "Use an IPv6 temporary privacy address"
 msgstr "Użycie tymczasowego adresu prywatnego IPv6"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:286
 msgid "Current DHCPv4 address"
 msgstr "Bieżący adres DHCPv4"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:287
 msgid "Whether DHCPv4 must be successful"
 msgstr "Czy DHCPv4 musi się powieść"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:288
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "Identyfikator klienta DHCPv4 zakodowany szesnastkowo"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "Hostname to send to DHCP server"
 msgstr "Nazwa komputera wysyłana do serwera DHCP"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "barbar"
 msgstr "barbar"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "FQDN to send to DHCP server"
 msgstr "FQDN wysyłane do serwera DHCP"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "host.domain.org"
 msgstr "komputer.domena.org"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 msgid "Route priority for IPv4"
 msgstr "Priorytet trasy dla IPv4"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:292
 msgid "Route priority for IPv6"
 msgstr "Priorytet trasy dla IPv6"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:292
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:293
 msgid "Hex-encoded Interface Identifier"
 msgstr "Identyfikator interfejsu zakodowany szesnastkowo"
 
-#: ../src/nm-iface-helper.c:293
+#: ../src/nm-iface-helper.c:294
 msgid "IPv6 SLAAC address generation mode"
 msgstr "Tryb tworzenia adresów SLAAC IPv6"
 
-#: ../src/nm-iface-helper.c:294
+#: ../src/nm-iface-helper.c:295
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
@@ -10096,7 +10095,7 @@ msgstr ""
 "Właściwość konfiguracji mechanizmu dziennika. Więcej informacji zawiera "
 "„logging.backend” w pliku NetworkManager.conf"
 
-#: ../src/nm-iface-helper.c:314
+#: ../src/nm-iface-helper.c:315
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
@@ -10104,17 +10103,17 @@ msgstr ""
 "nm-iface-helper to mały, samodzielny proces zarządzający pojedynczym "
 "interfejsem sieciowym."
 
-#: ../src/nm-iface-helper.c:373
+#: ../src/nm-iface-helper.c:374
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "Wymagana jest nazwa interfejsu i UUID\n"
 
-#: ../src/nm-iface-helper.c:379
+#: ../src/nm-iface-helper.c:380
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "Odnalezienie indeksu interfejsu dla %s (%s) się nie powiodło\n"
 
-#: ../src/nm-iface-helper.c:441
+#: ../src/nm-iface-helper.c:442
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): nieprawidłowy IID %s\n"
diff --git a/po/sv.po b/po/sv.po
index 4f71159d..e4754dbf 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,22 +1,25 @@
 # Swedish messages for NetworkManager.
-# Copyright © 2004-2014 Free Software Foundation, Inc.
+# Copyright © 2004-2016 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2004, 2005, 2006.
 # Daniel Nylander <po@danielnylander.se>, 2006, 2008, 2009, 2010, 2012.
 # Josef Andersson <josef.andersson@fripost.org>, 2014, 2015.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015, 2016.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 15:00+0200\n"
-"PO-Revision-Date: 2015-07-21 11:55+0100\n"
-"Last-Translator: Josef Andersson <josef.andersson@fripost.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=Translations\n"
+"POT-Creation-Date: 2016-04-07 13:40+0000\n"
+"PO-Revision-Date: 2016-04-05 22:40+0200\n"
+"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Generator: Poedit 1.8.7.1\n"
 "X-Project-Style: gnome\n"
 
 #: ../clients/cli/agent.c:39
@@ -45,10 +48,11 @@ msgid ""
 msgstr ""
 "Användning: nmcli agent secret { help }\n"
 "\n"
-"Kör nmcli som en hemlig agent för Nätverkshanteraren. När Nätverkshanteraren "
-"kräver ett lösenord frågar den efter dess registrerade agenter. Detta "
-"kommando håller nmcli körandes,\n"
-"och om ett lösenord begärs frågas användaren om det.\n"
+"Kör nmcli som en hemlig agent för Nätverkshanteraren. När "
+"Nätverkshanteraren\n"
+"begär ett lösenord kommer den att fråga registrerade agenter om detta.\n"
+"Detta kommando håller nmcli körandes, och om ett lösenord begärs frågas\n"
+"användaren om det.\n"
 "\n"
 
 #: ../clients/cli/agent.c:57
@@ -64,7 +68,7 @@ msgid ""
 msgstr ""
 "Användning: nmcli agent polkit { help }\n"
 "\n"
-"Registrerar nmcli some en polkit-åtgärd för dess användarsession.\n"
+"Registrerar nmcli som en polkit-åtgärd för användarsessionen.\n"
 "När en polkit-demon begär behörighet frågar nmcli användaren och ger\n"
 "tillbaka svaret till polkit.\n"
 "\n"
@@ -597,7 +601,7 @@ msgid ""
 "without '--ask' option.\n"
 msgstr ""
 "Varning: Lösenord för ”%s” inte angivet i ”passwd-file” och nmcli kan inte "
-"fråga utan alternativet ”--ask”.\n"
+"fråga utan flaggan ”--ask”.\n"
 
 #. define some prompts for connection editor
 #: ../clients/cli/connections.c:41
@@ -630,9 +634,8 @@ msgid "Connection (name, UUID, or path): "
 msgstr "Anslutning (namn, UUID eller sökväg): "
 
 #: ../clients/cli/connections.c:50
-#, fuzzy
 msgid "VPN connection (name, UUID, or path): "
-msgstr "Anslutning (namn, UUID eller sökväg): "
+msgstr "VPN-anslutning (namn, UUID eller sökväg): "
 
 #: ../clients/cli/connections.c:51
 msgid "Connection(s) (name, UUID, or path): "
@@ -644,11 +647,11 @@ msgstr "Anslutning(ar) (namn, UUID eller sökväg): "
 
 #: ../clients/cli/connections.c:53
 msgid "Tunnel mode: "
-msgstr ""
+msgstr "Tunnelläge: "
 
 #: ../clients/cli/connections.c:54
 msgid "MACVLAN mode: "
-msgstr ""
+msgstr "MACVLAN-läge: "
 
 #. 0
 #: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
@@ -784,7 +787,7 @@ msgstr "VPN"
 #: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
-msgstr "ANS-SÖKV"
+msgstr "ANSL-SÖKV"
 
 #. 10
 #: ../clients/cli/connections.c:203
@@ -845,7 +848,7 @@ msgid "DHCP6"
 msgstr "DHCP6"
 
 #: ../clients/cli/connections.c:272
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
@@ -886,35 +889,43 @@ msgid ""
 msgstr ""
 "Användning: nmcli connection { KOMMANDO | help }\n"
 "\n"
-"KOMMANDO := { show | up | down | add | modify | edit | delete | reload | "
-"load }\n"
+"KOMMANDO := { show | up | down | add | modify | edit | delete | monitor | "
+"reload | load }\n"
 "\n"
-"  show [--active] [--order <order spec>]\n"
-"  show [--active] [[--show-secrets] [id | uuid | path | apath] <ID>] ...\n"
+"  show [--active] [--order <ordningsspecifikation>]\n"
+"  show [--active] [id | uuid | path | apath] <ID> …\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file "
+"  up [[id | uuid | path] <ID>] [ifname <grnamn>] [ap <BSSID>] [passwd-file "
 "<fil med lösenord>]\n"
 "\n"
-"  down [id | uuid | path | apath] <ID> ...\n"
+"  down [id | uuid | path | apath] <ID> …\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS  [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+"  add VANLIGA_FLAGGOR TYPSPECIFIKA_FLAGGOR SLAVFLAGGOR IP-FLAGGOR [-- "
+"([+|-]<inställning>.<egenskap> <värde>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<inställning>."
 "<egenskap> <värde>)+\n"
 "\n"
+"  clone [--temporary] [id | uuid | path ] <ID> <nytt namn>\n"
+"\n"
 "  edit [id | uuid | path] <ID>\n"
 "  edit [type <new_con_type>] [con-name <new_con_name>]\n"
 "\n"
 "  delete [id | uuid | path] <ID>\n"
 "\n"
+"  monitor [id | uuid | path] <ID> …\n"
+"\n"
 "  reload\n"
 "\n"
-"  load <filnamn> [ <filnamn>... ]\n"
+"  load <filnamn> [ <filnamn>… ]\n"
+"\n"
+"  import [--temporary] type <typ> file <fil att importera>\n"
+"\n"
+"  export [id | uuid | path] <ID> [<utdatafil>]\n"
 "\n"
 
 #: ../clients/cli/connections.c:294
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
 "\n"
@@ -941,7 +952,7 @@ msgid ""
 msgstr ""
 "Användning: nmcli connection show { ARGUMENT | help }\n"
 "\n"
-"ARGUMENT := [--active]\n"
+"ARGUMENT := [--active] [--order <ordningsspecifikation>]\n"
 "\n"
 "Listar anslutningsprofiler i minnet och på disk, varav några också kan vara\n"
 "aktiva om enheten använder den anslutningsprofilen. Utan en parameter kommer "
@@ -950,14 +961,14 @@ msgstr ""
 "profilerna att visas. --order möjliggör anpassad anslutningssortering (se "
 "handboken).\n"
 "\n"
-"ARGUMENT := [--active] [--show-secrets] [id | uuid | sökväg | apath] <ID> …\n"
+"ARGUMENT := [--active] [id | uuid | path | apath] <ID> …\n"
 "\n"
 "Visar detaljer för angivna anslutningar. Som standard visas både statiska "
 "och aktiva\n"
 "konfigurationer. Det är möjligt att filtrera utdata\n"
-"med globala flaggan '--fields'. Se handboken för mer information.\n"
-"När flaggan --active anges kommer endast den aktiva profilen att\n"
-"räknas. Alternativet --show-secrets kommer också att visa associerade "
+"med globala flaggan ”--fields”. Se handboken för mer information.\n"
+"När flaggan --active anges kommer endast de aktiva profilerna att\n"
+"räknas. Flaggan --show-secrets kommer dessutom att visa associerade "
 "hemligheter.\n"
 
 #: ../clients/cli/connections.c:315
@@ -1020,7 +1031,7 @@ msgid ""
 msgstr ""
 "Användning: nmcli connection down { ARGUMENT | help }\n"
 "\n"
-"ARGUMENT := [id | uuid | path | apath] <ID> ...\n"
+"ARGUMENT := [id | uuid | path | apath] <ID> …\n"
 "\n"
 "Inaktivera en anslutning från en enhet (utan att hindra enheten från\n"
 "vidare autoaktivering). Profilen att inaktivera identifieras genom dess "
@@ -1029,7 +1040,7 @@ msgstr ""
 "\n"
 
 #: ../clients/cli/connections.c:348
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
@@ -1172,8 +1183,8 @@ msgid ""
 msgstr ""
 "Användning: nmcli connection add { ARGUMENT | help }\n"
 "\n"
-"ARGUMENT := VANLIGA_FLAGGOR TYPSPECIFIKA_FLAGGOR SLAV_FLAGGOR IP-FLAGGOR  "
-"[-- ([+|-]<inställning>.<egenskap> <värde>)+]\n"
+"ARGUMENT := VANLIGA_FLAGGOR TYPSPECIFIKA_FLAGGOR SLAVFLAGGOR IP-FLAGGOR [-- "
+"([+|-]<inställning>.<egenskap> <värde>)+]\n"
 "\n"
 "  VANLIGA_FLAGGOR:\n"
 "                  type <typ>\n"
@@ -1220,11 +1231,11 @@ msgstr ""
 "    bluetooth:    [addr <bluetoothadress>]\n"
 "                  [bt-type panu|dun-gsm|dun-cdma]\n"
 "\n"
-"    vlan:         dev <parent device (connection  UUID, ifname, or MAC)>\n"
+"    vlan:         dev <parent device (anslutnings-UUID, grnamn eller MAC)>\n"
 "                  id <VLAN-ID>\n"
 "                  [flags <VLAN-flaggor>]\n"
-"                  [ingress <ingress priority mapping>]\n"
-"                  [egress <egress priority mapping>]\n"
+"                  [ingress <inträdesprioritetshash>]\n"
+"                  [egress <utträdesprioritetshash>]\n"
 "                  [mtu <MTU>]\n"
 "\n"
 "    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) "
@@ -1271,6 +1282,43 @@ msgstr ""
 "                  [channel <1-13>]\n"
 "                  [dhcp-anycast <MAC-adress>]\n"
 "\n"
+"    adsl:         username <användarnamn>\n"
+"                  protocol pppoa|pppoe|ipoatm\n"
+"                  [password <lösenord>]\n"
+"                  [encapsulation vcmux|llc]\n"
+"\n"
+"    tun:          mode tun|tap\n"
+"                  [owner <UID>]\n"
+"                  [group <GID>]\n"
+"                  [pi yes|no]\n"
+"                  [vnet-hdr yes|no]\n"
+"                  [multi-queue yes|no]\n"
+"\n"
+"    ip-tunnel:    mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n"
+"                  remote <IP för fjärrändpunkt>\n"
+"                  [local <IP för lokal ändpunkt>]\n"
+"                  [dev <överordnad enhet (grnamn eller anslutnings-UUID)>]\n"
+"\n"
+"    macvlan:      dev <överordnad enhet (anslutnings-UUID, grnamn eller "
+"MAC)>\n"
+"                  mode vepa|bridge|private|passthru|source\n"
+"                  [tap yes|no]\n"
+"\n"
+"    vxlan:        id <VXLAN-ID>\n"
+"                  remote <IP för multicast-grupp eller fjärradress>\n"
+"                  [local <käll-IP>]\n"
+"                  [dev <överordnad enhet (grnamn eller anslutnings-UUID)>]\n"
+"                  [source-port-min <0-65535>]\n"
+"                  [source-port-max <0-65535>]\n"
+"                  [destination-port <0-65535>]\n"
+"\n"
+"  SLAVFLAGGOR:\n"
+"    bridge:       [priority <0-63>]\n"
+"                  [path-cost <1-65535>]\n"
+"                  [hairpin yes|no]\n"
+"\n"
+"    team:         [config <file>|<rå JSON-data>]\n"
+"\n"
 "  IP-FLAGGOR:\n"
 "                  [ip4 <IPv4-adress>] [gw4 <IPv4-gateway>]\n"
 "                  [ip6 <IPv6-adress>] [gw6 <IPv6-gateway>]\n"
@@ -1308,20 +1356,20 @@ msgstr ""
 "Modifiera en eller flera av anslutningsprofilens egenskaper.\n"
 "Profilen identifieras genom dess namn, UUID eller D-BUS-sökväg. För "
 "egenskaper\n"
-"med flera värden kan du valfritt ange prefix '+' eller '-' till "
+"med flera värden kan du valfritt ange prefix ”+” eller ”-” till "
 "egenskapsnamnet.\n"
-"'+'-tecknet gör det möjligt att lägga till objekt istället för att skriva "
+"”+”-tecknet gör det möjligt att lägga till objekt istället för att skriva "
 "över hela värdet.\n"
-"'-'-tecknet gör det möjligt att ta bort markerade objekt istället för hela "
+"”-”-tecknet gör det möjligt att ta bort markerade objekt istället för hela "
 "värdet.\n"
 "\n"
 "Exempel:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr ”192.168.1.2/24, "
-"10.10.1.5/8”\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
-"nmcli con mod em1-1 -ipv6.addr ”abbe::cafe/56”\n"
+"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
 "nmcli con mod bond0 +bond.options mii=500\n"
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
@@ -1339,6 +1387,15 @@ msgid ""
 "id (provided as <new name> argument).\n"
 "\n"
 msgstr ""
+"Användning: nmcli connection clone { ARGUMENT | help }\n"
+"\n"
+"ARGUMENT := [--temporary] [id | uuid | path] <ID> <nytt namn>\n"
+"\n"
+"Klona en befintlig anslutningsprofil. Den nyskapade anslutningen kommer "
+"vara\n"
+"en exakt kopia av <ID>, förutom egenskapen uuid (som kommer genereras) och\n"
+"id (tillhandahålls av argumentet <nytt namn>).\n"
+"\n"
 
 #: ../clients/cli/connections.c:495
 #, c-format
@@ -1355,7 +1412,7 @@ msgid ""
 "Add a new connection profile in an interactive editor.\n"
 "\n"
 msgstr ""
-"Usage: nmcli connection edit { ARGUMENT | help }\n"
+"Användning: nmcli connection edit { ARGUMENT | help }\n"
 "\n"
 "ARGUMENT := [id | uuid | path] <ID>\n"
 "\n"
@@ -1387,7 +1444,7 @@ msgstr ""
 "\n"
 
 #: ../clients/cli/connections.c:521
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
 "\n"
@@ -1398,16 +1455,14 @@ msgid ""
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
 msgstr ""
-"Usage: nmcli connection edit { ARGUMENT | help }\n"
+"Användning: nmcli connection monitor { ARGUMENT | help }\n"
 "\n"
-"ARGUMENT := [id | uuid | path] <ID>\n"
-"\n"
-"Redigera en existerande anslutningsprofil i en interaktiv redigerare.\n"
-"Profilen identifieras genom dess namn, UUID eller D-Bus-sökväg\n"
+"ARGUMENT := [id | uuid | path] <ID> …\n"
 "\n"
-"ARGUMENT := [type <ny anslutningstyp>] [con-name <nytt anslutningsnamn>]\n"
-"\n"
-"Lägg till en ny anslutningsprofil i en interaktiv redigerare.\n"
+"Övervaka aktivitet i anslutningsprofiler.\n"
+"Detta kommando skriver ut en rad varje gång den angivna anslutningen "
+"ändras.\n"
+"Övervakar alla anslutningsprofiler om ingen har angivits.\n"
 "\n"
 
 #: ../clients/cli/connections.c:533
@@ -1461,9 +1516,19 @@ msgid ""
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
 msgstr ""
+"Användning: nmcli connection import { ARGUMENT | help }\n"
+"\n"
+"ARGUMENT := [--temporary] type <typ> file <fil att importera>\n"
+"\n"
+"Importera en extern/främmande konfiguration som en anslutningsprofil för "
+"Nätverkshanteraren.\n"
+"Typen för indatafilen anges av typflaggan.\n"
+"Endast VPN-konfigurationer stöds för tillfället. Konfigurationen\n"
+"importeras av Nätverkshanterarens VPN-insticksmoduler.\n"
+"\n"
 
 #: ../clients/cli/connections.c:566
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
 "\n"
@@ -1473,12 +1538,12 @@ msgid ""
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
 msgstr ""
-"Användning: nmcli connection delete { ARGUMENT | help }\n"
+"Användning: nmcli connection export { ARGUMENT | help }\n"
 "\n"
-"ARGUMENT := [id | uuid | path] <ID>\n"
+"ARGUMENT := [id | uuid | path] <ID> [<utdatafil>]\n"
 "\n"
-"Ta bort en anslutningsprofil.\n"
-"Profilen identifieras genom dess namn, UUID, och D-Bus-sökväg.\n"
+"Exportera en anslutning. Endast VPN-anslutningar stöds för tillfället.\n"
+"Data dirigeras till standard ut eller till en fil om ett namn anges.\n"
 "\n"
 
 #: ../clients/cli/connections.c:644
@@ -1718,7 +1783,7 @@ msgstr "saknar kolon i ”password”-posten ”%s”"
 #: ../clients/cli/connections.c:2245
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
-msgstr "saknar . i ”password”-posten ”%s”"
+msgstr "saknar punkt i ”password”-posten ”%s”"
 
 #: ../clients/cli/connections.c:2258
 #, c-format
@@ -1789,7 +1854,7 @@ msgstr "”%s” inte bland [%s]"
 #: ../clients/cli/connections.c:3032
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s MAC address."
-msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress."
+msgstr "Fel: ”%s”: ”%s” är inte en giltig %s-MAC-adress."
 
 #. Ask for optional arguments
 #: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
@@ -1819,9 +1884,9 @@ msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
 msgstr "Fel: ”p-key”: ”%s” är inte en giltig InfiniBand P_KEY."
 
 #: ../clients/cli/connections.c:3105
-#, fuzzy, c-format
+#, c-format
 msgid "Error: '%s' is not a valid UID/GID."
-msgstr "Fel: ”mtu”: ”%s” är inte ett giltigt MTU."
+msgstr "Fel: ”%s” är inte ett giltigt UID/GID."
 
 #: ../clients/cli/connections.c:3149
 #, c-format
@@ -1845,9 +1910,8 @@ msgid "ADSL encapsulation"
 msgstr "ADSL-inkapsling"
 
 #: ../clients/cli/connections.c:3203
-#, fuzzy
 msgid "TUN device mode"
-msgstr "Enheten togs bort"
+msgstr "TUN-enhetsläge"
 
 #: ../clients/cli/connections.c:3216
 #, c-format
@@ -1898,11 +1962,11 @@ msgstr "MTU [auto]: "
 #: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
 #: ../clients/cli/connections.c:4101
 msgid "MAC [none]: "
-msgstr "MAC [none]: "
+msgstr "MAC [ingen]: "
 
 #: ../clients/cli/connections.c:3544
 msgid "Cloned MAC [none]: "
-msgstr "Klonad MAC [none]: "
+msgstr "Klonad MAC [ingen]: "
 
 #: ../clients/cli/connections.c:3592
 #, c-format
@@ -1911,11 +1975,11 @@ msgstr "Transportläge %s"
 
 #: ../clients/cli/connections.c:3605
 msgid "Parent interface [none]: "
-msgstr "Överordnat gränssnitt [none]: "
+msgstr "Överordnat gränssnitt [inget]: "
 
 #: ../clients/cli/connections.c:3616
 msgid "P_KEY [none]: "
-msgstr "P_KEY [none]: "
+msgstr "P_KEY [ingen]: "
 
 #: ../clients/cli/connections.c:3626
 #, c-format
@@ -1947,11 +2011,11 @@ msgstr "PPPoE"
 #: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
 #: ../clients/cli/connections.c:4223
 msgid "Password [none]: "
-msgstr "Lösenord [none]: "
+msgstr "Lösenord [inget]: "
 
 #: ../clients/cli/connections.c:3700
 msgid "Service [none]: "
-msgstr "Tjänst [none]: "
+msgstr "Tjänst [ingen]: "
 
 #. Ask for optional 'gsm' or 'cdma' arguments.
 #: ../clients/cli/connections.c:3730
@@ -1960,7 +2024,7 @@ msgstr "mobilt bredband"
 
 #: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
 msgid "Username [none]: "
-msgstr "Användarnamn [none]: "
+msgstr "Användarnamn [inget]: "
 
 #. Ask for optional 'bluetooth' arguments.
 #: ../clients/cli/connections.c:3749
@@ -1975,7 +2039,7 @@ msgstr "Bluetooth-typen %s"
 #: ../clients/cli/connections.c:3762
 #, c-format
 msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
-msgstr "Fel: ”bt-type'”: ”%s” är inte en giltig Bluetoothtyp.\n"
+msgstr "Fel: ”bt-type”: ”%s” är inte en giltig Bluetoothtyp.\n"
 
 #. Ask for optional 'vlan' arguments.
 #. 13
@@ -1988,15 +2052,15 @@ msgstr "VLAN"
 
 #: ../clients/cli/connections.c:3794
 msgid "VLAN flags (<0-7>) [none]: "
-msgstr "VLAN-flaggor (<0-7>) [none]: "
+msgstr "VLAN-flaggor (<0-7>) [inga]: "
 
 #: ../clients/cli/connections.c:3805
 msgid "Ingress priority maps [none]: "
-msgstr "Inträdesprioritetshash [none]: "
+msgstr "Inträdesprioritetshash [ingen]: "
 
 #: ../clients/cli/connections.c:3816
 msgid "Egress priority maps [none]: "
-msgstr "Utträdesprioritetshash [none]: "
+msgstr "Utträdesprioritetshash [ingen]: "
 
 #: ../clients/cli/connections.c:3827
 msgid "Bonding mode [balance-rr]: "
@@ -2009,7 +2073,7 @@ msgstr "kombinera"
 
 #: ../clients/cli/connections.c:3865
 msgid "Bonding primary interface [none]: "
-msgstr "Kombinerar primärt gränssnittet [none]: "
+msgstr "Primärt kombineringsgränssnitt [inget]: "
 
 #: ../clients/cli/connections.c:3868
 #, c-format
@@ -2019,7 +2083,7 @@ msgstr "Fel: ”primary”: ”%s” är inte ett giltigt gränssnittsnamn.\n"
 #: ../clients/cli/connections.c:3876
 #, c-format
 msgid "Bonding monitoring mode %s"
-msgstr "Kombinerar övervakningsläget %s"
+msgstr "Övervakningsläge %s för kombinering"
 
 #: ../clients/cli/connections.c:3882
 #, c-format
@@ -2029,7 +2093,7 @@ msgstr ""
 
 #: ../clients/cli/connections.c:3891
 msgid "Bonding miimon [100]: "
-msgstr "Kombinerar miimon [100]: "
+msgstr "Kombinerings-miimon [100]: "
 
 #: ../clients/cli/connections.c:3894
 #, c-format
@@ -2038,7 +2102,7 @@ msgstr "Fel: ”miimon” :  ”%s” är inte ett giltigt nummer <0-%u>.\n"
 
 #: ../clients/cli/connections.c:3902
 msgid "Bonding downdelay [0]: "
-msgstr "Kombinerar nedfördröjning [0]: "
+msgstr "Nedfördröjning för kombinering [0]: "
 
 #: ../clients/cli/connections.c:3905
 #, c-format
@@ -2047,7 +2111,7 @@ msgstr "Fel: ”downdelay”:  ”%s” är inte ett giltigt nummer <0-%u>.\n"
 
 #: ../clients/cli/connections.c:3913
 msgid "Bonding updelay [0]: "
-msgstr "Kombinerar uppfördröjning [0]: "
+msgstr "Uppfördröjning för kombinering [0]: "
 
 #: ../clients/cli/connections.c:3916
 #, c-format
@@ -2056,7 +2120,7 @@ msgstr "Fel: ”updelay”:  ”%s” är inte ett giltigt nummer <0-%u>.\n"
 
 #: ../clients/cli/connections.c:3925
 msgid "Bonding arp-interval [0]: "
-msgstr "Kombinerar arp-intervall [0]: "
+msgstr "arp-intervall för kombinering [0]: "
 
 #: ../clients/cli/connections.c:3928
 #, c-format
@@ -2066,7 +2130,7 @@ msgstr "Fel: ”arp-interval”:  ”%s” är inte ett giltigt nummer <0-%u>.\n
 #. FIXME: verify the string
 #: ../clients/cli/connections.c:3936
 msgid "Bonding arp-ip-target [none]: "
-msgstr "Kombinerar arp-ip-target [none]: "
+msgstr "arp-ip-target för kombinering [inget]: "
 
 #: ../clients/cli/connections.c:3943
 msgid "LACP rate ('slow' or 'fast') [slow]: "
@@ -2079,7 +2143,7 @@ msgstr "Fel: ”lacp-rate”: ”%s” är ogiltig (”slow” eller ”fast”)
 
 #: ../clients/cli/connections.c:3972
 msgid "Team JSON configuration [none]: "
-msgstr "JSON-konfiguration för grupp [none]: "
+msgstr "JSON-konfiguration för grupp [ingen]: "
 
 #: ../clients/cli/connections.c:3989
 msgid "team"
@@ -2199,7 +2263,7 @@ msgstr "Fel: ”channel”: ”%s” är inte ett giltigt nummer <1-13>.\n"
 
 #: ../clients/cli/connections.c:4200
 msgid "DHCP anycast MAC address [none]: "
-msgstr "DHCP-anycast MAC-adress [none]: "
+msgstr "DHCP-anycast MAC-adress [ingen]: "
 
 #. Ask for optional 'adsl' arguments.
 #: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
@@ -2215,79 +2279,77 @@ msgstr "ADSL-inkapsling %s"
 #. Ask for optional 'macvlan' arguments.
 #: ../clients/cli/connections.c:4245
 msgid "macvlan"
-msgstr ""
+msgstr "macvlan"
 
 #: ../clients/cli/connections.c:4251
 #, c-format
 msgid "Tap %s"
-msgstr ""
+msgstr "Tap %s"
 
 #: ../clients/cli/connections.c:4256
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'tap': %s.\n"
-msgstr "Fel: ”stp”: %s.\n"
+msgstr "Fel: ”tap”: %s.\n"
 
 #. Ask for optional 'vxlan' arguments.
 #: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
 #: ../libnm/nm-device.c:1826
 msgid "VXLAN"
-msgstr ""
+msgstr "VXLAN"
 
 #: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
-#, fuzzy
 msgid "Parent device [none]: "
-msgstr "Överordnat gränssnitt [none]: "
+msgstr "Överordnad enhet [ingen]: "
 
 #: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
-msgstr "Fel: ”dev”: ”%s” är varken UUID, gränssnittsnamn eller MAC."
+msgstr "Fel: ”dev”: ”%s” är varken UUID eller gränssnittsnamn.\n"
 
 #: ../clients/cli/connections.c:4291
-#, fuzzy
 msgid "Local address [none]: "
-msgstr "DHCP-anycast MAC-adress [none]: "
+msgstr "Lokal adress [ingen]: "
 
 #: ../clients/cli/connections.c:4296
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'local': '%s' is not a valid IP address.\n"
-msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress."
+msgstr "Fel: ”local”: ”%s” är inte en giltig IP-adress.\n"
 
 #: ../clients/cli/connections.c:4305
 msgid "Minimum source port [0]: "
-msgstr ""
+msgstr "Lägsta källport [0]: "
 
 #: ../clients/cli/connections.c:4309
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
-msgstr "Fel: ”priority”:  ”%s” är inte ett giltigt nummer <0-%d>.\n"
+msgstr "Fel: ”source-port-min”:  ”%s” är inte ett giltigt nummer <0-65535>.\n"
 
 #: ../clients/cli/connections.c:4318
 msgid "Maximum source port [0]: "
-msgstr ""
+msgstr "Högsta källport [0]: "
 
 #: ../clients/cli/connections.c:4322
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
-msgstr "Fel: ”priority”:  ”%s” är inte ett giltigt nummer <0-%d>.\n"
+msgstr "Fel: ”source-port-max”:  ”%s” är inte ett giltigt nummer <0-65535>.\n"
 
 #: ../clients/cli/connections.c:4331
-#, fuzzy
 msgid "Destination port [8472]: "
-msgstr "Destination"
+msgstr "Destinationsport [8472]: "
 
 #: ../clients/cli/connections.c:4335
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
-msgstr "Fel: ”miimon” :  ”%s” är inte ett giltigt nummer <0-%u>.\n"
+msgstr ""
+"Fel: ”destination-port” :  ”%s” är inte ett giltigt nummer <0-65535>.\n"
 
 #: ../clients/cli/connections.c:4374
 msgid "IPv4 address (IP[/plen]) [none]: "
-msgstr "IPv4-adress (IP[/plen]) [none]: "
+msgstr "IPv4-adress (IP[/plen]) [ingen]: "
 
 #: ../clients/cli/connections.c:4376
 msgid "IPv6 address (IP[/plen]) [none]: "
-msgstr "IPv6-adress (IP[/plen]) [none]: "
+msgstr "IPv6-adress (IP[/plen]) [ingen]: "
 
 #: ../clients/cli/connections.c:4390
 #, c-format
@@ -2312,11 +2374,11 @@ msgstr "Fel: "
 
 #: ../clients/cli/connections.c:4416
 msgid "IPv4 gateway [none]: "
-msgstr "IPv4-gateway [none]: "
+msgstr "IPv4-gateway [ingen]: "
 
 #: ../clients/cli/connections.c:4419
 msgid "IPv6 gateway [none]: "
-msgstr "IPv6-gateway [none]: "
+msgstr "IPv6-gateway [ingen]: "
 
 #: ../clients/cli/connections.c:4439
 #, c-format
@@ -2338,62 +2400,59 @@ msgstr "Tryck <Retur> för att sluta lägga till adresser.\n"
 #: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
 #: ../libnm/nm-device.c:1830
 msgid "Tun"
-msgstr ""
+msgstr "Tun"
 
 #: ../clients/cli/connections.c:4509
-#, fuzzy
 msgid "User ID [none]: "
-msgstr "Användarnamn [none]: "
+msgstr "Användar-ID [inget]: "
 
 #: ../clients/cli/connections.c:4522
-#, fuzzy
 msgid "Group ID [none]: "
-msgstr "MAC [none]: "
+msgstr "Grupp-ID [inget]: "
 
 #: ../clients/cli/connections.c:4536
-#, fuzzy, c-format
+#, c-format
 msgid "Enable PI %s"
-msgstr "Aktivera STP %s"
+msgstr "Aktivera PI %s"
 
 #: ../clients/cli/connections.c:4541
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'pi': %s.\n"
-msgstr "Fel: ”stp”: %s.\n"
+msgstr "Fel: ”pi”: %s.\n"
 
 #: ../clients/cli/connections.c:4549
-#, fuzzy, c-format
+#, c-format
 msgid "Enable VNET header %s"
-msgstr "Aktivera STP %s"
+msgstr "Aktivera VNET-huvud %s"
 
 #: ../clients/cli/connections.c:4554
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'vnet-hdr': %s.\n"
-msgstr "Fel: ”stp”: %s.\n"
+msgstr "Fel: ”vnet-hdr”: %s.\n"
 
 #: ../clients/cli/connections.c:4562
 #, c-format
 msgid "Enable multi queue %s"
-msgstr ""
+msgstr "Aktivera multikö %s"
 
 #: ../clients/cli/connections.c:4567
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'multi-queue': %s.\n"
-msgstr "Fel: ”mode”: %s."
+msgstr "Fel: ”multi-queue”: %s.\n"
 
 #. Ask for optional 'ip-tunnel' arguments.
 #: ../clients/cli/connections.c:4581
 msgid "IP Tunnel"
-msgstr ""
+msgstr "IP-tunnel"
 
 #: ../clients/cli/connections.c:4586
-#, fuzzy
 msgid "Local endpoint [none]: "
-msgstr "Överordnat gränssnitt [none]: "
+msgstr "Lokal ändpunkt [ingen]: "
 
 #: ../clients/cli/connections.c:4592
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
-msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress."
+msgstr "Fel: ”local”: ”%s” är inte giltig, måste vara en IP-adress\n"
 
 #: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
 #, c-format
@@ -2440,7 +2499,7 @@ msgstr "Fel: misslyckades att ta bort ett värde från %s.%s: %s."
 msgid ""
 "Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
 msgstr ""
-"Varning: ”type”-ignoreras. Använd 'nmcli connection add \"%s\"...' istället."
+"Varning: ”type” ignoreras. Använd ”nmcli connection add \"%s\"…” istället."
 
 #: ../clients/cli/connections.c:4783
 msgid "Error: redundant 'master' option."
@@ -2509,18 +2568,17 @@ msgid "Error: 'dev' is required."
 msgstr "Fel: ”dev” krävs."
 
 #: ../clients/cli/connections.c:5355
-#, fuzzy
 msgid "VLAN ID <0-4094>: "
-msgstr "VLAN ID <0-4095>: "
+msgstr "VLAN-ID <0-4094>: "
 
 #: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
 msgid "Error: 'id' is required."
 msgstr "Fel: ”id” krävs."
 
 #: ../clients/cli/connections.c:5364
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-4094>."
-msgstr "Fel: ”id”: ”%s” är inte giltigt: använd <0-4095>."
+msgstr "Fel: ”id”: ”%s” är inte giltigt: använd <0-4094>."
 
 #: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
 #, c-format
@@ -2580,109 +2638,103 @@ msgid "Error: 'protocol' is required."
 msgstr "Fel: ”protocol” krävs."
 
 #: ../clients/cli/connections.c:6105
-#, fuzzy
 msgid "MACVLAN parent device or connection UUID: "
-msgstr "Överordnad VLAN-enhet eller anslutnings-UUID: "
+msgstr "Överordnad MACVLAN-enhet eller anslutnings-UUID: "
 
 #: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
 #: ../clients/cli/connections.c:6307
-#, fuzzy
 msgid "Error: 'mode' is required."
-msgstr "Fel: ”dev” krävs."
+msgstr "Fel: ”mode” krävs."
 
 #: ../clients/cli/connections.c:6131
-#, fuzzy
 msgid "Error: 'mode' is not valid."
-msgstr "Fel: ”dev”-kommandot ”%s” är inte giltigt."
+msgstr "Fel: ”mode” är inte giltigt."
 
 #: ../clients/cli/connections.c:6144
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'tap': %s."
-msgstr "Fel: ”stp”: %s."
+msgstr "Fel: ”tap”: %s."
 
 #: ../clients/cli/connections.c:6230
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'pi': %s."
-msgstr "Fel: ”stp”: %s."
+msgstr "Fel: ”pi”: %s."
 
 #: ../clients/cli/connections.c:6241
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'vnet-hdr': %s."
-msgstr "Fel: ”save”: %s."
+msgstr "Fel: ”vnet-hdr”: %s."
 
 #: ../clients/cli/connections.c:6252
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'multi-queue': %s."
-msgstr "Fel: ”mode”: %s."
+msgstr "Fel: ”multi-queue”: %s."
 
 #: ../clients/cli/connections.c:6321
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'mode': '%s' is not valid, use one of %s"
-msgstr "Fel: ”%s”: ”%s” är inte en giltig %s %s."
+msgstr "Fel: ”mode”: ”%s” är inte giltigt, använd ett av %s"
 
 #: ../clients/cli/connections.c:6327
 msgid "Remote endpoint: "
-msgstr ""
+msgstr "Fjärrändpunkt: "
 
 #: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
-#, fuzzy
 msgid "Error: 'remote' is required."
-msgstr "Fel: ”master” krävs."
+msgstr "Fel: ”remote” krävs."
 
 #: ../clients/cli/connections.c:6337
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'remote': '%s' is not valid; must be an IP address"
-msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress."
+msgstr "Fel: ”remote”: ”%s” är inte giltig, måste vara en IP-adress"
 
 #: ../clients/cli/connections.c:6351
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'local': '%s' is not valid; must be an IP address"
-msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress."
+msgstr "Fel: ”local”: ”%s” är inte giltig, måste vara en IP-adress"
 
 #: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'dev': '%s' is neither UUID nor interface name."
-msgstr "Fel: ”dev”: ”%s” är varken UUID, gränssnittsnamn eller MAC."
+msgstr "Fel: ”dev”: ”%s” är varken UUID eller gränssnittsnamn."
 
 #: ../clients/cli/connections.c:6421
-#, fuzzy
 msgid "VXLAN ID: "
-msgstr "VLAN ID <0-4095>: "
+msgstr "VXLAN-ID: "
 
 #: ../clients/cli/connections.c:6429
-#, fuzzy
 msgid "Remote: "
-msgstr "Ta bort"
+msgstr "Fjärr: "
 
 #: ../clients/cli/connections.c:6438
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
-msgstr "Fel: ”id”: ”%s” är inte giltigt: använd <0-4095>."
+msgstr "Fel: ”id”: ”%s” är inte giltigt: använd <0-16777215>."
 
 #: ../clients/cli/connections.c:6464
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'remote': '%s' is not a valid IP address"
-msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress."
+msgstr "Fel: ”remote”: ”%s” är inte en giltig IP-adress"
 
 #: ../clients/cli/connections.c:6473
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'local': '%s' is not a valid IP address"
-msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress."
+msgstr "Fel: ”local”: ”%s” är inte en giltig IP-adress"
 
 #: ../clients/cli/connections.c:6482
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
-msgstr "Fel: ”id”: ”%s” är inte giltigt: använd <0-4095>."
+msgstr "Fel: ”source-port-min”: %s är inte giltig; använd <0-65535>."
 
 #: ../clients/cli/connections.c:6491
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
-msgstr "Fel: ”flags”: ”%s” är inte giltig; använd <0-7>."
+msgstr "Fel: ”source-port-max”: %s är inte giltig; använd <0-65535>."
 
 #: ../clients/cli/connections.c:6500
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
-msgstr "Fel: ”id”: ”%s” är inte giltigt: använd <0-4095>."
+msgstr "Fel: ”destination-port”: %s är inte giltig: använd <0-65535>."
 
 #: ../clients/cli/connections.c:6540
 #, c-format
@@ -2916,7 +2968,7 @@ msgstr ""
 "Verifierar huruvida inställningen eller anslutningen är giltig och kan "
 "sparas senare.\n"
 "Indikerar ogiltiga värden vid fel. En del fel kan fixas automatiskt\n"
-"genom alternativet ”fix”.\n"
+"genom flaggan ”fix”.\n"
 "\n"
 "Exempel: nmcli> verify\n"
 "         nmcli> verify fix\n"
@@ -2940,7 +2992,7 @@ msgstr ""
 "save [persistent|temporary]  :: spara anslutningen\n"
 "\n"
 "Skickar anslutningsprofilen till Nätverkshanteraren som kommer att antingen\n"
-"spara den, eller behålla den i minnet.”save” utan argument\n"
+"spara den, eller behålla den i minnet. ”save” utan argument\n"
 "betyder ”save persistent”.\n"
 "Observera att när du väl har sparat profilen så sparas inställningarna\n"
 "över omstart. Efterföljande ändringar kan också vara temporära eller\n"
@@ -2964,7 +3016,7 @@ msgstr ""
 "\n"
 "Aktiverar anslutningen\n"
 "\n"
-"Tillgängliga alternativ:\n"
+"Tillgängliga flaggor:\n"
 "<grnamn>    - den enhet anslutningen kommer att aktiveras på\n"
 "/<ap>|<nsp> - AP (Wi-Fi) eller NSP (WiMAX) (lägg till / i början när "
 "<grnamn> inte anges)\n"
@@ -3002,13 +3054,13 @@ msgid ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 msgstr ""
-"nmcli [<konf-flagga> <värde>]  :: nmcli configuration\n"
+"nmcli [<konf-flagga> <värde>]  :: nmcli-konfiguration\n"
 "\n"
 "Konfigurerar nmcli. Följande flaggor är tillgängliga:\n"
-"status-line yes | no        [default: no]\n"
-"save-confirmation yes | no  [default: yes]\n"
-"show-secrets yes | no       [default: no]\n"
-"prompt-color <0-8>          [default: 0]\n"
+"status-line yes | no        [standard: no]\n"
+"save-confirmation yes | no  [standard: yes]\n"
+"show-secrets yes | no       [standard: no]\n"
+"prompt-color <färg> | <0-8>  [standard: 0]\n"
 "%s\n"
 "Exempel: nmcli> nmcli status-line yes\n"
 "         nmcli> nmcli save-confirmation no\n"
@@ -3121,7 +3173,7 @@ msgid ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 msgstr ""
-"remove [<värde>|<index>|<alternativnamn>]  :: ta bort värdet\n"
+"remove [<värde>|<index>|<flaggnamn>]  :: ta bort värdet\n"
 "\n"
 "Tar bort egenskapsvärdet. För enskilda egenskapsvärden sätter denna\n"
 "egenskapen till dess standardvärde. För värden av behållartyp tar denna "
@@ -3130,8 +3182,7 @@ msgstr ""
 "bort endast\n"
 "ett enskilt objekt eller alternativ. Argumentet är antingen ett värde eller "
 "index för objektet som ska\n"
-"tas bort, eller ett alternativt namn (för egenskaper med namngivna "
-"alternativ).\n"
+"tas bort, eller ett flaggnamn (för egenskaper med namngivna flaggor).\n"
 "\n"
 "Exempel: nmcli ipv4.dns> remove 8.8.8.8\n"
 "          nmcli ipv4.dns> remove 2\n"
@@ -3376,7 +3427,7 @@ msgstr ", inte heller ett giltigt inställningsnamn"
 #: ../clients/cli/connections.c:9469
 #, c-format
 msgid "Invalid verify option: %s\n"
-msgstr "Ogiltigt kontrollalternativ ”%s”\n"
+msgstr "Ogiltigt verify-argument ”%s”\n"
 
 #: ../clients/cli/connections.c:9477
 #, c-format
@@ -3549,7 +3600,7 @@ msgstr ""
 #: ../clients/cli/connections.c:10117
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
-msgstr "Fel: Misslyckades med att ändra konfigurationen: ”%s” %s"
+msgstr "Fel: Misslyckades med att ändra anslutningen ”%s”: %s"
 
 #: ../clients/cli/connections.c:10124
 #, c-format
@@ -3571,22 +3622,21 @@ msgstr "Fel: anslutnings-ID saknas."
 #: ../clients/cli/connections.c:10228
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
-msgstr ""
+msgstr "%s (%s) klonad som %s (%s).\n"
 
 #: ../clients/cli/connections.c:10260
-#, fuzzy
 msgid "New connection name: "
-msgstr "Ny anslutning"
+msgstr "Nytt anslutningsnamn: "
 
 #: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
-#, fuzzy, c-format
+#, c-format
 msgid "Error: <new name> argument is missing."
-msgstr "Fel: %s-argument saknas."
+msgstr "Fel: <nytt namn>-argument saknas."
 
 #: ../clients/cli/connections.c:10287
-#, fuzzy, c-format
+#, c-format
 msgid "Error: unexpected extra argument '%s'."
-msgstr "Fel: Oväntat argument ”%s”"
+msgstr "Fel: oväntat extra argument ”%s”."
 
 #: ../clients/cli/connections.c:10356
 #, c-format
@@ -3615,24 +3665,24 @@ msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "Fel: kan inte ta bort okänd(a) anslutning(ar): %s."
 
 #: ../clients/cli/connections.c:10470
-#, fuzzy, c-format
+#, c-format
 msgid "%s: connection profile changed\n"
-msgstr "Detaljer för anslutningsprofil"
+msgstr "%s: anslutningsprofil ändrad\n"
 
 #: ../clients/cli/connections.c:10496
-#, fuzzy, c-format
+#, c-format
 msgid "%s: connection profile created\n"
-msgstr "Detaljer för anslutningsprofil"
+msgstr "%s: anslutningsprofil skapad\n"
 
 #: ../clients/cli/connections.c:10505
-#, fuzzy, c-format
+#, c-format
 msgid "%s: connection profile removed\n"
-msgstr "anslutningen togs bort"
+msgstr "%s: anslutningsprofil borttagen\n"
 
 #: ../clients/cli/connections.c:10548
-#, fuzzy, c-format
+#, c-format
 msgid "Error: not all connections found."
-msgstr "Fel: hittade inte alla aktiva anslutningar."
+msgstr "Fel: hittade inte alla anslutningar."
 
 #: ../clients/cli/connections.c:10571
 #, c-format
@@ -3650,79 +3700,77 @@ msgid "Could not load file '%s'\n"
 msgstr "Kunde inte läsa in filen: ”%s”\n"
 
 #: ../clients/cli/connections.c:10620
-#, fuzzy
 msgid "File to import: "
-msgstr "Misslyckades med att kryptera: %d."
+msgstr "Fil att importera: "
 
 #: ../clients/cli/connections.c:10655
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "Varning: ”type” redan angiven, ignorerar extra förekomst.\n"
 
 #: ../clients/cli/connections.c:10666
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "Varning: ”file” redan angiven, ignorerar extra förekomst.\n"
 
 #: ../clients/cli/connections.c:10668
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown parameter: %s"
-msgstr "Okänd parameter: %s\n"
+msgstr "Okänd parameter: %s"
 
 #: ../clients/cli/connections.c:10683
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'file' argument is required."
-msgstr "Fel: ”ifname”-argument krävs."
+msgstr "Fel: ”file”-argument krävs."
 
 #: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
-#, fuzzy, c-format
+#, c-format
 msgid "Error: failed to load VPN plugin: %s."
-msgstr "Fel: misslyckades med att läsa in anslutningen: %s."
+msgstr "Fel: misslyckades med att läsa in VPN-insticksmodul: %s."
 
 #: ../clients/cli/connections.c:10699
-#, fuzzy, c-format
+#, c-format
 msgid "Error: failed to import '%s': %s."
-msgstr "Fel: misslyckades med att ändra %s.%s: %s."
+msgstr "Fel: misslyckades med att importera ”%s”: %s."
 
 #: ../clients/cli/connections.c:10745
-#, fuzzy
 msgid "Output file name: "
-msgstr "filnamn"
+msgstr "Utdatafilnamn: "
 
 #: ../clients/cli/connections.c:10769
-#, fuzzy, c-format
+#, c-format
 msgid "Error: unknown extra argument: '%s'."
-msgstr "Fel: ogiltigt extra argument: ”%s”."
+msgstr "Fel: okänt extra argument: ”%s”."
 
 #: ../clients/cli/connections.c:10789
-#, fuzzy, c-format
+#, c-format
 msgid "Error: the connection is not VPN."
-msgstr "Fel: anslutningen är inte giltig: %s\n"
+msgstr "Fel: anslutningen är inte VPN."
 
 #: ../clients/cli/connections.c:10810
-#, fuzzy, c-format
+#, c-format
 msgid "Error: failed to create temporary file %s."
-msgstr "Kunde inte skapa temporära filen: %s"
+msgstr "Fel: misslyckades med att skapa temporära filen %s."
 
 #: ../clients/cli/connections.c:10819
-#, fuzzy, c-format
+#, c-format
 msgid "Error: failed to export '%s': %s."
-msgstr "Fel: misslyckades med att sätta ”%s”-egenskapen: %s\n"
+msgstr "Fel: misslyckades med att exportera ”%s”: %s"
 
 #: ../clients/cli/connections.c:10830
-#, fuzzy, c-format
+#, c-format
 msgid "Error: failed to read temporary file '%s': %s."
-msgstr "Fel: misslyckades med att ta bort värdet ”%s”: %s\n"
+msgstr "Fel: misslyckades med att läsa temporära filen ”%s”: %s."
 
 #: ../clients/cli/connections.c:10976
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
-msgstr "fel sträng ”%s“ för flaggan ”--order”"
+msgstr "fel sträng ”%s” för flaggan ”--order”"
 
 #: ../clients/cli/connections.c:11002
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
-msgstr "fel objekt ”%s“ i flaggan ”--order”"
+msgstr "fel objekt ”%s” i flaggan ”--order”"
 
 #: ../clients/cli/connections.c:11089
 msgid "'--order' argument is missing"
@@ -3731,7 +3779,7 @@ msgstr "”--order”-argumentet saknas"
 #: ../clients/cli/connections.c:11154
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
-msgstr "Fel: ”%s” är inte ett giltigt “connection“-kommando."
+msgstr "Fel: ”%s” är inte ett giltigt ”connection”-kommando."
 
 #. define some prompts
 #: ../clients/cli/devices.c:35
@@ -3870,7 +3918,7 @@ msgstr "BÄRARE"
 #. 1
 #: ../clients/cli/devices.c:112
 msgid "S390-SUBCHANNELS"
-msgstr ""
+msgstr "S390-UNDERKANALER"
 
 #. 0
 #: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
@@ -4078,78 +4126,75 @@ msgstr "ANSLUTNINGAR"
 #. 1
 #: ../clients/cli/devices.c:253
 msgid "CHASSIS-ID"
-msgstr ""
+msgstr "CHASSI-ID"
 
 #. 2
 #: ../clients/cli/devices.c:254
-#, fuzzy
 msgid "PORT-ID"
-msgstr "FYSI-PORT-ID"
+msgstr "PORT-ID"
 
 #. 3
 #: ../clients/cli/devices.c:255
 msgid "PORT-DESCRIPTION"
-msgstr ""
+msgstr "PORTBESKRIVNING"
 
 #. 4
 #: ../clients/cli/devices.c:256
-#, fuzzy
 msgid "SYSTEM-NAME"
-msgstr "ANVÄNDARNAMN"
+msgstr "SYSTEMNAMN"
 
 #. 5
 #: ../clients/cli/devices.c:257
 msgid "SYSTEM-DESCRIPTION"
-msgstr ""
+msgstr "SYSTEMBESKRIVNING"
 
 #. 6
 #: ../clients/cli/devices.c:258
-#, fuzzy
 msgid "SYSTEM-CAPABILITIES"
-msgstr "FÖRMÅGOR"
+msgstr "SYSTEMFÖRMÅGOR"
 
 #. 7
 #: ../clients/cli/devices.c:259
 msgid "IEEE-802-1-PVID"
-msgstr ""
+msgstr "IEEE-802-1-PVID"
 
 #. 8
 #: ../clients/cli/devices.c:260
 msgid "IEEE-802-1-PPVID"
-msgstr ""
+msgstr "IEEE-802-1-PPVID"
 
 #. 9
 #: ../clients/cli/devices.c:261
 msgid "IEEE-802-1-PPVID-FLAGS"
-msgstr ""
+msgstr "IEEE-802-1-PPVID-FLAGGOR"
 
 #. 10
 #: ../clients/cli/devices.c:262
 msgid "IEEE-802-1-VID"
-msgstr ""
+msgstr "IEEE-802-1-VID"
 
 #. 11
 #: ../clients/cli/devices.c:263
 msgid "IEEE-802-1-VLAN-NAME"
-msgstr ""
+msgstr "IEEE-802-1-VLAN-NAMN"
 
 #. 12
 #: ../clients/cli/devices.c:264
 msgid "DESTINATION"
-msgstr ""
+msgstr "DESTINATION"
 
 #. 13
 #: ../clients/cli/devices.c:265
 msgid "CHASSIS-ID-TYPE"
-msgstr ""
+msgstr "CHASSI-ID-TYP"
 
 #. 14
 #: ../clients/cli/devices.c:266
 msgid "PORT-ID-TYPE"
-msgstr ""
+msgstr "PORT-ID-TYP"
 
 #: ../clients/cli/devices.c:283
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
@@ -4189,25 +4234,38 @@ msgid ""
 msgstr ""
 "Användning: nmcli device { KOMMANDO | help }\n"
 "\n"
-"KOMMANDO := { status | show | connect | disconnect | delete | wifi }\n"
+"KOMMANDO := { status | show | connect | reapply | disconnect | delete | "
+"monitor | wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
 "  show [<grnamn>]\n"
 "\n"
+"  set [ifname] <grnamn> [autoconnect yes|no] [managed yes|no]\n"
+"\n"
 "  connect <grnamn>\n"
 "\n"
-"  disconnect <grnamn>\n"
+"  reapply <grnamn> …\n"
+"\n"
+"  disconnect <grnamn> …\n"
+"\n"
+"  delete <grnamn> …\n"
 "\n"
-"  delete <grnamn>\n"
+"  monitor <grnamn> …\n"
 "\n"
 "  wifi [list [ifname <grnamn>] [bssid <BSSID>]]\n"
 "\n"
 "  wifi connect <(B)SSID> [password <lösenord>] [wep-key-type key|phrase] "
 "[ifname <grnamn>]\n"
-"                         [bssid <BSSID>] [name <namn>] [private yes|no]\n"
+"                         [bssid <BSSID>] [name <namn>] [private yes|no] "
+"[hidden yes|no]\n"
+"\n"
+"  wifi hotspot [ifname <grnamn>] [con-name <namn>] [ssid <SSID>] [band a|bg] "
+"[channel <kanal>] [password <lösenord>]\n"
+"\n"
+"  wifi rescan [ifname <grnamn>] [[ssid <SSID att söka av>] …]\n"
 "\n"
-"  wifi rescan [[ifname] <grnamn>]\n"
+"  lldp [list [ifname <grnamn>]]\n"
 "\n"
 
 #: ../clients/cli/devices.c:305
@@ -4274,7 +4332,7 @@ msgid ""
 msgstr ""
 "Användning: nmcli device connect { ARGUMENT | help }\n"
 "\n"
-"ARGUMENT := <ifnamn>\n"
+"ARGUMENT := <grnamn>\n"
 "\n"
 "Anslut enheten.\n"
 "Nätverkshanteraren försöker då att finna en passande anslutning att "
@@ -4284,7 +4342,7 @@ msgstr ""
 "\n"
 
 #: ../clients/cli/devices.c:343
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
@@ -4294,13 +4352,13 @@ msgid ""
 "made since it was last applied.\n"
 "\n"
 msgstr ""
-"Användning: nmcli device disconnect { ARGUMENT | help }\n"
+"Användning: nmcli device reapply { ARGUMENT | help }\n"
 "\n"
-"ARGUMENT := <ifnamn>\n"
+"ARGUMENT := <grnamn> …\n"
 "\n"
-"Koppla från enheter.\n"
-"Kommandot kopplar från enheten och hindrar den från att autoaktivera\n"
-"vidare anslutningar utan användar-/manuellinblandning.\n"
+"Försöker uppdatera enhet med ändringar till den aktuellt aktiva "
+"anslutningen\n"
+"som gjorts sedan den sist tillämpades.\n"
 "\n"
 
 #: ../clients/cli/devices.c:354
@@ -4317,7 +4375,7 @@ msgid ""
 msgstr ""
 "Användning: nmcli device disconnect { ARGUMENT | help }\n"
 "\n"
-"ARGUMENT := <ifnamn>\n"
+"ARGUMENT := <grnamn>\n"
 "\n"
 "Koppla från enheter.\n"
 "Kommandot kopplar från enheten och hindrar den från att autoaktivera\n"
@@ -4360,9 +4418,18 @@ msgid ""
 "Modify device properties.\n"
 "\n"
 msgstr ""
+"Användning: nmcli device set { ARGUMENT | help }\n"
+"\n"
+"ARGUMENT := ENHET { EGENSKAP [ EGENSKAP … ] }\n"
+"ENHET    := [ifname] <grnamn> \n"
+"EGENSKAP  := { autoconnect { yes | no } |\n"
+"             { managed { yes | no }\n"
+"\n"
+"Ändra egenskaper för enhet.\n"
+"\n"
 
 #: ../clients/cli/devices.c:392
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
 "\n"
@@ -4373,16 +4440,18 @@ msgid ""
 "Monitors all devices in case no interface is specified.\n"
 "\n"
 msgstr ""
-"Användning: nmcli device show { ARGUMENT | help }\n"
+"Användning: nmcli device monitor { ARGUMENT | help }\n"
 "\n"
-"ARGUMENT := [<grnamn>]\n"
+"ARGUMENT := [<grnamn>] …\n"
 "\n"
-"Visa enhetsdetaljer.\n"
-"Kommandot listar detaljer för alla enheter eller för en given enhet.\n"
+"Övervaka enhetsaktivitet.\n"
+"Detta kommando skriver ut en rad varje gång de angivna enheterna ändrar "
+"tillstånd.\n"
+"Övervakar alla enheter om inget gränssnitt är angivet.\n"
 "\n"
 
 #: ../clients/cli/devices.c:404
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
@@ -4440,14 +4509,15 @@ msgstr ""
 "\n"
 "ARGUMENT := [list [ifname <grnamn>] [bssid <BSSID>]]\n"
 "\n"
-"Lista över tillgängliga trådlösa accesspunkter. ”ifname” och ”bssid”-"
+"Lista över tillgängliga trådlösa accesspunkter. ”ifname”- och ”bssid”-"
 "flaggorna kan\n"
 "användas för att lista accesspunkter för ett specifikt gränssnitt, eller med "
 "ett specifikt BSSID.\n"
 "\n"
 "ARGUMENT := connect <(B)SSID> [password <lösenord>] [wep-key-type key|"
-"phrase] [ifname <ifnamn>]\n"
-"                    [bssid <BSSID>] [name <namn>] [private yes|no]\n"
+"phrase] [ifname <grnamn>]\n"
+"                    [bssid <BSSID>] [name <namn>] [private yes|no] [hidden "
+"yes|no]\n"
 "\n"
 "Anslut till ett trådlöst nätverk angivet genom SSID eller BSSID. Kommandot "
 "skapar\n"
@@ -4458,21 +4528,39 @@ msgstr ""
 "trådlösa\n"
 "nätverk. Om en anslutning för nätverket redan finns är det bättre att\n"
 "ta fram befintliga profiler enligt: nmcli con up id <namn>. Observera att\n"
-"endast öppna WEP och WPA-PSK-nätverk stöds för tillfället. Det antas också\n"
+"endast öppna WEP- och WPA-PSK-nätverk stöds för tillfället. Det antas också\n"
 "att IP-konfiguration erhålls via DHCP.\n"
 "\n"
-"ARGUMENT := rescan [[ifnamn] <grnamn>]\n"
+"ARGUMENT := wifi hotspot [ifname <grnamn>] [con-name <namn>] [ssid <SSID>]\n"
+"                          [band a|bg] [channel <kanal>] [password "
+"<lösenord>]\n"
+"\n"
+"Skapa en Wi-Fi-surfzon. Använd ”connection down” eller ”device disconnect”\n"
+"för att stoppa surfzonen.\n"
+"Parametrar för surfzonen kan påverkars av de valfria parametrarna:\n"
+"ifname - Wi-Fi-enhet att använda\n"
+"con-name - namn på den skapade anslutningsprofilen för surfzonen\n"
+"ssid - SSID för surfzonen\n"
+"band - Wi-Fi-band att använda\n"
+"channel - Wi-Fi-kanal att använda\n"
+"password - lösenord att använda för surfzonen\n"
 "\n"
-"Begär att Nätverkshanteraren omedelbart söker av efter tillgängliga "
+"\n"
+"ARGUMENT := rescan [[ifname] <grnamn>] [[ssid <SSID att söka>] …]\n"
+"\n"
+"Begär att Nätverkshanteraren omedelbart på nytt söker efter tillgängliga "
 "accesspunkter.\n"
 "Nätverkshanteraren söker av trådlösa nätverk periodiskt, men i några fall\n"
-"kan det vara användbart att söka av manuellt. Observera att detta kommando "
-"inte visar\n"
-"APs, använd ”nmcli device wifi list” för det.\n"
+"kan det vara användbart att söka av manuellt. ”ssid” tillåter avsökning "
+"efter ett specifikt\n"
+"SSID, vilket är praktiskt för accesspunkter med dolda SSID. Flera ”ssid”-"
+"parametrar kan\n"
+"anges.  Observera att detta kommando inte visar\n"
+"accesspunkterna, använd ”nmcli device wifi list” för det.\n"
 "\n"
 
 #: ../clients/cli/devices.c:451
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
@@ -4483,15 +4571,12 @@ msgid ""
 "used to list neighbors for a particular interface.\n"
 "\n"
 msgstr ""
-"Användning: nmcli device wimax { ARGUMENT | help }\n"
-"\n"
-"Utför åtgärder på WiMAX-enheter.\n"
+"Användning: nmcli device lldp { ARGUMENT | help }\n"
 "\n"
-"ARGUMENT := [list [ifname <grnamn>] [nsp <namn>]]\n"
+"ARGUMENT := [list [ifname <grnamn>]]\n"
 "\n"
-"Lista tillgängliga WiMAX NSP:er. Flaggorna ”ifname” och ”nsp” kan användas "
-"för att\n"
-"lista nätverk för ett specifikt gränssnitt, eller med ett specifik NSP.\n"
+"Lista grannenheter som upptäckts genom LLDP. Flaggan ”ifname” kan\n"
+"användas för att lista grannar för ett specifikt gränssnitt.\n"
 "\n"
 
 #: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
@@ -4609,9 +4694,9 @@ msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "Fel: Aktivering av anslutningen misslyckades: (%d) %s.\n"
 
 #: ../clients/cli/devices.c:1517
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
-msgstr "Fel: misslyckades med att sätta värdnamn: %s"
+msgstr "Fel: Misslyckades med att konfigurera en Wi-Fi-surfzon: %s"
 
 #: ../clients/cli/devices.c:1520
 #, c-format
@@ -4619,9 +4704,9 @@ msgid "Error: Failed to add/activate new connection: %s"
 msgstr "Fel: Misslyckades med att lägga till/aktivera ny anslutning: %s"
 
 #: ../clients/cli/devices.c:1530
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
-msgstr "Fel: misslyckades med att sätta värdnamn: %s"
+msgstr "Fel: Misslyckades med att konfigurera en Wi-Fi-surfzon"
 
 #: ../clients/cli/devices.c:1532
 #, c-format
@@ -4634,9 +4719,9 @@ msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr "Anslutningen med UUID ”%s” skapad och aktiverad på enhet ”%s”\n"
 
 #: ../clients/cli/devices.c:1547
-#, fuzzy, c-format
+#, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr "Anslutningen med UUID ”%s” skapad och aktiverad på enhet ”%s”\n"
+msgstr "Surfzon ”%s” aktiverad på enhet ”%s”\n"
 
 #: ../clients/cli/devices.c:1611
 #, c-format
@@ -4670,19 +4755,20 @@ msgid "Device '%s' successfully removed.\n"
 msgstr "Enheten ”%s” togs bort.\n"
 
 #: ../clients/cli/devices.c:1838
-#, fuzzy, c-format
+#, c-format
 msgid "Error: not all connections reapplied."
-msgstr "Fel: alla anslutningar är inte borttagna."
+msgstr "Fel: alla anslutningar har inte uppdaterats."
 
 #: ../clients/cli/devices.c:1839
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
-msgstr "Fel: Borttagning av enheten ”%s” (%s) misslyckades: %s\n"
+msgstr ""
+"Fel: Uppdatering av anslutning till enheten ”%s” (%s) misslyckades: %s\n"
 
 #: ../clients/cli/devices.c:1849
-#, fuzzy, c-format
+#, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "Anslutning aktiverades (aktiv sökväg för D-Bus: %s)\n"
+msgstr "Anslutning uppdaterades till enheten ”%s”.\n"
 
 #: ../clients/cli/devices.c:1912
 #, c-format
@@ -4710,39 +4796,39 @@ msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "Fel: Borttagning av enheten ”%s” (%s) misslyckades: %s\n"
 
 #: ../clients/cli/devices.c:2132
-#, fuzzy, c-format
+#, c-format
 msgid "Error: No property specified."
-msgstr "Fel: Ingen anslutning angiven."
+msgstr "Fel: Ingen egenskap angiven."
 
 #: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
 #, c-format
 msgid "Error: '%s' argument is missing."
-msgstr "Fel: \"%s\"-argument saknas."
+msgstr "Fel: ”%s”-argument saknas."
 
 #: ../clients/cli/devices.c:2149
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'managed': %s."
-msgstr "Fel: ”mode”: %s."
+msgstr "Fel: ”managed”: %s."
 
 #: ../clients/cli/devices.c:2174
-#, fuzzy, c-format
+#, c-format
 msgid "Error: property '%s' is not known."
-msgstr "Fel: ogiltig egenskap ”%s”: %s."
+msgstr "Fel: egenskapen ”%s” är okänd."
 
 #: ../clients/cli/devices.c:2220
-#, fuzzy, c-format
+#, c-format
 msgid "%s: using connection '%s'\n"
-msgstr "Fel: Okänd anslutning: ”%s”\n"
+msgstr "%s: använder anslutningen ”%s”\n"
 
 #: ../clients/cli/devices.c:2246
 #, c-format
 msgid "%s: device created\n"
-msgstr ""
+msgstr "%s: enhet skapad\n"
 
 #: ../clients/cli/devices.c:2253
-#, fuzzy, c-format
+#, c-format
 msgid "%s: device removed\n"
-msgstr "Enheten togs bort"
+msgstr "%s: enhet borttagen\n"
 
 #: ../clients/cli/devices.c:2339
 msgid "Wi-Fi scan list"
@@ -4845,56 +4931,54 @@ msgid "Password: "
 msgstr "Lösenord: "
 
 #: ../clients/cli/devices.c:3034
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not valid WPA PSK"
-msgstr "”%s” inte en giltig PSK"
+msgstr "”%s” inte giltig WPA PSK"
 
 #: ../clients/cli/devices.c:3051
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
-msgstr "”%s”-längden är ogiltig (ska vara 5 eller 6 siffror)"
+msgstr "”%s” är inte en giltig WEP-nyckel (ska vara 5 eller 13 ASCII-tecken)"
 
 #: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Hotspot password: %s\n"
-msgstr ""
+msgstr "Lösenord för surfzon: %s\n"
 
 #: ../clients/cli/devices.c:3125
-#, fuzzy, c-format
+#, c-format
 msgid "Error: ssid is too long."
-msgstr "Fel: ”ssid” krävs."
+msgstr "Fel: ssid är för långt."
 
 #: ../clients/cli/devices.c:3137
-#, fuzzy, c-format
+#, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
-msgstr ""
-"Fel: wep-key-type-argumentvärdet ”%s” är ogiltigt, använd ”key” eller "
-"”phrase”."
+msgstr "Fel: argumentvärdet ”%s” för band är ogiltigt, använd ”a” eller ”bg”."
 
 #: ../clients/cli/devices.c:3161
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Unknown parameter %s."
-msgstr "Okänd parameter: %s\n"
+msgstr "Fel: Okänd parameter %s."
 
 #: ../clients/cli/devices.c:3180
-#, fuzzy, c-format
+#, c-format
 msgid "Error: channel requires band too."
-msgstr "Fel: ”apn” krävs."
+msgstr "Fel: kanal kräver även band."
 
 #: ../clients/cli/devices.c:3186
-#, fuzzy, c-format
+#, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
-msgstr "Fel: ”channel”: ”%s” är inte giltigt; använd <1-13>."
+msgstr "Fel: kanal ”%s” är inte giltig för bandet ”%s”."
 
 #: ../clients/cli/devices.c:3214
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr "Fel: Enheten ”%s” är inte en trådlös enhet."
+msgstr "Fel: Enheten ”%s” stöder varken accesspunkts- eller Ad-Hoc-läge."
 
 #: ../clients/cli/devices.c:3249
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Invalid 'password': %s."
-msgstr "Fel: ogiltig egenskap ”%s”: %s."
+msgstr "Fel: ogiltigt ”password”: %s."
 
 # flaggan "ssid" kan upprepas
 #: ../clients/cli/devices.c:3318
@@ -4905,22 +4989,22 @@ msgstr "Fel: ”%s” kan inte upprepas."
 #: ../clients/cli/devices.c:3399
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
-msgstr "Fel: “device wifi“-kommandot ”%s” är inte giltigt."
+msgstr "Fel: ”device wifi”-kommandot ”%s” är inte giltigt."
 
 #. Main header name
 #: ../clients/cli/devices.c:3425
 msgid "Device LLDP neighbors"
-msgstr ""
+msgstr "LLDP-grannar för enhet"
 
 #: ../clients/cli/devices.c:3528
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'device lldp list': %s"
-msgstr "Fel: ”device status”: %s"
+msgstr "Fel: ”device lldp list”: %s"
 
 #: ../clients/cli/devices.c:3575
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
-msgstr "Fel: “device wifi“-kommandot ”%s” är inte giltigt."
+msgstr "Fel: ”device lldp”-kommandot ”%s” är inte giltigt."
 
 #: ../clients/cli/devices.c:3770
 #, c-format
@@ -5255,6 +5339,11 @@ msgid ""
 "Prints a line whenever a change occurs in NetworkManager\n"
 "\n"
 msgstr ""
+"Användning: nmcli monitor\n"
+"\n"
+"Övervaka ändringar för Nätverkshanteraren.\n"
+"Skriver en rad varje gång en ändring inträffar i Nätverkshanteraren\n"
+"\n"
 
 #: ../clients/cli/general.c:233
 msgid "asleep"
@@ -5407,52 +5496,49 @@ msgid "Error: 'radio' command '%s' is not valid."
 msgstr "Fel: ”radio”-kommandot ”%s” är inte giltigt."
 
 #: ../clients/cli/general.c:914
-#, fuzzy
 msgid "NetworkManager has started"
-msgstr "Status för Nätverkshanteraren"
+msgstr "Nätverkshanteraren har startats"
 
 #: ../clients/cli/general.c:917
-#, fuzzy
 msgid "NetworkManager has stopped"
-msgstr "Status för Nätverkshanteraren"
+msgstr "Nätverkshanteraren har stoppats"
 
 #: ../clients/cli/general.c:931
-#, fuzzy, c-format
+#, c-format
 msgid "Hostname set to '%s'\n"
-msgstr "Värdnamnet sattes till ”%s”"
+msgstr "Värdnamnet sattes till ”%s”\n"
 
 #: ../clients/cli/general.c:946
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is now the primary connection\n"
-msgstr "”%s” är inte en giltig VPN-anslutningsprofil"
+msgstr "”%s” är nu den primära anslutningen\n"
 
 #: ../clients/cli/general.c:948
-#, fuzzy, c-format
+#, c-format
 msgid "There's no primary connection\n"
-msgstr "Gruppanslutning"
+msgstr "Det finns ingen primär anslutning\n"
 
 #: ../clients/cli/general.c:960
-#, fuzzy, c-format
+#, c-format
 msgid "Connectivity is now '%s'\n"
-msgstr "Anslutning"
+msgstr "Anslutbarhet är nu ”%s”\n"
 
 #: ../clients/cli/general.c:973
-#, fuzzy, c-format
+#, c-format
 msgid "Networkmanager is now in the '%s' state\n"
-msgstr "Nätverkshanteraren är inte startad."
+msgstr "Nätverkshanteraren är nu i tillståndet ”%s”\n"
 
 #: ../clients/cli/general.c:984
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
-msgstr "Fel: ”agent”-kommandot ”%s” är inte giltigt."
+msgstr "Fel: ”monitor”-kommandot ”%s” är inte giltigt."
 
 #: ../clients/cli/general.c:998
-#, fuzzy
 msgid "Networkmanager is not running (waiting for it)\n"
-msgstr "Nätverkshanteraren är inte startad."
+msgstr "Nätverkshanteraren är inte startad (väntar på den)\n"
 
 #: ../clients/cli/nmcli.c:83
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -5498,6 +5584,7 @@ msgstr ""
 "  -n[ocheck]                                 kontrollera inte nmcli och "
 "Nätverkshanterarens versioner\n"
 "  -a[sk]                                     fråga efter saknade parametrar\n"
+"  -s[how-secrets]                            tillåt att lösenord visas\n"
 "  -w[ait] <seconds>                          sätt en tidsgräns för åtgärder\n"
 "  -v[ersion]                                 visa programversionen\n"
 "  -h[elp]                                    skriv ut denna hjälp\n"
@@ -5508,7 +5595,8 @@ msgstr ""
 "  r[adio]         Nätverkshanterarens radioväxlar\n"
 "  c[onnection]    Nätverkshanterarens anslutningar\n"
 "  d[evice]        enheter som hanteras av Nätverkshanteraren\n"
-"  a[gent]         hemlig- eller polkitagent för Nätverkshanteraren\n"
+"  a[gent]         hemlig agent eller polkitagent för Nätverkshanteraren\n"
+"  m[onitor]       övervaka ändringar för Nätverkshanteraren\n"
 "\n"
 
 #: ../clients/cli/nmcli.c:143
@@ -5643,9 +5731,8 @@ msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
 #: ../clients/cli/settings.c:836
-#, fuzzy
 msgid "MVRP, "
-msgstr "GVRP, "
+msgstr "MVRP, "
 
 #: ../clients/cli/settings.c:875
 #, c-format
@@ -5727,9 +5814,9 @@ msgid "default"
 msgstr "standard"
 
 #: ../clients/cli/settings.c:1556
-#, fuzzy, c-format
+#, c-format
 msgid "%d (off)"
-msgstr "%d (nej)"
+msgstr "%d (av)"
 
 #: ../clients/cli/settings.c:1770
 #, c-format
@@ -5745,21 +5832,21 @@ msgid "'default' and 'ignore' are incompatible with other flags"
 msgstr "”default” och ”ignore” är inkompatibla med andra flaggor"
 
 #: ../clients/cli/settings.c:1817
-#, fuzzy, c-format
+#, c-format
 msgid "invalid mode '%s', use one of %s"
-msgstr "ogiltigt fält ”%s”; tillåtna fält: %s"
+msgstr "ogiltigt läge ”%s”, använd en av %s"
 
 #: ../clients/cli/settings.c:1899
 #, c-format
 msgid "always"
-msgstr ""
+msgstr "alltid"
 
 #: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
 #: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
 #: ../libnm-core/nm-keyfile-reader.c:573
-#, fuzzy, c-format
+#, c-format
 msgid "invalid option '%s', use one of [%s]"
-msgstr "ogiltigt alternativ ”%s” eller dess värde ”%s”"
+msgstr "ogiltig flagga ”%s”, använd en av [%s]"
 
 #: ../clients/cli/settings.c:2116
 #, c-format
@@ -5841,7 +5928,7 @@ msgstr "ogiltig flagga ”%s”"
 
 #: ../clients/cli/settings.c:2654
 msgid "missing option"
-msgstr "saknat alternativ"
+msgstr "saknad flagga"
 
 #: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
 #: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
@@ -5865,7 +5952,7 @@ msgstr "”%s” är inte en giltig Ethernet MAC"
 #: ../libnm-util/nm-setting-infiniband.c:269
 #, c-format
 msgid "'%s' is not a valid interface name"
-msgstr "'”%s” är inte ett giltigt gränssnittsnamn"
+msgstr "”%s” är inte ett giltigt gränssnittsnamn"
 
 #: ../clients/cli/settings.c:2856
 #, c-format
@@ -5912,12 +5999,12 @@ msgstr ""
 "  [user:]<användarnamn 1>, [user:]<användarnamn 2>,…\n"
 "Objekten kan separeras med komman eller blanksteg.\n"
 "\n"
-"Exempel: Anders Sebastian Göran\n"
+"Exempel: anders maria sebastian\n"
 
 #: ../clients/cli/settings.c:3063
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
-msgstr "”%s” är inte en giltig master; använd ifnamn eller anslutnings-UUID"
+msgstr "”%s” är inte en giltig master; använd grnamn eller anslutnings-UUID"
 
 #: ../clients/cli/settings.c:3107
 #, c-format
@@ -6033,7 +6120,7 @@ msgstr ""
 "file://).\n"
 "  [file://]<filsökväg>\n"
 "Observera att nmcli inte stödjer att ange certifikat som rå blob-data.\n"
-"Exempel: /home/cimrman/cacert.crt\n"
+"Exempel: /home/cimrman/ca-zweite-phase.crt\n"
 
 #: ../clients/cli/settings.c:3476
 #, c-format
@@ -6181,7 +6268,7 @@ msgid ""
 "Example: 192.168.1.5/24, 10.0.0.11/24\n"
 msgstr ""
 "Ange en lista av IPv4-adresser formaterade som:\n"
-"  ip[/prefix], ip[/prefix],...\n"
+"  ip[/prefix], ip[/prefix],…\n"
 "Saknade prefix räknas som prefix av 32.\n"
 "\n"
 "Exempel: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
@@ -6318,8 +6405,8 @@ msgstr ""
 "innehållandes konfigurationen. I det senare fallet läses filen in och "
 "innehållet läggs i denna egenskap.\n"
 "\n"
-"Exempel: set team.config { ”device”: ”team0”, ”runner”: {”name”: "
-"”roundrobin”}, ”ports”: {”eth1”: {}, ”eth2”: {}} }\n"
+"Exempel: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
+"\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
 #: ../clients/cli/settings.c:4602
@@ -6364,7 +6451,7 @@ msgstr "egenskapen innehåller inte MAC-adress ”%s”"
 #: ../clients/cli/settings.c:4799
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
-msgstr "”%s” är ogiltig; Två eller tre strängar ska ges"
+msgstr "”%s” är ogiltig; Två eller tre strängar ska anges"
 
 #: ../clients/cli/settings.c:4813
 msgid ""
@@ -6379,7 +6466,7 @@ msgstr ""
 #: ../clients/cli/settings.c:4835
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr "strängvärdet för ”%s” bör bestå av 1 - 199 tecken"
+msgstr "”%s”-strängvärde ska bestå av 1 - 199 tecken"
 
 #: ../clients/cli/settings.c:4867
 #, c-format
@@ -6403,9 +6490,9 @@ msgid "'%ld' is not a valid channel"
 msgstr "”%ld” är en ogiltig kanal"
 
 #: ../clients/cli/settings.c:5013
-#, fuzzy, c-format
+#, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
-msgstr "ogiltigt alternativ ”%s” eller dess värde ”%s”"
+msgstr "ogiltig flagga ”%s”, använd ”default”, ”never” eller ”always”"
 
 #: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
 #: ../clients/cli/settings.c:5152
@@ -6500,12 +6587,12 @@ msgstr "summan för bandbreddsprocenten måste vara 100%%"
 
 #: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
-msgstr ""
+msgstr "SIM-operatörs-ID måste vara en 5- eller 6-siffrig MCCMNC-kod"
 
 #: ../clients/cli/settings.c:5598
-#, fuzzy, c-format
+#, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
-msgstr "ogiltigt alternativ ”%s” eller dess värde ”%s”"
+msgstr "ogiltig flagga ”%s”, använd ”%s” eller ”%s”"
 
 #: ../clients/cli/settings.c:7644
 msgid "don't know how to get the property value"
@@ -6727,7 +6814,7 @@ msgstr "VPN-lösenord krävs"
 
 #: ../clients/common/nm-vpn-helpers.c:61
 msgid "could not get VPN plugin info"
-msgstr ""
+msgstr "kunde inte hämta VPN-insticksinfo"
 
 #: ../clients/common/nm-vpn-helpers.c:103
 #: ../clients/common/nm-vpn-helpers.c:106
@@ -7101,7 +7188,7 @@ msgstr "TRÅDBUNDET"
 #: ../clients/tui/nmt-page-ethernet.c:77 ../clients/tui/nmt-page-vlan.c:122
 #: ../clients/tui/nmt-page-wifi.c:364
 msgid "Cloned MAC address"
-msgstr "Klonade MAC-adress"
+msgstr "Klonad MAC-adress"
 
 #: ../clients/tui/nmt-page-infiniband.c:47
 msgid "Datagram"
@@ -7727,7 +7814,7 @@ msgstr "Misslyckades med att initiera chifferkontexten för kryptering: %s (%s)"
 #: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
 #, c-format
 msgid "Failed to encrypt the data: %s (%s)"
-msgstr "Misslyckades med att kryptera datat: %s (%s)"
+msgstr "Misslyckades med att kryptera data: %s (%s)"
 
 #: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
@@ -7880,9 +7967,8 @@ msgid "unknown setting name"
 msgstr "okänt inställningsnamn"
 
 #: ../libnm-core/nm-connection.c:306
-#, fuzzy
 msgid "duplicate setting name"
-msgstr "okänt inställningsnamn"
+msgstr "duplicerat inställningsnamn"
 
 #: ../libnm-core/nm-connection.c:873
 msgid "setting not found"
@@ -8318,7 +8404,7 @@ msgstr "”%s”-alternativet är endast giltigt med läget ”%s”"
 #: ../libnm-core/nm-setting-bond.c:687
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
-msgstr ""
+msgstr "”%s” och ”%s” kan inte ha olika värden"
 
 #: ../libnm-core/nm-setting-bond.c:703
 #, c-format
@@ -8459,14 +8545,12 @@ msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "”%s”-längden är ogiltig (ska vara 5 eller 6 siffror)"
 
 #: ../libnm-core/nm-setting-gsm.c:397
-#, fuzzy
 msgid "property is empty or wrong size"
-msgstr "egenskap är tom"
+msgstr "egenskap är tom eller har fel storlek"
 
 #: ../libnm-core/nm-setting-gsm.c:407
-#, fuzzy
 msgid "property must contain only digits"
-msgstr "egenskapen innehåller inte protokollet ”%s”"
+msgstr "egenskap får endast innehålla siffror"
 
 #: ../libnm-core/nm-setting-infiniband.c:217
 #: ../libnm-util/nm-setting-infiniband.c:231
@@ -8526,7 +8610,7 @@ msgstr "Ogiltig IPv4-adressprefix ”%u”"
 #: ../libnm-core/nm-setting-ip-config.c:152
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
-msgstr "Ogiltig IPv6-adressprefix ”%u”"
+msgstr "Ogiltigt IPv6-adressprefix ”%u”"
 
 #: ../libnm-core/nm-setting-ip-config.c:170
 #, c-format
@@ -8546,7 +8630,7 @@ msgstr "%d. IP-adressen är ogiltig"
 #: ../libnm-core/nm-setting-ip-config.c:2210
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
-msgstr "%d. IP-adressen har ”label”-egenskap med ogiltigt typ"
+msgstr "%d. IP-adressen har ”label”-egenskap med ogiltig typ"
 
 #: ../libnm-core/nm-setting-ip-config.c:2219
 #, c-format
@@ -8596,18 +8680,18 @@ msgid "this property is not allowed for '%s=%s'"
 msgstr "denna egenskap är inte tillåten för ”%s=%s”"
 
 #: ../libnm-core/nm-setting-ip4-config.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid FQDN"
-msgstr "”%s” är inte ett giltigt UUID"
+msgstr "”%s” är inte ett giltigt FQDN"
 
 #: ../libnm-core/nm-setting-ip4-config.c:223
 msgid "property cannot be set when dhcp-hostname is also set"
-msgstr ""
+msgstr "egenskap kan inte ställas in då dhcp-hostname också är inställd"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "'%d' is not a valid tunnel mode"
-msgstr "”%d” är inte en giltig kanal"
+msgstr "”%d” är inte ett giltigt tunnelläge"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:330
 #: ../libnm-core/nm-setting-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:647
@@ -8618,23 +8702,24 @@ msgstr "”%s” är varken ett UUID eller ett gränssnittsnamn"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:341
 #: ../libnm-core/nm-setting-ip-tunnel.c:352
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IPv%c address"
-msgstr "”%s” är inte en giltig MAC-adress"
+msgstr "”%s” är inte en giltig IPv%c-adress"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:366
 msgid "tunnel keys can only be specified for GRE tunnels"
-msgstr ""
+msgstr "tunnelnycklar kan endast anges för GRE-tunnlar"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:379
 #: ../libnm-core/nm-setting-ip-tunnel.c:395
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid tunnel key"
-msgstr "”%s” är inte en giltig kanal"
+msgstr "”%s” är inte en giltig tunnelnyckel"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:407
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr ""
+"en fast TTL är endast tillåten då sökvägs-MTU-upptäckt (PMTUD) är aktiverad"
 
 #: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:661
 #: ../libnm-util/nm-setting-vlan.c:580
@@ -8644,7 +8729,7 @@ msgstr "egenskapen är inte angiven och det är inte heller ”%s:%s”"
 
 #: ../libnm-core/nm-setting-macvlan.c:192
 msgid "non promiscuous operation is allowed only in passthru mode"
-msgstr ""
+msgstr "icke-promiskuös operation är tillåten endast i genomströmningsläge"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
 #: ../libnm-core/nm-setting-wireless.c:739
@@ -8672,19 +8757,19 @@ msgid "setting this property requires non-zero '%s' property"
 msgstr "att sätta denna egenskap kräver icke-noll för ”%s”-egenskapen"
 
 #: ../libnm-core/nm-setting-tun.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "'%u': invalid mode"
-msgstr "”%s” är inte ett giltigt Wi-Fi-läge"
+msgstr "”%u”: ogiltigt läge"
 
 #: ../libnm-core/nm-setting-tun.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid user ID"
-msgstr "”%s” är inte ett giltigt UUID"
+msgstr "”%s”: ogiltigt användar-ID"
 
 #: ../libnm-core/nm-setting-tun.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': invalid group ID"
-msgstr "”%s” är inte ett giltigt UUID"
+msgstr "”%s”: ogiltigt grupp-ID"
 
 #: ../libnm-core/nm-setting-vlan.c:636 ../libnm-util/nm-setting-vlan.c:556
 #, c-format
@@ -8694,7 +8779,7 @@ msgstr "”%s”-värde matchar inte ”%s=%s”"
 #: ../libnm-core/nm-setting-vlan.c:672 ../libnm-util/nm-setting-vlan.c:600
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
-msgstr ""
+msgstr "vlan-id måste vara i intervallet 0-4094 men är %u"
 
 #: ../libnm-core/nm-setting-vlan.c:681 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
@@ -8732,19 +8817,19 @@ msgid "secret flags property not found"
 msgstr "hemliga flaggegenskaper hittades inte"
 
 #: ../libnm-core/nm-setting-vxlan.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP address"
-msgstr "”%s” är inte en giltig MAC-adress"
+msgstr "”%s” är inte en giltig IP-adress"
 
 #: ../libnm-core/nm-setting-vxlan.c:388
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP%c address"
-msgstr "”%s” är inte en giltig MAC-adress"
+msgstr "”%s” är inte en giltig IP%c-adress"
 
 #: ../libnm-core/nm-setting-vxlan.c:415
 #, c-format
 msgid "%d is greater than local port max %d"
-msgstr ""
+msgstr "%d är större än lokalt portmaximum %d"
 
 #: ../libnm-core/nm-setting-wired.c:619 ../libnm-util/nm-setting-wired.c:613
 #, c-format
@@ -8810,7 +8895,7 @@ msgstr "”%s” är inte ett giltigt Wi-Fi-läge"
 #: ../libnm-util/nm-setting-wireless.c:797
 #, c-format
 msgid "'%s' is not a valid band"
-msgstr "”%s” är inte en giltig frekvens"
+msgstr "”%s” är inte ett giltigt band"
 
 #: ../libnm-core/nm-setting-wireless.c:768
 #, c-format
@@ -8820,7 +8905,7 @@ msgstr "”%s” kräver en ”%s”-inställning"
 #: ../libnm-core/nm-setting.c:837
 #, c-format
 msgid "duplicate property"
-msgstr ""
+msgstr "duplicerad egenskap"
 
 #: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912
 #, c-format
@@ -8828,19 +8913,19 @@ msgid "can't set property of type '%s' from value of type '%s'"
 msgstr "kan inte sätta egenskap för typen ”%s” från värdet av typen ”%s”"
 
 #: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898
-#, fuzzy, c-format
+#, c-format
 msgid "failed to set property: %s"
-msgstr "Fel: misslyckades med att sätta ”%s”-egenskapen: %s\n"
+msgstr "misslyckades med att sätta egenskap: %s"
 
 #: ../libnm-core/nm-setting.c:926
-#, fuzzy, c-format
+#, c-format
 msgid "can not set property: %s"
-msgstr "inte en hemlig egenskap"
+msgstr "kan inte sätta egenskap: %s"
 
 #: ../libnm-core/nm-setting.c:942
-#, fuzzy, c-format
+#, c-format
 msgid "unknown property"
-msgstr "okänt fel"
+msgstr "okänd egenskap"
 
 #: ../libnm-core/nm-setting.c:1682
 msgid "secret not found"
@@ -8851,49 +8936,49 @@ msgid "secret is not set"
 msgstr "hemlighet inte angiven"
 
 #: ../libnm-core/nm-utils.c:2447
-#, fuzzy, c-format
+#, c-format
 msgid "failed stat file %s: %s"
-msgstr "misslyckades med att läsa lösenordsfilen ”%s”: %s"
+msgstr "stat misslyckades på filen %s: %s"
 
 #: ../libnm-core/nm-utils.c:2456
-#, fuzzy, c-format
+#, c-format
 msgid "not a file (%s)"
-msgstr "Kunde inte läsa in filen: ”%s”\n"
+msgstr "inte en fil (%s)"
 
 #: ../libnm-core/nm-utils.c:2467
-#, fuzzy, c-format
+#, c-format
 msgid "invalid file owner %d for %s"
-msgstr "ogiltigt fält ”%s”; tillåtna fält: %s"
+msgstr "ogiltig filägare %d för %s"
 
 #: ../libnm-core/nm-utils.c:2478
 #, c-format
 msgid "file permissions for %s"
-msgstr ""
+msgstr "filrättigheter för %s"
 
 #: ../libnm-core/nm-utils.c:2488
 #, c-format
 msgid "reject %s"
-msgstr ""
+msgstr "förkasta %s"
 
 #: ../libnm-core/nm-utils.c:2508
-#, fuzzy, c-format
+#, c-format
 msgid "path is not absolute (%s)"
-msgstr "ogiltigt int64-värde (%s)"
+msgstr "sökväg är inte absolut (%s)"
 
 #: ../libnm-core/nm-utils.c:2522
 #, c-format
 msgid "Plugin file does not exist (%s)"
-msgstr ""
+msgstr "Insticksmodulfil existerar inte (%s)"
 
 #: ../libnm-core/nm-utils.c:2530
-#, fuzzy, c-format
+#, c-format
 msgid "Plugin is not a valid file (%s)"
-msgstr "”%s” är inte ett giltigt värde för ”%s”"
+msgstr "Insticksmodul är inte en giltig fil (%s)"
 
 #: ../libnm-core/nm-utils.c:2540
 #, c-format
 msgid "libtool archives are not supported (%s)"
-msgstr ""
+msgstr "libtool-arkiv stöds inte (%s)"
 
 #: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
 #, c-format
@@ -8903,101 +8988,105 @@ msgstr "Kunde inte hitta binären ”%s”"
 #: ../libnm-core/nm-vpn-editor-plugin.c:132
 #, c-format
 msgid "cannot load plugin %s"
-msgstr ""
+msgstr "kan inte läsa in insticksmodulen %s"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:160
 #, c-format
 msgid "cannot load VPN plugin in '%s': missing plugin name"
 msgstr ""
+"kan inte läsa in VPN-insticksmodul i ”%s”: saknar namn på insticksmodul"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:167
 #, c-format
 msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr ""
+msgstr "kan inte läsa in VPN-insticksmodul i ”%s”: ogiltigt namn på tjänst"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:183
 #, c-format
 msgid "unknown error initializing plugin %s"
-msgstr ""
+msgstr "okänt fel vid initiering av insticksmodulen %s"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:195
 #, c-format
 msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
 msgstr ""
+"misslyckades med att läsa in nm_vpn_editor_plugin_factory() från %s (%s)"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:256
 #, c-format
 msgid "the plugin does not support import capability"
-msgstr ""
+msgstr "insticksmodulen stöder inte importförmåga"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:276
 #, c-format
 msgid "the plugin does not support export capability"
-msgstr ""
+msgstr "insticksmodulen stöder inte exportförmåga"
 
 #: ../libnm-core/nm-vpn-plugin-info.c:109
-#, fuzzy, c-format
+#, c-format
 msgid "missing filename"
-msgstr "saknat alternativ"
+msgstr "filnamn saknas"
 
 #: ../libnm-core/nm-vpn-plugin-info.c:117
 #, c-format
 msgid "filename must be an absolute path (%s)"
-msgstr ""
+msgstr "filnamn måste vara en absolut sökväg (%s)"
 
 #: ../libnm-core/nm-vpn-plugin-info.c:126
 #, c-format
 msgid "filename has invalid format (%s)"
-msgstr ""
+msgstr "filnamn har ogiltigt format (%s)"
 
 #: ../libnm-core/nm-vpn-plugin-info.c:383
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr ""
+"det finns en insticksmodul (%s) som står i konflikt och har samma %s.%s-värde"
 
 #: ../libnm-core/nm-vpn-plugin-info.c:421
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
-msgstr ""
+msgstr "det finns en insticksmodul med samma namn (%s) som står i konflikt"
 
 #: ../libnm-core/nm-vpn-plugin-info.c:740
-#, fuzzy, c-format
+#, c-format
 msgid "missing \"plugin\" setting"
-msgstr "saknar inställning"
+msgstr "saknar ”plugin”-inställning"
 
 #: ../libnm-core/nm-vpn-plugin-info.c:750
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr ""
+"%s: försök inte att på nytt läsa in insticksmodul som redan tidigare "
+"misslyckats"
 
 #: ../libnm-core/nm-vpn-plugin-info.c:842
 msgid "missing filename to load VPN plugin info"
-msgstr ""
+msgstr "saknar filnamn för att läsa in VPN-insticksinfo"
 
 #: ../libnm-core/nm-vpn-plugin-info.c:854
 msgid "missing name for VPN plugin info"
-msgstr ""
+msgstr "saknar namn för VPN-insticksinfo"
 
 #: ../libnm-core/nm-vpn-plugin-info.c:863
 msgid "missing service for VPN plugin info"
-msgstr ""
+msgstr "saknar tjänst för VPN-insticksinfo"
 
 #: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
 #: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
-#, fuzzy
 msgid "MACVLAN"
-msgstr "VLAN"
+msgstr "MACVLAN"
 
 #: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
 msgid "IPTunnel"
-msgstr ""
+msgstr "IPTunnel"
 
 #: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
 msgid "Veth"
-msgstr ""
+msgstr "Veth"
 
 #: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
 msgid "Wired"
@@ -9135,7 +9224,7 @@ msgstr "Anslutningen var inte en Ethernet eller PPPoE-anslutning."
 
 #: ../libnm/nm-device-ethernet.c:222
 msgid "The connection and device differ in S390 subchannels."
-msgstr ""
+msgstr "Anslutningen och enheten skiljer sig åt i S390-underkanaler."
 
 #: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102
 #: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326
@@ -9143,19 +9232,18 @@ msgid "Invalid device MAC address."
 msgstr "Ogiltigt MAC-adress för enhet."
 
 #: ../libnm/nm-device-ethernet.c:237
-#, fuzzy
 msgid "The MACs of the device and the connection do not match."
-msgstr "MAC-adresserna för enheten och anslutningen matchade inte."
+msgstr "MAC-adresserna för enheten och anslutningen matchar inte."
 
 #: ../libnm/nm-device-ethernet.c:247
 #, c-format
 msgid "Invalid MAC in the blacklist: %s."
-msgstr ""
+msgstr "Ogiltig MAC i svartlistan: %s."
 
 #: ../libnm/nm-device-ethernet.c:253
-#, fuzzy, c-format
+#, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
-msgstr "Enheten saknar förmågorna som krävs av anslutningen."
+msgstr "Enhetens MAC-adress (%s) är svartlistad av anslutningen."
 
 #: ../libnm/nm-device-generic.c:91
 msgid "The connection was not a generic connection."
@@ -9166,14 +9254,12 @@ msgid "The connection did not specify an interface name."
 msgstr "Anslutningen angav inte ett gränssnittsnamn."
 
 #: ../libnm/nm-device-tun.c:209
-#, fuzzy
 msgid "The connection was not a tun connection."
-msgstr "Anslutningen var inte en gruppanslutning."
+msgstr "Anslutningen var inte en tun-anslutning."
 
 #: ../libnm/nm-device-tun.c:218
-#, fuzzy
 msgid "The mode of the device and the connection didn't match"
-msgstr "MAC-adresserna för enheten och anslutningen matchade inte."
+msgstr "Läget för enheten och anslutningen matchade inte"
 
 #: ../libnm/nm-device-infiniband.c:94
 msgid "The connection was not an InfiniBand connection."
@@ -9185,14 +9271,12 @@ msgid "The MACs of the device and the connection didn't match."
 msgstr "MAC-adresserna för enheten och anslutningen matchade inte."
 
 #: ../libnm/nm-device-ip-tunnel.c:254
-#, fuzzy
 msgid "The connection was not an IP tunnel connection."
-msgstr "Anslutningen var inte en gruppanslutning."
+msgstr "Anslutningen var inte en IP-tunnelanslutning."
 
 #: ../libnm/nm-device-macvlan.c:159
-#, fuzzy
 msgid "The connection was not a MAC-VLAN connection."
-msgstr "Anslutningen var inte en VLAN-anslutning."
+msgstr "Anslutningen var inte en MAC-VLAN-anslutning."
 
 #: ../libnm/nm-device-modem.c:120
 msgid "The connection was not a modem connection."
@@ -9227,14 +9311,12 @@ msgid "The hardware address of the device and the connection didn't match."
 msgstr "Hårdvaruadressen för enheten och anslutningen matchar inte."
 
 #: ../libnm/nm-device-vxlan.c:387
-#, fuzzy
 msgid "The connection was not a VXLAN connection."
-msgstr "Anslutningen var inte en VLAN-anslutning."
+msgstr "Anslutningen var inte en VXLAN-anslutning."
 
 #: ../libnm/nm-device-vxlan.c:394
-#, fuzzy
 msgid "The VXLAN identifiers of the device and the connection didn't match."
-msgstr "VLAN-identifierarna för enheten och anslutningen matchar inte."
+msgstr "VXLAN-identifierarna för enheten och anslutningen matchar inte."
 
 #: ../libnm/nm-device-wifi.c:595
 msgid "The connection was not a Wi-Fi connection."
@@ -9391,42 +9473,45 @@ msgid "System policy prevents modification of the persistent system hostname"
 msgstr "Systemets policy förhindrar ändring av bestående värdnamn för systemet"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
-#, fuzzy
 msgid "Modify persistent global DNS configuration"
-msgstr "Avsluta efter initial konfiguration"
+msgstr "Ändra bestående global DNS-konfiguration"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
-#, fuzzy
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
-msgstr "Systemets policy förhindrar ändring av bestående värdnamn för systemet"
+msgstr ""
+"Systemets policy förhindrar ändring av bestående global DNS-konfiguration"
 
 #: ../shared/nm-shared-utils.c:174
 #, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr ""
+msgstr "objektklassen ”%s” har ingen egenskap med namnet ”%s”"
 
 #: ../shared/nm-shared-utils.c:181
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr ""
+msgstr "egenskapen ”%s” för objektklassen ”%s” är inte skrivbar"
 
 #: ../shared/nm-shared-utils.c:188
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
+"konstruktionsegenskap ”%s” för objektet ”%s” kan inte ställas in efter att "
+"det skapats"
 
 #: ../shared/nm-shared-utils.c:196
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
+"”%s::%s” är inte ett giltigt egenskapsnamn; ”%s” är inte en undertyp till "
+"GObject"
 
 #: ../shared/nm-shared-utils.c:205
-#, fuzzy, c-format
+#, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
-msgstr "kan inte sätta egenskap för typen ”%s” från värdet av typen ”%s”"
+msgstr "kan inte sätta egenskapen ”%s” av typen ”%s” från värdet av typen ”%s”"
 
 #: ../shared/nm-shared-utils.c:216
 #, c-format
@@ -9434,6 +9519,8 @@ msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
+"värdet ”%s” av typ ”%s” är ogiltigt eller utanför intervallet för egenskapen "
+"”%s” av typ ”%s”"
 
 #. Translators: the first %s is a prefix for the connection id, such
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
@@ -9642,28 +9729,24 @@ msgid "InfiniBand connection"
 msgstr "InfiniBand-anslutning"
 
 #: ../src/devices/nm-device-ip-tunnel.c:346
-#, fuzzy
 msgid "IP tunnel connection"
-msgstr "PAN-anslutning"
+msgstr "IP-tunnelanslutning"
 
 #: ../src/devices/nm-device-macvlan.c:428
-#, fuzzy
 msgid "MACVLAN connection"
-msgstr "VLAN-anslutning"
+msgstr "MACVLAN-anslutning"
 
 #: ../src/devices/nm-device-tun.c:129
-#, fuzzy
 msgid "TUN connection"
-msgstr "PAN-anslutning"
+msgstr "TUN-anslutning"
 
 #: ../src/devices/nm-device-vlan.c:447
 msgid "VLAN connection"
 msgstr "VLAN-anslutning"
 
 #: ../src/devices/nm-device-vxlan.c:373
-#, fuzzy
 msgid "VXLAN connection"
-msgstr "VLAN-anslutning"
+msgstr "VXLAN-anslutning"
 
 #: ../src/devices/team/nm-device-team.c:115
 msgid "Team connection"
@@ -9710,7 +9793,7 @@ msgstr ""
 "nyckelhantering"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
 msgstr ""
 "en anslutning som använder ”%s”-autentisering kan inte specificera WPA-"
@@ -9718,14 +9801,14 @@ msgstr ""
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:180
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
 msgstr ""
 "en anslutning som använder ”%s”-autentisering kan inte specificera WPA-"
 "chiffer"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:209
-#, fuzzy, c-format
+#, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
 msgstr ""
 "en anslutning som använder ”%s”-autentisering kan inte specificera ett WPA-"
@@ -9937,13 +10020,12 @@ msgid "barbar"
 msgstr "barbar"
 
 #: ../src/nm-iface-helper.c:289
-#, fuzzy
 msgid "FQDN to send to DHCP server"
-msgstr "Värdnamn att skicka till DHCP-server"
+msgstr "FQDN att skicka till DHCP-server"
 
 #: ../src/nm-iface-helper.c:289
 msgid "host.domain.org"
-msgstr ""
+msgstr "host.domain.org"
 
 #: ../src/nm-iface-helper.c:290
 msgid "Route priority for IPv4"
@@ -9967,7 +10049,7 @@ msgstr "Hexkodad gränssnittsidentifierare"
 
 #: ../src/nm-iface-helper.c:293
 msgid "IPv6 SLAAC address generation mode"
-msgstr ""
+msgstr "SLAAC-adressgenereringsläge för IPv6"
 
 #: ../src/nm-iface-helper.c:294
 msgid ""
@@ -9981,7 +10063,7 @@ msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
 msgstr ""
-"nm-iface-helper är en liten fristående process som hanterar ett "
+"nm-iface-helper är en liten fristående process som hanterar ett enstaka "
 "nätverksgränssnitt."
 
 #: ../src/nm-iface-helper.c:373
@@ -10021,9 +10103,8 @@ msgstr "Nätverkshanteraren behöver stänga av nätverk"
 msgid "System"
 msgstr "System"
 
-#, fuzzy
 #~ msgid "Error: unknown parameter: %s"
-#~ msgstr "Okänd parameter: %s\n"
+#~ msgstr "Fel: okänd parameter: %s"
 
 #~ msgid "yes (%u)"
 #~ msgstr "yes (%u)"
@@ -10054,8 +10135,14 @@ msgstr "System"
 #~ msgid "Error: not all devices valid."
 #~ msgstr "Fel: alla enheter är inte giltiga."
 
-#~ msgid "'%s' not allowed for %s=%s"
-#~ msgstr "”%s” inte tillåtet för %s=%s"
+#~ msgid "Error: Argument missing."
+#~ msgstr "Fel: Argument saknas."
+
+#~ msgid "property is empty'"
+#~ msgstr "egenskap är tom'"
+
+#~ msgid "Bond master: "
+#~ msgstr "Master för kombinering: "
 
 #~ msgid "Team master: "
 #~ msgstr "Master för grupp: "
@@ -10070,21 +10157,6 @@ msgstr "System"
 #~ "Varning: ”type” ignoreras för närvarande. Vi stöder bara trådbundna "
 #~ "slavar för tillfället.\n"
 
-#~ msgid "/path/to/state.file"
-#~ msgstr "/sökväg/till/tillstånds.fil"
-
-#~ msgid "/path/to/config.file"
-#~ msgstr "/sökväg/till/konfigurations.fil"
-
-#~ msgid "/path/to/config/dir"
-#~ msgstr "/sökväg/till/konfiguration/katalog"
-
-#~ msgid "plugin1,plugin2"
-#~ msgstr "insticksmodul1,insticksmodul2"
-
-#~ msgid "Bingo!"
-#~ msgstr "Bingo!"
-
 #~ msgid "Error: bad color number: '%s'; use <0-8>\n"
 #~ msgstr "Fel: dåligt färgnummer: ”%s”; använd <0-8>\n"
 
@@ -10097,9 +10169,6 @@ msgstr "System"
 #~ msgid "Roaming"
 #~ msgstr "Roaming"
 
-#~ msgid "Device '%s' has been disconnected.\n"
-#~ msgstr "Enheten ”%s” kopplades från.\n"
-
 #~ msgid "WiMAX NSP list"
 #~ msgstr "WiMAX NSP-lista"
 
@@ -10136,9 +10205,6 @@ msgstr "System"
 #~ msgid "WiMAX radio switch"
 #~ msgstr "WiMAX radioväxel"
 
-#~ msgid "'%s' is ambiguous (on x off)"
-#~ msgstr "”%s” är dubbeltydig (på x av)"
-
 #~ msgid "Failed to set symmetric key for decryption: %s / %s."
 #~ msgstr ""
 #~ "Misslyckades med att ställa in symmetrisk nyckel för dekryptering: %s / "
@@ -10154,6 +10220,30 @@ msgstr "System"
 #~ msgid "Failed to set IV for encryption: %s / %s."
 #~ msgstr "Misslyckades med att ställa in IV för kryptering: %s / %s."
 
+#~ msgid "'%s' not allowed for %s=%s"
+#~ msgstr "”%s” inte tillåtet för %s=%s"
+
+#~ msgid "/path/to/state.file"
+#~ msgstr "/sökväg/till/tillstånds.fil"
+
+#~ msgid "/path/to/config.file"
+#~ msgstr "/sökväg/till/konfigurations.fil"
+
+#~ msgid "/path/to/config/dir"
+#~ msgstr "/sökväg/till/konfiguration/katalog"
+
+#~ msgid "plugin1,plugin2"
+#~ msgstr "insticksmodul1,insticksmodul2"
+
+#~ msgid "Bingo!"
+#~ msgstr "Bingo!"
+
+#~ msgid "Device '%s' has been disconnected.\n"
+#~ msgstr "Enheten ”%s” kopplades från.\n"
+
+#~ msgid "'%s' is ambiguous (on x off)"
+#~ msgstr "”%s” är dubbeltydig (på x av)"
+
 #~ msgid "Slave connections need a valid '"
 #~ msgstr "Slavanslutningar behöver en giltig ”"
 
diff --git a/po/te.po b/po/te.po
index 46f2588e..0baa4ea4 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1831,7 +1831,7 @@ msgstr "దోషం: '%s': '%s' చెల్లునది కాదు; <%u-%
 
 #. Ask for optional arguments.
 #: ../clients/cli/connections.c:3497
-#, c-format
+#, fuzzy, c-format
 msgid "There is %d optional argument for '%s' connection type.\n"
 msgid_plural "There are %d optional arguments for '%s' connection type.\n"
 msgstr[0] "'%s' అనుసంధాన రకం కొరకు %d ఐచ్చిక ఆర్గుమెంట్ ఉంది.\n"
diff --git a/shared/nm-shared-utils.c b/shared/nm-shared-utils.c
index 0ae54bdc..932b7432 100644
--- a/shared/nm-shared-utils.c
+++ b/shared/nm-shared-utils.c
@@ -102,6 +102,40 @@ _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 ma
 
 /*****************************************************************************/
 
+gint
+_nm_utils_ascii_str_to_bool (const char *str,
+                             gint default_value)
+{
+	gsize len;
+	char *s = NULL;
+
+	if (!str)
+		return default_value;
+
+	while (str[0] && g_ascii_isspace (str[0]))
+		str++;
+
+	if (!str[0])
+		return default_value;
+
+	len = strlen (str);
+	if (g_ascii_isspace (str[len - 1])) {
+		s = g_strdup (str);
+		g_strchomp (s);
+		str = s;
+	}
+
+	if (!g_ascii_strcasecmp (str, "true") || !g_ascii_strcasecmp (str, "yes") || !g_ascii_strcasecmp (str, "on") || !g_ascii_strcasecmp (str, "1"))
+		default_value = TRUE;
+	else if (!g_ascii_strcasecmp (str, "false") || !g_ascii_strcasecmp (str, "no") || !g_ascii_strcasecmp (str, "off") || !g_ascii_strcasecmp (str, "0"))
+		default_value = FALSE;
+	if (s)
+		g_free (s);
+	return default_value;
+}
+
+/*****************************************************************************/
+
 G_DEFINE_QUARK (nm-utils-error-quark, nm_utils_error)
 
 void
diff --git a/shared/nm-shared-utils.h b/shared/nm-shared-utils.h
index f80c850c..cfa8f994 100644
--- a/shared/nm-shared-utils.h
+++ b/shared/nm-shared-utils.h
@@ -26,6 +26,9 @@
 
 gint64 _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 max, gint64 fallback);
 
+gint _nm_utils_ascii_str_to_bool (const char *str,
+                                  gint default_value);
+
 /******************************************************************************/
 
 /**
diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h
index b96b6c87..be94ce76 100644
--- a/shared/nm-version-macros.h
+++ b/shared/nm-version-macros.h
@@ -37,7 +37,7 @@
  * Evaluates to the minor version number of NetworkManager which this source
  * is compiled against.
  */
-#define NM_MINOR_VERSION (1)
+#define NM_MINOR_VERSION (2)
 
 /**
  * NM_MICRO_VERSION:
@@ -45,7 +45,7 @@
  * Evaluates to the micro version number of NetworkManager which this source
  * compiled against.
  */
-#define NM_MICRO_VERSION (94)
+#define NM_MICRO_VERSION (0)
 
 /**
  * NM_CHECK_VERSION:
diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c
index 9dfa9bcb..482eb185 100644
--- a/src/devices/nm-device-factory.c
+++ b/src/devices/nm-device-factory.c
@@ -187,10 +187,9 @@ nm_device_factory_get_connection_iface (NMDeviceFactory *factory,
 
 	klass = NM_DEVICE_FACTORY_GET_INTERFACE (factory);
 
-	if (klass->get_connection_iface)
+	ifname = g_strdup (nm_connection_get_interface_name (connection));
+	if (!ifname && klass->get_connection_iface)
 		ifname = klass->get_connection_iface (factory, connection, parent_iface);
-	else
-		ifname = g_strdup (nm_connection_get_interface_name (connection));
 
 	if (!ifname) {
 		g_set_error (error,
diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c
index a27af314..ae9543e4 100644
--- a/src/devices/nm-device-infiniband.c
+++ b/src/devices/nm-device-infiniband.c
@@ -42,6 +42,7 @@ G_DEFINE_TYPE (NMDeviceInfiniband, nm_device_infiniband, NM_TYPE_DEVICE)
 
 typedef struct {
 	gboolean is_partition;
+	int parent_ifindex, p_key;
 } NMDeviceInfinibandPrivate;
 
 enum {
@@ -235,36 +236,43 @@ create_and_realize (NMDevice *device,
                     const NMPlatformLink **out_plink,
                     GError **error)
 {
+	NMDeviceInfinibandPrivate *priv = NM_DEVICE_INFINIBAND_GET_PRIVATE (device);
 	NMSettingInfiniband *s_infiniband;
-	int parent_ifindex, p_key;
 	NMPlatformError plerr;
 
-	if (!NM_IS_DEVICE_INFINIBAND (parent)) {
-		g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED,
-		             "Parent interface %s must be an InfiniBand interface",
-		             nm_device_get_iface (parent));
-		return FALSE;
-	}
-
 	s_infiniband = nm_connection_get_setting_infiniband (connection);
+	g_assert (s_infiniband);
 
 	/* Can only create partitions at this time */
-	p_key = nm_setting_infiniband_get_p_key (s_infiniband);
-	if (p_key < 0) {
-		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED,
+	priv->p_key = nm_setting_infiniband_get_p_key (s_infiniband);
+	if (priv->p_key < 0) {
+		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
 		                     "only InfiniBand partitions can be created");
 		return FALSE;
 	}
 
-	parent_ifindex = nm_device_get_ifindex (parent);
-	if (parent_ifindex <= 0) {
-		g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED,
+	if (!parent) {
+		g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
+		             "InfiniBand partitions can not be created without a parent interface");
+		return FALSE;
+	}
+
+	if (!NM_IS_DEVICE_INFINIBAND (parent)) {
+		g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
+		             "Parent interface %s must be an InfiniBand interface",
+		             nm_device_get_iface (parent));
+		return FALSE;
+	}
+
+	priv->parent_ifindex = nm_device_get_ifindex (parent);
+	if (priv->parent_ifindex <= 0) {
+		g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
 		             "failed to get InfiniBand parent %s ifindex",
 		             nm_device_get_iface (parent));
 		return FALSE;
 	}
 
-	plerr = nm_platform_link_infiniband_add (NM_PLATFORM_GET, parent_ifindex, p_key, out_plink);
+	plerr = nm_platform_link_infiniband_add (NM_PLATFORM_GET, priv->parent_ifindex, priv->p_key, out_plink);
 	if (plerr != NM_PLATFORM_ERROR_SUCCESS) {
 		g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED,
 		             "Failed to create InfiniBand P_Key interface '%s' for '%s': %s",
@@ -274,7 +282,33 @@ create_and_realize (NMDevice *device,
 		return FALSE;
 	}
 
-	NM_DEVICE_INFINIBAND_GET_PRIVATE (device)->is_partition = TRUE;
+	priv->is_partition = TRUE;
+	return TRUE;
+}
+
+static gboolean
+unrealize (NMDevice *device, GError **error)
+{
+	NMDeviceInfinibandPrivate *priv = NM_DEVICE_INFINIBAND_GET_PRIVATE (device);
+	NMPlatformError plerr;
+
+	g_return_val_if_fail (NM_IS_DEVICE_INFINIBAND (device), FALSE);
+
+	if (priv->p_key < 0) {
+		g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
+		             "Only InfiniBand partitions can be removed");
+		return FALSE;
+	}
+
+	plerr = nm_platform_link_infiniband_delete (NM_PLATFORM_GET, priv->parent_ifindex, priv->p_key);
+	if (plerr != NM_PLATFORM_ERROR_SUCCESS) {
+		g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED,
+		             "Failed to remove InfiniBand P_Key interface '%s': %s",
+		             nm_device_get_iface (device),
+		             nm_platform_error_to_string (plerr));
+		return FALSE;
+	}
+
 	return TRUE;
 }
 
@@ -328,6 +362,7 @@ nm_device_infiniband_class_init (NMDeviceInfinibandClass *klass)
 	object_class->set_property = set_property;
 
 	parent_class->create_and_realize = create_and_realize;
+	parent_class->unrealize = unrealize;
 	parent_class->get_generic_capabilities = get_generic_capabilities;
 	parent_class->check_connection_compatible = check_connection_compatible;
 	parent_class->complete_connection = complete_connection;
diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c
index cd02cb8e..c431fe89 100644
--- a/src/devices/nm-device-macvlan.c
+++ b/src/devices/nm-device-macvlan.c
@@ -223,12 +223,19 @@ create_and_realize (NMDevice *device,
 	s_macvlan = nm_connection_get_setting_macvlan (connection);
 	g_assert (s_macvlan);
 
+	if (!parent) {
+		g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
+		             "MACVLAN devices can not be created without a parent interface");
+		return FALSE;
+	}
+
 	parent_ifindex = nm_device_get_ifindex (parent);
 	g_warn_if_fail (parent_ifindex > 0);
 
 	lnk.mode = setting_mode_to_platform (nm_setting_macvlan_get_mode (s_macvlan));
 	if (!lnk.mode) {
-		nm_log_info (LOGD_DEVICE, "unsupported MACVLAN mode %u in connection %s",
+		g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
+		             "unsupported MACVLAN mode %u in connection %s",
 		             nm_setting_macvlan_get_mode (s_macvlan),
 		             nm_connection_get_uuid (connection));
 		return FALSE;
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c
index 4d606e9d..eb6527de 100644
--- a/src/devices/nm-device-vlan.c
+++ b/src/devices/nm-device-vlan.c
@@ -80,14 +80,14 @@ parent_state_changed (NMDevice *parent,
 }
 
 static void
-parent_hwaddr_changed (NMDevice *parent,
-                       GParamSpec *pspec,
-                       gpointer user_data)
+parent_hwaddr_maybe_changed (NMDevice *parent,
+                             GParamSpec *pspec,
+                             gpointer user_data)
 {
 	NMDeviceVlan *self = NM_DEVICE_VLAN (user_data);
 	NMConnection *connection;
 	NMSettingWired *s_wired;
-	const char *cloned_mac = NULL, *new_mac;
+	const char *new_mac, *old_mac;
 	NMSettingIPConfig *s_ip6;
 
 	/* Never touch assumed devices */
@@ -100,23 +100,26 @@ parent_hwaddr_changed (NMDevice *parent,
 
 	/* Update the VLAN MAC only if configuration does not specify one */
 	s_wired = nm_connection_get_setting_wired (connection);
-	if (s_wired)
-		cloned_mac = nm_setting_wired_get_cloned_mac_address (s_wired);
+	if (s_wired) {
+		if (nm_setting_wired_get_cloned_mac_address (s_wired))
+			return;
+	}
 
-	if (!cloned_mac) {
-		new_mac = nm_device_get_hw_address (parent);
-		_LOGD (LOGD_VLAN, "parent hardware address changed to %s%s%s",
-		       NM_PRINT_FMT_QUOTE_STRING (new_mac));
-		if (new_mac) {
-			nm_device_set_hw_addr (self, nm_device_get_hw_address (parent),
-			                       "set", LOGD_VLAN);
-			/* When changing the hw address the interface is taken down,
-			 * removing the IPv6 configuration; reapply it.
-			 */
-			s_ip6 = nm_connection_get_setting_ip6_config (connection);
-			if (s_ip6)
-				nm_device_reactivate_ip6_config (NM_DEVICE (self), s_ip6, s_ip6);
-		}
+	old_mac = nm_device_get_hw_address (self);
+	new_mac = nm_device_get_hw_address (parent);
+	if (nm_streq0 (old_mac, new_mac))
+		return;
+
+	_LOGD (LOGD_VLAN, "parent hardware address changed to %s%s%s",
+	       NM_PRINT_FMT_QUOTE_STRING (new_mac));
+	if (new_mac) {
+		nm_device_set_hw_addr (self, new_mac, "set", LOGD_VLAN);
+		/* When changing the hw address the interface is taken down,
+		 * removing the IPv6 configuration; reapply it.
+		 */
+		s_ip6 = nm_connection_get_setting_ip6_config (connection);
+		if (s_ip6)
+			nm_device_reactivate_ip6_config (NM_DEVICE (self), s_ip6, s_ip6);
 	}
 }
 
@@ -141,7 +144,8 @@ nm_device_vlan_set_parent (NMDeviceVlan *self, NMDevice *parent)
 		                                          device);
 
 		priv->parent_hwaddr_id = g_signal_connect (priv->parent, "notify::" NM_DEVICE_HW_ADDRESS,
-		                                           G_CALLBACK (parent_hwaddr_changed), device);
+		                                           G_CALLBACK (parent_hwaddr_maybe_changed), device);
+		parent_hwaddr_maybe_changed (parent, NULL, self);
 
 		/* Set parent-dependent unmanaged flag */
 		nm_device_set_unmanaged_by_flags (device,
@@ -218,6 +222,12 @@ create_and_realize (NMDevice *device,
 	s_vlan = nm_connection_get_setting_vlan (connection);
 	g_assert (s_vlan);
 
+	if (!parent) {
+		g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
+		             "VLAN devices can not be created without a parent interface");
+		return FALSE;
+	}
+
 	if (!nm_device_supports_vlans (parent)) {
 		g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
 		             "no support for VLANs on interface %s of type %s",
@@ -537,6 +547,7 @@ update_connection (NMDevice *device, NMConnection *connection)
 static NMActStageReturn
 act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 {
+	NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (dev);
 	NMSettingVlan *s_vlan;
 	NMSettingWired *s_wired;
 	const char *cloned_mac;
@@ -555,6 +566,10 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 		nm_device_set_hw_addr (dev, cloned_mac, "set", LOGD_VLAN);
 	}
 
+	/* Change MAC address to parent's one if needed */
+	if (priv->parent)
+		parent_hwaddr_maybe_changed (priv->parent, NULL, dev);
+
 	s_vlan = (NMSettingVlan *) nm_device_get_applied_setting (dev, NM_TYPE_SETTING_VLAN);
 	if (s_vlan) {
 		gs_free NMVlanQosMapping *ingress_map = NULL;
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 3d949ec2..08cf6dce 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -280,11 +280,11 @@ typedef struct _NMDevicePrivate {
 	NMIP4Config *   wwan_ip4_config; /* WWAN configuration */
 	GSList *        vpn4_configs;   /* VPNs which use this device */
 	struct {
-		gboolean v4_has;
-		gboolean v4_is_assumed;
+		bool v4_has;
+		bool v4_is_assumed;
+		bool v6_has;
+		bool v6_is_assumed;
 		NMPlatformIP4Route v4;
-		gboolean v6_has;
-		gboolean v6_is_assumed;
 		NMPlatformIP6Route v6;
 	} default_route;
 
@@ -878,6 +878,34 @@ nm_device_get_ip6_route_metric (NMDevice *self)
 	return _get_ipx_route_metric (self, FALSE);
 }
 
+static void
+_update_default_route (NMDevice *self, int addr_family, gboolean has, gboolean is_assumed)
+{
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
+	bool *p_has, *p_is_assumed;
+
+	nm_assert (NM_IN_SET (addr_family, 0, AF_INET, AF_INET6));
+
+	if (addr_family == AF_INET) {
+		p_has = &priv->default_route.v4_has;
+		p_is_assumed = &priv->default_route.v4_is_assumed;
+	} else {
+		p_has = &priv->default_route.v6_has;
+		p_is_assumed = &priv->default_route.v6_is_assumed;
+	}
+
+	if (*p_has == has && *p_is_assumed == is_assumed)
+		return;
+
+	*p_has = has;
+	*p_is_assumed = is_assumed;
+
+	if (addr_family == AF_INET)
+		nm_default_route_manager_ip4_update_default_route (nm_default_route_manager_get (), self);
+	else
+		nm_default_route_manager_ip6_update_default_route (nm_default_route_manager_get (), self);
+}
+
 const NMPlatformIP4Route *
 nm_device_get_ip4_default_route (NMDevice *self, gboolean *out_is_assumed)
 {
@@ -2067,8 +2095,12 @@ nm_device_unrealize (NMDevice *self, gboolean remove_resources, GError **error)
 	_LOGD (LOGD_DEVICE, "unrealize (ifindex %d)", ifindex > 0 ? ifindex : 0);
 
 	if (remove_resources) {
-		if (ifindex > 0)
+		if (NM_DEVICE_GET_CLASS (self)->unrealize) {
+			if (!NM_DEVICE_GET_CLASS (self)->unrealize (self, error))
+				return FALSE;
+		} else if (ifindex > 0) {
 			nm_platform_link_delete (NM_PLATFORM_GET, ifindex);
+		}
 	}
 
 	NM_DEVICE_GET_CLASS (self)->unrealize_notify (self);
@@ -2568,12 +2600,14 @@ nm_device_get_enslaved (NMDevice *self)
 /**
  * nm_device_removed:
  * @self: the #NMDevice
+ * @unconfigure_ip_config: whether to clear the IP config objects
+ *   of the device (provided, it is still not cleared at this point).
  *
  * Called by the manager when the device was removed. Releases the device from
  * the master in case it's enslaved.
  */
 void
-nm_device_removed (NMDevice *self)
+nm_device_removed (NMDevice *self, gboolean unconfigure_ip_config)
 {
 	NMDevicePrivate *priv;
 
@@ -2586,16 +2620,19 @@ nm_device_removed (NMDevice *self)
 		nm_device_master_release_one_slave (priv->master, self, FALSE, NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED);
 	}
 
+	if (!unconfigure_ip_config)
+		return;
+
 	/* Clean up IP configs; this does not actually deconfigure the
 	 * interface, it just clears the configuration to which policy
 	 * is reacting via NM_DEVICE_IP4_CONFIG_CHANGED/NM_DEVICE_IP6_CONFIG_CHANGED
 	 * signal. As NMPolicy registered the NMIPxConfig instances in NMDnsManager,
 	 * these would be leaked otherwise. */
-	priv->default_route.v4_has = FALSE;
-	priv->default_route.v4_is_assumed = TRUE;
+	_update_default_route (self, AF_INET,  priv->default_route.v4_has, TRUE);
+	_update_default_route (self, AF_INET6, priv->default_route.v6_has, TRUE);
+	_update_default_route (self, AF_INET,  FALSE, TRUE);
+	_update_default_route (self, AF_INET6, FALSE, TRUE);
 	nm_device_set_ip4_config (self, NULL, 0, FALSE, FALSE, NULL);
-	priv->default_route.v6_has = FALSE;
-	priv->default_route.v6_is_assumed = TRUE;
 	nm_device_set_ip6_config (self, NULL, FALSE, FALSE, NULL);
 }
 
@@ -9994,20 +10031,15 @@ _cleanup_generic_post (NMDevice *self, CleanupType cleanup_type)
 {
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
 
-	priv->default_route.v4_has = FALSE;
-	priv->default_route.v6_has = FALSE;
-
 	if (cleanup_type == CLEANUP_TYPE_DECONFIGURE) {
-		priv->default_route.v4_is_assumed = FALSE;
-		priv->default_route.v6_is_assumed = FALSE;
-		nm_default_route_manager_ip4_update_default_route (nm_default_route_manager_get (), self);
-		nm_default_route_manager_ip6_update_default_route (nm_default_route_manager_get (), self);
+		_update_default_route (self, AF_INET,  FALSE, FALSE);
+		_update_default_route (self, AF_INET6, FALSE, FALSE);
+	} else {
+		_update_default_route (self, AF_INET,  priv->default_route.v4_has, TRUE);
+		_update_default_route (self, AF_INET6, priv->default_route.v6_has, TRUE);
 	}
-
-	priv->default_route.v4_is_assumed = TRUE;
-	priv->default_route.v6_is_assumed = TRUE;
-	nm_default_route_manager_ip4_update_default_route (nm_default_route_manager_get (), self);
-	nm_default_route_manager_ip6_update_default_route (nm_default_route_manager_get (), self);
+	_update_default_route (self, AF_INET,  FALSE, TRUE);
+	_update_default_route (self, AF_INET6, FALSE, TRUE);
 
 	priv->v4_commit_first_time = TRUE;
 	priv->v6_commit_first_time = TRUE;
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index 368e77f7..9f689850 100644
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -180,6 +180,14 @@ typedef struct {
 	void        (*realize_start_notify) (NMDevice *self, const NMPlatformLink *plink);
 
 	/**
+	 * unrealize():
+	 * @self: the #NMDevice
+	 *
+	 * Remove the device backing resources.
+	 */
+	gboolean               (*unrealize) (NMDevice *self, GError **error);
+
+	/**
 	 * unrealize_notify():
 	 * @self: the #NMDevice
 	 *
@@ -377,7 +385,7 @@ gboolean        nm_device_has_unmodified_applied_connection (NMDevice *self,
                                                              NMSettingCompareFlags compare_flags);
 NMSetting *     nm_device_get_applied_setting   (NMDevice *dev, GType setting_type);
 
-void            nm_device_removed               (NMDevice *dev);
+void            nm_device_removed               (NMDevice *self, gboolean unconfigure_ip_config);
 
 gboolean        nm_device_is_available          (NMDevice *dev, NMDeviceCheckDevAvailableFlags flags);
 gboolean        nm_device_has_carrier           (NMDevice *dev);
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c
index 2a8a9d1e..804a6d9c 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/devices/wwan/nm-modem.c
@@ -742,7 +742,8 @@ cancel_get_secrets (NMModem *self)
 {
 	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self);
 
-	nm_act_request_cancel_secrets (priv->act_request, priv->secrets_id);
+	if (priv->secrets_id)
+		nm_act_request_cancel_secrets (priv->act_request, priv->secrets_id);
 }
 
 static void
diff --git a/src/nm-config.c b/src/nm-config.c
index 58fd96cb..8bca6870 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -125,7 +125,7 @@ gint
 nm_config_parse_boolean (const char *str,
                          gint default_value)
 {
-	return nm_utils_ascii_str_to_bool (str, default_value);
+	return _nm_utils_ascii_str_to_bool (str, default_value);
 }
 
 gint
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index 714aaa92..bbe46654 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -154,40 +154,6 @@ _nm_singleton_instance_register_destruction (GObject *instance)
 
 /*****************************************************************************/
 
-gint
-nm_utils_ascii_str_to_bool (const char *str,
-                            gint default_value)
-{
-	gsize len;
-	char *s = NULL;
-
-	if (!str)
-		return default_value;
-
-	while (str[0] && g_ascii_isspace (str[0]))
-		str++;
-
-	if (!str[0])
-		return default_value;
-
-	len = strlen (str);
-	if (g_ascii_isspace (str[len - 1])) {
-		s = g_strdup (str);
-		g_strchomp (s);
-		str = s;
-	}
-
-	if (!g_ascii_strcasecmp (str, "true") || !g_ascii_strcasecmp (str, "yes") || !g_ascii_strcasecmp (str, "on") || !g_ascii_strcasecmp (str, "1"))
-		default_value = TRUE;
-	else if (!g_ascii_strcasecmp (str, "false") || !g_ascii_strcasecmp (str, "no") || !g_ascii_strcasecmp (str, "off") || !g_ascii_strcasecmp (str, "0"))
-		default_value = FALSE;
-	if (s)
-		g_free (s);
-	return default_value;
-}
-
-/*****************************************************************************/
-
 /*
  * nm_ethernet_address_is_valid:
  * @addr: pointer to a binary or ASCII Ethernet address
diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
index 280be047..528288c3 100644
--- a/src/nm-core-utils.h
+++ b/src/nm-core-utils.h
@@ -91,11 +91,6 @@ GETTER (void) \
 
 /*****************************************************************************/
 
-gint nm_utils_ascii_str_to_bool (const char *str,
-                                 gint default_value);
-
-/*****************************************************************************/
-
 gboolean nm_ethernet_address_is_valid (gconstpointer addr, gssize len);
 
 in_addr_t nm_utils_ip4_address_clear_host_address (in_addr_t addr, guint8 plen);
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 289a91d6..e64c68af 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -833,13 +833,13 @@ remove_device (NMManager *self,
                gboolean allow_unmanage)
 {
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
+	gboolean unmanage = FALSE;
 
 	_LOGD (LOGD_DEVICE, "(%s): removing device (allow_unmanage %d, managed %d)",
 	       nm_device_get_iface (device), allow_unmanage, nm_device_get_managed (device, FALSE));
 
 	if (allow_unmanage && nm_device_get_managed (device, FALSE)) {
 		NMActRequest *req = nm_device_get_act_request (device);
-		gboolean unmanage = FALSE;
 
 		/* Leave activated interfaces up when quitting so their configuration
 		 * can be taken over when NM restarts.  This ensures connectivity while
@@ -869,7 +869,18 @@ remove_device (NMManager *self,
 	priv->devices = g_slist_remove (priv->devices, device);
 
 	if (nm_device_is_real (device)) {
-		nm_device_removed (device);
+		gboolean unconfigure_ip_config = !quitting || unmanage;
+
+		/* When we don't unmanage the device on shutdown, we want to preserve the DNS
+		 * configuration in resolv.conf. For that, we must leak the configuration
+		 * in NMPolicy/NMDnsManager. We do that, by emitting the device-removed signal
+		 * with device's ip-config object still uncleared. In that case, NMPolicy
+		 * never learns to unconfigure the ip-config objects and does not remove them
+		 * from DNS on shutdown (which is ugly, because we don't cleanup the memory
+		 * properly).
+		 *
+		 * Control that by passing @unconfigure_ip_config.  */
+		nm_device_removed (device, unconfigure_ip_config);
 
 		g_signal_emit (self, signals[DEVICE_REMOVED], 0, device);
 		_notify (self, PROP_DEVICES);
@@ -3512,7 +3523,6 @@ activation_add_done (NMSettings *settings,
 	                            FALSE,
 	                            nm_active_connection_get_subject (active),
 	                            error->message);
-	g_object_unref (active);
 	g_clear_error (&local);
 }
 
diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c
index 15d9c543..7b545076 100644
--- a/src/platform/nm-fake-platform.c
+++ b/src/platform/nm-fake-platform.c
@@ -731,6 +731,19 @@ infiniband_partition_add (NMPlatform *platform, int parent, int p_key, const NMP
 }
 
 static gboolean
+infiniband_partition_delete (NMPlatform *platform, int parent, int p_key)
+{
+	NMFakePlatformLink *parent_device;
+	gs_free char *name = NULL;
+
+	parent_device = link_get (platform, parent);
+	g_return_val_if_fail (parent_device != NULL, FALSE);
+
+	name = g_strdup_printf ("%s.%04x", parent_device->link.name, p_key);
+	return link_delete (platform, nm_platform_link_get_ifindex (platform, name));
+}
+
+static gboolean
 wifi_get_capabilities (NMPlatform *platform, int ifindex, NMDeviceWifiCapabilities *caps)
 {
 	NMFakePlatformLink *device = link_get (platform, ifindex);
@@ -1460,6 +1473,7 @@ nm_fake_platform_class_init (NMFakePlatformClass *klass)
 	platform_class->link_vxlan_add = link_vxlan_add;
 
 	platform_class->infiniband_partition_add = infiniband_partition_add;
+	platform_class->infiniband_partition_delete = infiniband_partition_delete;
 
 	platform_class->wifi_get_capabilities = wifi_get_capabilities;
 	platform_class->wifi_get_bssid = wifi_get_bssid;
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index ded019e6..254f9c85 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -1562,6 +1562,7 @@ _new_from_nl_link (NMPlatform *platform, const NMPCache *cache, struct nlmsghdr
 		_lookup_cached_link (cache, obj->link.ifindex, completed_from_cache, &link_cached);
 		if (   link_cached
 		    && link_cached->link.type == obj->link.type
+		    && link_cached->_link.netlink.lnk
 		    && (   !lnk_data
 		        || nmp_object_equal (lnk_data, link_cached->_link.netlink.lnk))) {
 			nmp_object_unref (lnk_data);
@@ -5077,24 +5078,35 @@ link_release (NMPlatform *platform, int master, int slave)
 /******************************************************************/
 
 static gboolean
-infiniband_partition_add (NMPlatform *platform, int parent, int p_key, const NMPlatformLink **out_link)
+_infiniband_partition_action (NMPlatform *platform, int parent, int p_key, const char *action, char **ifname)
 {
 	NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform);
 	const NMPObject *obj_parent;
-	const NMPObject *obj;
 	gs_free char *path = NULL;
 	gs_free char *id = NULL;
-	gs_free char *ifname = NULL;
 
 	obj_parent = nmp_cache_lookup_link (priv->cache, parent);
 	if (!obj_parent || !obj_parent->link.name[0])
 		g_return_val_if_reached (FALSE);
 
-	ifname = g_strdup_printf ("%s.%04x", obj_parent->link.name, p_key);
+	*ifname = g_strdup_printf ("%s.%04x", obj_parent->link.name, p_key);
 
-	path = g_strdup_printf ("/sys/class/net/%s/create_child", NM_ASSERT_VALID_PATH_COMPONENT (obj_parent->link.name));
+	path = g_strdup_printf ("/sys/class/net/%s/%s",
+	                        NM_ASSERT_VALID_PATH_COMPONENT (obj_parent->link.name),
+	                        action);
 	id = g_strdup_printf ("0x%04x", p_key);
-	if (!nm_platform_sysctl_set (platform, path, id))
+
+	return nm_platform_sysctl_set (platform, path, id);
+}
+
+
+static gboolean
+infiniband_partition_add (NMPlatform *platform, int parent, int p_key, const NMPlatformLink **out_link)
+{
+	const NMPObject *obj;
+	gs_free char *ifname = NULL;
+
+	if (!_infiniband_partition_action (platform, parent, p_key, "create_child", &ifname))
 		return FALSE;
 
 	do_request_link (platform, 0, ifname);
@@ -5106,6 +5118,19 @@ infiniband_partition_add (NMPlatform *platform, int parent, int p_key, const NMP
 	return !!obj;
 }
 
+static gboolean
+infiniband_partition_delete (NMPlatform *platform, int parent, int p_key)
+{
+	gs_free char *ifname = NULL;
+
+	if (!_infiniband_partition_action (platform, parent, p_key, "delete_child", &ifname)) {
+		if (errno != ENODEV)
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
 /******************************************************************/
 
 static WifiData *
@@ -6380,6 +6405,7 @@ nm_linux_platform_class_init (NMLinuxPlatformClass *klass)
 	platform_class->tun_add = tun_add;
 
 	platform_class->infiniband_partition_add = infiniband_partition_add;
+	platform_class->infiniband_partition_delete = infiniband_partition_delete;
 
 	platform_class->wifi_get_capabilities = wifi_get_capabilities;
 	platform_class->wifi_get_bssid = wifi_get_bssid;
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 69b0d420..26ac766d 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -1888,11 +1888,12 @@ nm_platform_link_gre_add (NMPlatform *self,
 	return NM_PLATFORM_ERROR_SUCCESS;
 }
 
-NMPlatformError
-nm_platform_link_infiniband_add (NMPlatform *self,
-                                 int parent,
-                                 int p_key,
-                                 const NMPlatformLink **out_link)
+static NMPlatformError
+_infiniband_add_add_or_delete (NMPlatform *self,
+                               int parent,
+                               int p_key,
+                               gboolean add,
+                               const NMPlatformLink **out_link)
 {
 	gs_free char *parent_name = NULL;
 	gs_free char *name = NULL;
@@ -1909,17 +1910,42 @@ nm_platform_link_infiniband_add (NMPlatform *self,
 		return NM_PLATFORM_ERROR_WRONG_TYPE;
 
 	name = g_strdup_printf ("%s.%04x", parent_name, p_key);
-	plerr = _link_add_check_existing (self, name, NM_LINK_TYPE_INFINIBAND, out_link);
-	if (plerr != NM_PLATFORM_ERROR_SUCCESS)
-		return plerr;
 
-	_LOGD ("link: adding infiniband partition %s for parent '%s' (%d), key %d",
-	       name, parent_name, parent, p_key);
-	if (!klass->infiniband_partition_add (self, parent, p_key, out_link))
-		return NM_PLATFORM_ERROR_UNSPECIFIED;
+	if (add) {
+		plerr = _link_add_check_existing (self, name, NM_LINK_TYPE_INFINIBAND, out_link);
+		if (plerr != NM_PLATFORM_ERROR_SUCCESS)
+			return plerr;
+
+		_LOGD ("link: adding infiniband partition %s for parent '%s' (%d), key %d",
+		       name, parent_name, parent, p_key);
+		if (!klass->infiniband_partition_add (self, parent, p_key, out_link))
+			return NM_PLATFORM_ERROR_UNSPECIFIED;
+	} else {
+		if (!klass->infiniband_partition_delete (self, parent, p_key))
+			return NM_PLATFORM_ERROR_UNSPECIFIED;
+	}
+
 	return NM_PLATFORM_ERROR_SUCCESS;
 }
 
+NMPlatformError
+nm_platform_link_infiniband_add (NMPlatform *self,
+                                 int parent,
+                                 int p_key,
+                                 const NMPlatformLink **out_link)
+{
+	return _infiniband_add_add_or_delete (self, parent, p_key, TRUE, out_link);
+}
+
+NMPlatformError
+nm_platform_link_infiniband_delete (NMPlatform *self,
+                                   int parent,
+                                   int p_key)
+{
+	return _infiniband_add_add_or_delete (self, parent, p_key, FALSE, NULL);
+}
+
+
 gboolean
 nm_platform_link_infiniband_get_properties (NMPlatform *self,
                                             int ifindex,
diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
index 9f055b04..658b709a 100644
--- a/src/platform/nm-platform.h
+++ b/src/platform/nm-platform.h
@@ -570,6 +570,7 @@ typedef struct {
 	                          const NMPlatformLink **out_link);
 
 	gboolean (*infiniband_partition_add) (NMPlatform *, int parent, int p_key, const NMPlatformLink **out_link);
+	gboolean (*infiniband_partition_delete) (NMPlatform *, int parent, int p_key);
 
 	gboolean (*tun_add) (NMPlatform *platform, const char *name, gboolean tap, gint64 owner, gint64 group, gboolean pi,
 	                     gboolean vnet_hdr, gboolean multi_queue, const NMPlatformLink **out_link);
@@ -815,6 +816,9 @@ NMPlatformError nm_platform_link_infiniband_add (NMPlatform *self,
                                                  int parent,
                                                  int p_key,
                                                  const NMPlatformLink **out_link);
+NMPlatformError nm_platform_link_infiniband_delete (NMPlatform *self,
+                                                    int parent,
+                                                    int p_key);
 gboolean nm_platform_link_infiniband_get_properties (NMPlatform *self, int ifindex, int *parent, int *p_key, const char **mode);
 
 gboolean nm_platform_link_veth_get_properties   (NMPlatform *self, int ifindex, int *out_peer_ifindex);
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index 2945ad34..a1cd0c32 100644
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -1210,7 +1210,7 @@ process_generic_config (NMVpnConnection *self, GVariant *dict)
 	const char *str;
 	GVariant *v;
 	guint32 u32;
-	gboolean b, success = FALSE;
+	gboolean b;
 
 	if (g_variant_lookup (dict, NM_VPN_PLUGIN_CAN_PERSIST, "b", &b) && b) {
 		/* Defaults to FALSE, so only let service indicate TRUE */
@@ -1246,17 +1246,15 @@ process_generic_config (NMVpnConnection *self, GVariant *dict)
 
 	if (g_variant_lookup (dict, NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, "u", &u32)) {
 		priv->ip4_external_gw = u32;
-		success = TRUE;
 	} else if (g_variant_lookup (dict, NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, "@ay", &v)) {
 		priv->ip6_external_gw = ip6_addr_dup_from_variant (v);
-		success = !!priv->ip6_external_gw;
 		g_variant_unref (v);
-	}
 
-	if (!success) {
-		_LOGE ("VPN gateway is neither IPv4 nor IPv6");
-		nm_vpn_connection_config_maybe_complete (self, FALSE);
-		return FALSE;
+		if (!priv->ip6_external_gw) {
+			_LOGE ("Invalid IPv6 VPN gateway address received");
+			nm_vpn_connection_config_maybe_complete (self, FALSE);
+			return FALSE;
+		}
 	}
 
 	priv->mtu = 0;
@@ -2021,7 +2019,10 @@ nm_vpn_connection_activate (NMVpnConnection *self,
 	s_vpn = nm_connection_get_setting_vpn (_get_applied_connection (self));
 	g_return_if_fail (s_vpn);
 
-	service = nm_setting_vpn_get_service_type (s_vpn);
+	service = nm_vpn_plugin_info_lookup_property (plugin_info,
+	                                              NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION,
+	                                              "service");
+	g_return_if_fail (service);
 
 	if (nm_vpn_plugin_info_supports_multiple (plugin_info)) {
 		const char *path;
author	Michael Biebl <biebl@debian.org>	2016-04-20 21:11:10 +0200
committer	Michael Biebl <biebl@debian.org>	2016-04-20 21:11:10 +0200
commit	78c3b8801ecf4975e5da1af3b10ae20dd2d876de (patch)
tree	19b80fbe9429f554a48ed126911026d4fa8a4b3f
parent	288a08a3672a89a9bfdb8354b6863cc039759fc2 (diff)