New upstream version 1.12.0 upstream/1.12.0

55 files changed, 5059 insertions, 1653 deletions

diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html
index 3b757d9d..f4b131a7 100644
--- a/docs/libnm/html/NMAccessPoint.html
+++ b/docs/libnm/html/NMAccessPoint.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
-<link rel="prev" href="NMRemoteConnection.html" title="NMRemoteConnection">
+<link rel="prev" href="NMVpnConnection.html" title="NMVpnConnection">
 <link rel="next" href="NMWimaxNsp.html" title="NMWimaxNsp">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -22,7 +22,7 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMRemoteConnection.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="NMVpnConnection.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="NMWimaxNsp.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html
index 613f9100..03447216 100644
--- a/docs/libnm/html/NMConnection.html
+++ b/docs/libnm/html/NMConnection.html
@@ -476,7 +476,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">NMSettingProxy</span> *
+<a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="returnvalue">NMSettingProxy</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMConnection.html#nm-connection-get-setting-proxy" title="nm_connection_get_setting_proxy ()">nm_connection_get_setting_proxy</a> <span class="c_punctuation">()</span>
@@ -2404,9 +2404,9 @@ nm_connection_get_setting_pppoe (<em class="parameter"><code><a class="link" hre
 <hr>
 <div class="refsect2">
 <a name="nm-connection-get-setting-proxy"></a><h3>nm_connection_get_setting_proxy ()</h3>
-<pre class="programlisting"><span class="returnvalue">NMSettingProxy</span> *
+<pre class="programlisting"><a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="returnvalue">NMSettingProxy</span></a> *
 nm_connection_get_setting_proxy (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>A shortcut to return any <span class="type">NMSettingProxy</span> the connection might contain.</p>
+<p>A shortcut to return any <a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="nm-connection-get-setting-proxy.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -2424,7 +2424,7 @@ nm_connection_get_setting_proxy (<em class="parameter"><code><a class="link" hre
 </div>
 <div class="refsect3">
 <a name="nm-connection-get-setting-proxy.returns"></a><h4>Returns</h4>
-<p>an <span class="type">NMSettingProxy</span> if the connection contains one, otherwise <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
+<p>an <a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a> if the connection contains one, otherwise <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></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>
 <p class="since">Since: 1.6</p>
diff --git a/docs/libnm/html/NMDeviceOlpcMesh.html b/docs/libnm/html/NMDeviceOlpcMesh.html
index 9c113243..78b3110b 100644
--- a/docs/libnm/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm/html/NMDeviceOlpcMesh.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceModem.html" title="NMDeviceModem">
-<link rel="next" href="NMDeviceTeam.html" title="NMDeviceTeam">
+<link rel="next" href="libnm-nm-device-ovs-bridge.html" title="nm-device-ovs-bridge">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -23,7 +23,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="NMDeviceModem.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMDeviceTeam.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="libnm-nm-device-ovs-bridge.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMDeviceOlpcMesh"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html
index 4de2bfa9..f653f341 100644
--- a/docs/libnm/html/NMDeviceTeam.html
+++ b/docs/libnm/html/NMDeviceTeam.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
-<link rel="prev" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">
+<link rel="prev" href="libnm-nm-device-ppp.html" title="nm-device-ppp">
 <link rel="next" href="NMDeviceTun.html" title="NMDeviceTun">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -22,7 +22,7 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMDeviceOlpcMesh.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="libnm-nm-device-ppp.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="NMDeviceTun.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
diff --git a/docs/libnm/html/NMDhcpConfig.html b/docs/libnm/html/NMDhcpConfig.html
index 15dc9869..be7f5777 100644
--- a/docs/libnm/html/NMDhcpConfig.html
+++ b/docs/libnm/html/NMDhcpConfig.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMIPConfig.html" title="NMIPConfig">
-<link rel="next" href="ch05.html" title="Utility API Reference">
+<link rel="next" href="libnm-nm-checkpoint.html" title="nm-checkpoint">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -23,7 +23,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="NMIPConfig.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="ch05.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="libnm-nm-checkpoint.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMDhcpConfig"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html
index 2e1b2f2c..3b79d1cd 100644
--- a/docs/libnm/html/NMRemoteConnection.html
+++ b/docs/libnm/html/NMRemoteConnection.html
@@ -5,9 +5,9 @@
 <title>NMRemoteConnection: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
-<link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
-<link rel="prev" href="NMVpnConnection.html" title="NMVpnConnection">
-<link rel="next" href="NMAccessPoint.html" title="NMAccessPoint">
+<link rel="up" href="ch03.html" title="Connection and Setting API Reference">
+<link rel="prev" href="NMSimpleConnection.html" title="NMSimpleConnection">
+<link rel="next" href="NMSetting.html" title="NMSetting">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -21,16 +21,16 @@
                   <a href="#NMRemoteConnection.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
-<td><a accesskey="u" href="ch04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMVpnConnection.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMAccessPoint.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="NMSimpleConnection.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMSetting.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMRemoteConnection"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2><span class="refentrytitle"><a name="NMRemoteConnection.top_of_page"></a>NMRemoteConnection</span></h2>
-<p>NMRemoteConnection</p>
+<p>NMRemoteConnection — A connection managed by NetworkManager server</p>
 </td>
 <td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
@@ -275,6 +275,8 @@ NMRemoteConnection implements
 </div>
 <div class="refsect1">
 <a name="NMRemoteConnection.description"></a><h2>Description</h2>
+<p>A <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> represents a connection that is exported via
+NetworkManager D-Bus interface.</p>
 </div>
 <div class="refsect1">
 <a name="NMRemoteConnection.functions_details"></a><h2>Functions</h2>
diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html
index d164e925..697a84d1 100644
--- a/docs/libnm/html/NMSetting.html
+++ b/docs/libnm/html/NMSetting.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSimpleConnection.html" title="NMSimpleConnection">
+<link rel="prev" href="NMRemoteConnection.html" title="NMRemoteConnection">
 <link rel="next" href="NMSettingConnection.html" title="NMSettingConnection">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -21,7 +21,7 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSimpleConnection.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="NMRemoteConnection.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="NMSettingConnection.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
@@ -251,7 +251,7 @@
         <span class="lineart">├──</span> NMSettingOvsPort
         <span class="lineart">├──</span> <a class="link" href="NMSettingPpp.html" title="NMSettingPpp">NMSettingPpp</a>
         <span class="lineart">├──</span> <a class="link" href="NMSettingPppoe.html" title="NMSettingPppoe">NMSettingPppoe</a>
-        <span class="lineart">├──</span> NMSettingProxy
+        <span class="lineart">├──</span> <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
         <span class="lineart">├──</span> <a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
         <span class="lineart">├──</span> NMSettingTCConfig
         <span class="lineart">├──</span> <a class="link" href="NMSettingTeamPort.html" title="NMSettingTeamPort">NMSettingTeamPort</a>
diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html
index 601ce3c1..1ae931cf 100644
--- a/docs/libnm/html/NMSettingBond.html
+++ b/docs/libnm/html/NMSettingBond.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingBluetooth.html" title="NMSettingBluetooth">
-<link rel="next" href="NMSettingBridge.html" title="NMSettingBridge">
+<link rel="next" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -22,7 +22,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="NMSettingBluetooth.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSettingBridge.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="NMSettingBridgePort.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingBond"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html
index 0338e313..2176d36b 100644
--- a/docs/libnm/html/NMSettingBridge.html
+++ b/docs/libnm/html/NMSettingBridge.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingBond.html" title="NMSettingBond">
-<link rel="next" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
+<link rel="prev" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
+<link rel="next" href="NMSettingCdma.html" title="NMSettingCdma">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -21,8 +21,8 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingBond.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSettingBridgePort.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="p" href="NMSettingBridgePort.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMSettingCdma.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingBridge"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html
index 57ba3283..5cc98aea 100644
--- a/docs/libnm/html/NMSettingBridgePort.html
+++ b/docs/libnm/html/NMSettingBridgePort.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingBridge.html" title="NMSettingBridge">
-<link rel="next" href="NMSettingCdma.html" title="NMSettingCdma">
+<link rel="prev" href="NMSettingBond.html" title="NMSettingBond">
+<link rel="next" href="NMSettingBridge.html" title="NMSettingBridge">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -21,8 +21,8 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingBridge.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSettingCdma.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="p" href="NMSettingBond.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMSettingBridge.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingBridgePort"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMSettingCdma.html b/docs/libnm/html/NMSettingCdma.html
index 2c46aa23..6cc15a5d 100644
--- a/docs/libnm/html/NMSettingCdma.html
+++ b/docs/libnm/html/NMSettingCdma.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
+<link rel="prev" href="NMSettingBridge.html" title="NMSettingBridge">
 <link rel="next" href="NMSettingDcb.html" title="NMSettingDcb">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -21,7 +21,7 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingBridgePort.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="NMSettingBridge.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="NMSettingDcb.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
diff --git a/docs/libnm/html/NMSettingOlpcMesh.html b/docs/libnm/html/NMSettingOlpcMesh.html
index a7b23ad5..def4e948 100644
--- a/docs/libnm/html/NMSettingOlpcMesh.html
+++ b/docs/libnm/html/NMSettingOlpcMesh.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingMacvlan.html" title="NMSettingMacvlan">
-<link rel="next" href="NMSettingPpp.html" title="NMSettingPpp">
+<link rel="next" href="libnm-nm-setting-ovs-bridge.html" title="nm-setting-ovs-bridge">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -22,7 +22,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="NMSettingMacvlan.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSettingPpp.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="libnm-nm-setting-ovs-bridge.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingOlpcMesh"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMSettingPpp.html b/docs/libnm/html/NMSettingPpp.html
index e31236a7..64ca6791 100644
--- a/docs/libnm/html/NMSettingPpp.html
+++ b/docs/libnm/html/NMSettingPpp.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
-<link rel="next" href="NMSettingPppoe.html" title="NMSettingPppoe">
+<link rel="prev" href="NMSettingPppoe.html" title="NMSettingPppoe">
+<link rel="next" href="NMSettingProxy.html" title="NMSettingProxy">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -21,8 +21,8 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingOlpcMesh.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSettingPppoe.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="p" href="NMSettingPppoe.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMSettingProxy.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingPpp"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMSettingPppoe.html b/docs/libnm/html/NMSettingPppoe.html
index 24a2e9a3..1ada0e48 100644
--- a/docs/libnm/html/NMSettingPppoe.html
+++ b/docs/libnm/html/NMSettingPppoe.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingPpp.html" title="NMSettingPpp">
-<link rel="next" href="NMSettingSerial.html" title="NMSettingSerial">
+<link rel="prev" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">
+<link rel="next" href="NMSettingPpp.html" title="NMSettingPpp">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -21,8 +21,8 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingPpp.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSettingSerial.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="p" href="libnm-nm-setting-ovs-port.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMSettingPpp.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingPppoe"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMSettingProxy.html b/docs/libnm/html/NMSettingProxy.html
new file mode 100644
index 00000000..e1433ba4
--- /dev/null
+++ b/docs/libnm/html/NMSettingProxy.html
@@ -0,0 +1,411 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NMSettingProxy: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch03.html" title="Connection and Setting API Reference">
+<link rel="prev" href="NMSettingPpp.html" title="NMSettingPpp">
+<link rel="next" href="NMSettingSerial.html" title="NMSettingSerial">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#NMSettingProxy.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
+                  <a href="#NMSettingProxy.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMSettingProxy.properties" class="shortcut">Properties</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="NMSettingPpp.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMSettingSerial.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="NMSettingProxy"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="NMSettingProxy.top_of_page"></a>NMSettingProxy</span></h2>
+<p>NMSettingProxy — Describes proxy URL, script and other related properties</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="NMSettingProxy.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingProxy.html#nm-setting-proxy-new" title="nm_setting_proxy_new ()">nm_setting_proxy_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSettingProxy.html#NMSettingProxyMethod" title="enum NMSettingProxyMethod"><span class="returnvalue">NMSettingProxyMethod</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingProxy.html#nm-setting-proxy-get-method" title="nm_setting_proxy_get_method ()">nm_setting_proxy_get_method</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingProxy.html#nm-setting-proxy-get-browser-only" title="nm_setting_proxy_get_browser_only ()">nm_setting_proxy_get_browser_only</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingProxy.html#nm-setting-proxy-get-pac-url" title="nm_setting_proxy_get_pac_url ()">nm_setting_proxy_get_pac_url</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingProxy.html#nm-setting-proxy-get-pac-script" title="nm_setting_proxy_get_pac_script ()">nm_setting_proxy_get_pac_script</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="NMSettingProxy.properties"></a><h2>Properties</h2>
+<div class="informaltable"><table class="informaltable" border="0">
+<colgroup>
+<col width="150px" class="properties_type">
+<col width="300px" class="properties_name">
+<col width="200px" class="properties_flags">
+</colgroup>
+<tbody>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingProxy.html#NMSettingProxy--browser-only" title="The “browser-only” property">browser-only</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingProxy.html#NMSettingProxy--method" title="The “method” property">method</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
+<td class="property_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
+<td class="property_name"><a class="link" href="NMSettingProxy.html#NMSettingProxy--pac-script" title="The “pac-script” property">pac-script</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
+<td class="property_name"><a class="link" href="NMSettingProxy.html#NMSettingProxy--pac-url" title="The “pac-url” property">pac-url</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="NMSettingProxy.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="NMSettingProxy.html#NMSettingProxyMethod" title="enum NMSettingProxyMethod">NMSettingProxyMethod</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingProxy.html#NM-SETTING-PROXY-SETTING-NAME:CAPS" title="NM_SETTING_PROXY_SETTING_NAME">NM_SETTING_PROXY_SETTING_NAME</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingProxy.html#NM-SETTING-PROXY-METHOD:CAPS" title="NM_SETTING_PROXY_METHOD">NM_SETTING_PROXY_METHOD</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingProxy.html#NM-SETTING-PROXY-BROWSER-ONLY:CAPS" title="NM_SETTING_PROXY_BROWSER_ONLY">NM_SETTING_PROXY_BROWSER_ONLY</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingProxy.html#NM-SETTING-PROXY-PAC-URL:CAPS" title="NM_SETTING_PROXY_PAC_URL">NM_SETTING_PROXY_PAC_URL</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingProxy.html#NM-SETTING-PROXY-PAC-SCRIPT:CAPS" title="NM_SETTING_PROXY_PAC_SCRIPT">NM_SETTING_PROXY_PAC_SCRIPT</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingProxy.html#NMSettingProxy-struct" title="NMSettingProxy">NMSettingProxy</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="NMSettingProxy.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+    <span class="lineart">╰──</span> NMSettingProxyMethod
+    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
+    <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+        <span class="lineart">╰──</span> NMSettingProxy
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMSettingProxy.description"></a><h2>Description</h2>
+<p>The <a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes properties
+related to Proxy settings like PAC URL, PAC script etc.</p>
+<p>NetworkManager support 2 values for the <a class="link" href="NMSettingProxy.html#NMSettingProxy--method" title="The “method” property"><span class="type">“method”</span></a> property for
+proxy. If "auto" is specified then WPAD takes place and the appropriate details
+are pushed into PacRunner or user can override this URL with a new PAC URL or a
+PAC script. If "none" is selected then no proxy configuration is given to PacRunner
+to fulfill client queries.</p>
+</div>
+<div class="refsect1">
+<a name="NMSettingProxy.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="nm-setting-proxy-new"></a><h3>nm_setting_proxy_new ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+nm_setting_proxy_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Creates a new <a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a> object.</p>
+<div class="refsect3">
+<a name="nm-setting-proxy-new.returns"></a><h4>Returns</h4>
+<p> the new empty <a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a> object</p>
+</div>
+<p class="since">Since: 1.6</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-proxy-get-method"></a><h3>nm_setting_proxy_get_method ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingProxy.html#NMSettingProxyMethod" title="enum NMSettingProxyMethod"><span class="returnvalue">NMSettingProxyMethod</span></a>
+nm_setting_proxy_get_method (<em class="parameter"><code><a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a> *setting</code></em>);</pre>
+<p>Returns the proxy configuration method. By default the value is <a class="link" href="NMSettingProxy.html#NM-SETTING-PROXY-METHOD-NONE:CAPS"><code class="literal">NM_SETTING_PROXY_METHOD_NONE</code></a>.
+<a class="link" href="NMSettingProxy.html#NM-SETTING-PROXY-METHOD-NONE:CAPS"><code class="literal">NM_SETTING_PROXY_METHOD_NONE</code></a> should be selected for a connection intended for direct network
+access.</p>
+<div class="refsect3">
+<a name="nm-setting-proxy-get-method.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-proxy-get-method.returns"></a><h4>Returns</h4>
+<p> the proxy configuration method</p>
+</div>
+<p class="since">Since: 1.6</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-proxy-get-browser-only"></a><h3>nm_setting_proxy_get_browser_only ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_proxy_get_browser_only (<em class="parameter"><code><a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-proxy-get-browser-only.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-proxy-get-browser-only.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if this proxy configuration is only for browser
+clients/schemes, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
+</div>
+<p class="since">Since: 1.6</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-proxy-get-pac-url"></a><h3>nm_setting_proxy_get_pac_url ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_proxy_get_pac_url (<em class="parameter"><code><a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-proxy-get-pac-url.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-proxy-get-pac-url.returns"></a><h4>Returns</h4>
+<p> the PAC URL for obtaining PAC file</p>
+</div>
+<p class="since">Since: 1.6</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-proxy-get-pac-script"></a><h3>nm_setting_proxy_get_pac_script ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_proxy_get_pac_script (<em class="parameter"><code><a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-proxy-get-pac-script.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-proxy-get-pac-script.returns"></a><h4>Returns</h4>
+<p> the PAC script</p>
+</div>
+<p class="since">Since: 1.6</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="NMSettingProxy.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NMSettingProxyMethod"></a><h3>enum NMSettingProxyMethod</h3>
+<p>The Proxy method.</p>
+<div class="refsect3">
+<a name="NMSettingProxyMethod.members"></a><h4>Members</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="NM-SETTING-PROXY-METHOD-NONE:CAPS"></a>NM_SETTING_PROXY_METHOD_NONE</p></td>
+<td class="enum_member_description">
+<p>No Proxy for the Connection</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-SETTING-PROXY-METHOD-AUTO:CAPS"></a>NM_SETTING_PROXY_METHOD_AUTO</p></td>
+<td class="enum_member_description">
+<p>DHCP obtained Proxy/ Manual override</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.6</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-PROXY-SETTING-NAME:CAPS"></a><h3>NM_SETTING_PROXY_SETTING_NAME</h3>
+<pre class="programlisting">#define NM_SETTING_PROXY_SETTING_NAME "proxy"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-PROXY-METHOD:CAPS"></a><h3>NM_SETTING_PROXY_METHOD</h3>
+<pre class="programlisting">#define NM_SETTING_PROXY_METHOD "method"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-PROXY-BROWSER-ONLY:CAPS"></a><h3>NM_SETTING_PROXY_BROWSER_ONLY</h3>
+<pre class="programlisting">#define NM_SETTING_PROXY_BROWSER_ONLY "browser-only"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-PROXY-PAC-URL:CAPS"></a><h3>NM_SETTING_PROXY_PAC_URL</h3>
+<pre class="programlisting">#define NM_SETTING_PROXY_PAC_URL "pac-url"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-PROXY-PAC-SCRIPT:CAPS"></a><h3>NM_SETTING_PROXY_PAC_SCRIPT</h3>
+<pre class="programlisting">#define NM_SETTING_PROXY_PAC_SCRIPT "pac-script"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingProxy-struct"></a><h3>NMSettingProxy</h3>
+<pre class="programlisting">typedef struct _NMSettingProxy NMSettingProxy;</pre>
+<p>WWW Proxy Settings</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="NMSettingProxy.property-details"></a><h2>Property Details</h2>
+<div class="refsect2">
+<a name="NMSettingProxy--browser-only"></a><h3>The <code class="literal">“browser-only”</code> property</h3>
+<pre class="programlisting">  “browser-only”             <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
+<p>Whether the proxy configuration is for browser only.</p>
+<p>Flags: Read / Write</p>
+<p>Default value: FALSE</p>
+<p class="since">Since: 1.6</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingProxy--method"></a><h3>The <code class="literal">“method”</code> property</h3>
+<pre class="programlisting">  “method”                   <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></pre>
+<p>Method for proxy configuration, Default is <a class="link" href="NMSettingProxy.html#NM-SETTING-PROXY-METHOD-NONE:CAPS"><code class="literal">NM_SETTING_PROXY_METHOD_NONE</code></a></p>
+<p>Flags: Read / Write / Construct</p>
+<p>Default value: 0</p>
+<p class="since">Since: 1.6</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingProxy--pac-script"></a><h3>The <code class="literal">“pac-script”</code> property</h3>
+<pre class="programlisting">  “pac-script”               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</pre>
+<p>PAC script for the connection.</p>
+<p>Flags: Read / Write</p>
+<p>Default value: NULL</p>
+<p class="since">Since: 1.6</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingProxy--pac-url"></a><h3>The <code class="literal">“pac-url”</code> property</h3>
+<pre class="programlisting">  “pac-url”                  <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</pre>
+<p>PAC URL for obtaining PAC file.</p>
+<p>Flags: Read / Write</p>
+<p>Default value: NULL</p>
+<p class="since">Since: 1.6</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html
index 50838fe8..b94dc1ec 100644
--- a/docs/libnm/html/NMSettingSerial.html
+++ b/docs/libnm/html/NMSettingSerial.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingPppoe.html" title="NMSettingPppoe">
-<link rel="next" href="NMSettingTeam.html" title="NMSettingTeam">
+<link rel="prev" href="NMSettingProxy.html" title="NMSettingProxy">
+<link rel="next" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -21,8 +21,8 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingPppoe.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSettingTeam.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="p" href="NMSettingProxy.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libnm-nm-setting-tc-config.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingSerial"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index 8f8ae2c4..39946f2d 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingSerial.html" title="NMSettingSerial">
-<link rel="next" href="NMSettingTeamPort.html" title="NMSettingTeamPort">
+<link rel="prev" href="NMSettingTeamPort.html" title="NMSettingTeamPort">
+<link rel="next" href="NMSettingTun.html" title="NMSettingTun">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -21,8 +21,8 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingSerial.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSettingTeamPort.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="p" href="NMSettingTeamPort.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMSettingTun.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingTeam"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html
index d518b45e..7e9f9736 100644
--- a/docs/libnm/html/NMSettingTeamPort.html
+++ b/docs/libnm/html/NMSettingTeamPort.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingTeam.html" title="NMSettingTeam">
-<link rel="next" href="NMSettingTun.html" title="NMSettingTun">
+<link rel="prev" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">
+<link rel="next" href="NMSettingTeam.html" title="NMSettingTeam">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -21,8 +21,8 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingTeam.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSettingTun.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="p" href="libnm-nm-setting-tc-config.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMSettingTeam.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingTeamPort"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMSettingTun.html b/docs/libnm/html/NMSettingTun.html
index 0c6ff37c..6841d57b 100644
--- a/docs/libnm/html/NMSettingTun.html
+++ b/docs/libnm/html/NMSettingTun.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingTeamPort.html" title="NMSettingTeamPort">
-<link rel="next" href="NMSettingVlan.html" title="NMSettingVlan">
+<link rel="prev" href="NMSettingTeam.html" title="NMSettingTeam">
+<link rel="next" href="libnm-nm-setting-user.html" title="nm-setting-user">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -21,8 +21,8 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingTeamPort.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSettingVlan.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="p" href="NMSettingTeam.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libnm-nm-setting-user.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingTun"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index cdd1012c..76e6f9ed 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingTun.html" title="NMSettingTun">
+<link rel="prev" href="libnm-nm-setting-user.html" title="nm-setting-user">
 <link rel="next" href="NMSettingVpn.html" title="NMSettingVpn">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -21,7 +21,7 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingTun.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="libnm-nm-setting-user.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="NMSettingVpn.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index 06b7728b..68208936 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingWimax.html" title="NMSettingWimax">
-<link rel="next" href="NMSettingWireless.html" title="NMSettingWireless">
+<link rel="next" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -22,7 +22,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="NMSettingWimax.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSettingWireless.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="NMSettingWirelessSecurity.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingWired"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index 32ba42e3..b1eaf1aa 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingWired.html" title="NMSettingWired">
-<link rel="next" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
+<link rel="prev" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
+<link rel="next" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -21,8 +21,8 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingWired.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSettingWirelessSecurity.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="p" href="NMSettingWirelessSecurity.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="ch04.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingWireless"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index 9397f5c6..6e08ecf2 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingWireless.html" title="NMSettingWireless">
-<link rel="next" href="ch04.html" title="Device and Runtime Configuration API Reference">
+<link rel="prev" href="NMSettingWired.html" title="NMSettingWired">
+<link rel="next" href="NMSettingWireless.html" title="NMSettingWireless">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -21,8 +21,8 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingWireless.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="ch04.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="p" href="NMSettingWired.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMSettingWireless.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingWirelessSecurity"></a><div class="titlepage"></div>
diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html
index cab8d769..0fa97726 100644
--- a/docs/libnm/html/NMSimpleConnection.html
+++ b/docs/libnm/html/NMSimpleConnection.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMConnection.html" title="NMConnection">
-<link rel="next" href="NMSetting.html" title="NMSetting">
+<link rel="next" href="NMRemoteConnection.html" title="NMRemoteConnection">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -22,14 +22,14 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="NMConnection.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSetting.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="NMRemoteConnection.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSimpleConnection"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2><span class="refentrytitle"><a name="NMSimpleConnection.top_of_page"></a>NMSimpleConnection</span></h2>
-<p>NMSimpleConnection</p>
+<p>NMSimpleConnection — An unmanaged connection</p>
 </td>
 <td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
@@ -95,6 +95,8 @@ NMSimpleConnection implements
 </div>
 <div class="refsect1">
 <a name="NMSimpleConnection.description"></a><h2>Description</h2>
+<p>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>
 <div class="refsect1">
 <a name="NMSimpleConnection.functions_details"></a><h2>Functions</h2>
@@ -102,9 +104,7 @@ NMSimpleConnection implements
 <a name="nm-simple-connection-new"></a><h3>nm_simple_connection_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMConnection.html" title="NMConnection"><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>
+<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.</p>
 <div class="refsect3">
 <a name="nm-simple-connection-new.returns"></a><h4>Returns</h4>
 <p>the new empty <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object. </p>
diff --git a/docs/libnm/html/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html
index 0a1d8cbf..92eac0c2 100644
--- a/docs/libnm/html/NMVpnConnection.html
+++ b/docs/libnm/html/NMVpnConnection.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMActiveConnection.html" title="NMActiveConnection">
-<link rel="next" href="NMRemoteConnection.html" title="NMRemoteConnection">
+<link rel="next" href="NMAccessPoint.html" title="NMAccessPoint">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -24,7 +24,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="NMActiveConnection.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMRemoteConnection.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="NMAccessPoint.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMVpnConnection"></a><div class="titlepage"></div>
@@ -45,7 +45,7 @@
 <tbody>
 <tr>
 <td class="function_type">
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState" title="enum NMVpnConnectionState"><span class="returnvalue">NMVpnConnectionState</span></a>
+<a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState"><span class="returnvalue">NMVpnConnectionState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMVpnConnection.html#nm-vpn-connection-get-vpn-state" title="nm_vpn_connection_get_vpn_state ()">nm_vpn_connection_get_vpn_state</a> <span class="c_punctuation">()</span>
@@ -77,7 +77,7 @@
 <td class="property_flags">Read</td>
 </tr>
 <tr>
-<td class="property_type"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState" title="enum NMVpnConnectionState"><span class="type">NMVpnConnectionState</span></a></td>
+<td class="property_type"><a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState"><span class="type">NMVpnConnectionState</span></a></td>
 <td class="property_name"><a class="link" href="NMVpnConnection.html#NMVpnConnection--vpn-state" title="The “vpn-state” property">vpn-state</a></td>
 <td class="property_flags">Read</td>
 </tr>
@@ -143,7 +143,7 @@ NMVpnConnection implements
 <a name="NMVpnConnection.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
 <a name="nm-vpn-connection-get-vpn-state"></a><h3>nm_vpn_connection_get_vpn_state ()</h3>
-<pre class="programlisting"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState" title="enum NMVpnConnectionState"><span class="returnvalue">NMVpnConnectionState</span></a>
+<pre class="programlisting"><a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState"><span class="returnvalue">NMVpnConnectionState</span></a>
 nm_vpn_connection_get_vpn_state (<em class="parameter"><code><a class="link" href="NMVpnConnection.html" title="NMVpnConnection"><span class="type">NMVpnConnection</span></a> *vpn</code></em>);</pre>
 <p>Gets the current <a class="link" href="NMVpnConnection.html" title="NMVpnConnection"><span class="type">NMVpnConnection</span></a> state.</p>
 <div class="refsect3">
@@ -225,7 +225,7 @@ string used by the connection, and must not be modified.</p>
 <hr>
 <div class="refsect2">
 <a name="NMVpnConnection--vpn-state"></a><h3>The <code class="literal">“vpn-state”</code> property</h3>
-<pre class="programlisting">  “vpn-state”                <a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState" title="enum NMVpnConnectionState"><span class="type">NMVpnConnectionState</span></a></pre>
+<pre class="programlisting">  “vpn-state”                <a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState"><span class="type">NMVpnConnectionState</span></a></pre>
 <p>The VPN state of the active VPN connection.</p>
 <p>Flags: Read</p>
 <p>Default value: NM_VPN_CONNECTION_STATE_UNKNOWN</p>
diff --git a/docs/libnm/html/NMVpnEditor.html b/docs/libnm/html/NMVpnEditor.html
new file mode 100644
index 00000000..1c1bb6a6
--- /dev/null
+++ b/docs/libnm/html/NMVpnEditor.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NMVpnEditor: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch06.html" title="VPN Plugin API Reference">
+<link rel="prev" href="libnm-nm-vpn-plugin-info.html" title="nm-vpn-plugin-info">
+<link rel="next" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#NMVpnEditor.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch06.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libnm-nm-vpn-plugin-info.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMVpnEditorPlugin.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="NMVpnEditor"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="NMVpnEditor.top_of_page"></a>NMVpnEditor</span></h2>
+<p>NMVpnEditor</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="NMVpnEditor.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="returnvalue">GObject</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMVpnEditor.html#nm-vpn-editor-get-widget" title="nm_vpn_editor_get_widget ()">nm_vpn_editor_get_widget</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMVpnEditor.html#nm-vpn-editor-update-connection" title="nm_vpn_editor_update_connection ()">nm_vpn_editor_update_connection</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="NMVpnEditor.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMVpnEditor.html#NMVpnEditorInterface" title="NMVpnEditorInterface">NMVpnEditorInterface</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="NMVpnEditor.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="NMVpnEditor.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="nm-vpn-editor-get-widget"></a><h3>nm_vpn_editor_get_widget ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="returnvalue">GObject</span></a> *
+nm_vpn_editor_get_widget (<em class="parameter"><code><a class="link" href="NMVpnEditor.html" title="NMVpnEditor"><span class="type">NMVpnEditor</span></a> *editor</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-vpn-editor-get-widget.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>editor</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMVpnEditor.html" title="NMVpnEditor"><span class="type">NMVpnEditor</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-vpn-editor-get-widget.returns"></a><h4>Returns</h4>
+<p>. </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>
+<hr>
+<div class="refsect2">
+<a name="nm-vpn-editor-update-connection"></a><h3>nm_vpn_editor_update_connection ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_vpn_editor_update_connection (<em class="parameter"><code><a class="link" href="NMVpnEditor.html" title="NMVpnEditor"><span class="type">NMVpnEditor</span></a> *editor</code></em>,
+                                 <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+</div>
+</div>
+<div class="refsect1">
+<a name="NMVpnEditor.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NMVpnEditorInterface"></a><h3>NMVpnEditorInterface</h3>
+<pre class="programlisting">typedef struct {
+	GTypeInterface g_iface;
+
+	GObject * (*get_widget) (NMVpnEditor *editor);
+
+	void (*placeholder) (void);
+
+	gboolean (*update_connection) (NMVpnEditor *editor,
+	                               NMConnection *connection,
+	                               GError **error);
+
+	void (*changed) (NMVpnEditor *editor);
+} NMVpnEditorInterface;
+</pre>
+<p>Interface for editing a specific <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p>
+<div class="refsect3">
+<a name="NMVpnEditorInterface.members"></a><h4>Members</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="struct_member_name"><p><em class="structfield"><code><a name="NMVpnEditorInterface.get-widget"></a>get_widget</code></em> ()</p></td>
+<td class="struct_member_description"><p>return the <span class="type">GtkWidget</span> for the VPN editor's UI</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><em class="structfield"><code><a name="NMVpnEditorInterface.placeholder"></a>placeholder</code></em> ()</p></td>
+<td class="struct_member_description"><p>not currently used</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><em class="structfield"><code><a name="NMVpnEditorInterface.update-connection"></a>update_connection</code></em> ()</p></td>
+<td class="struct_member_description"><p>called to save the user-entered options to the connection
+object.  Should return <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> and set <em class="parameter"><code>error</code></em>
+if the current options are
+invalid.  <em class="parameter"><code>error</code></em>
+should contain enough information for the plugin to
+determine which UI widget is invalid at a later point in time.  For
+example, creating unique error codes for what error occurred and populating
+the message field of <em class="parameter"><code>error</code></em>
+with the name of the invalid property.</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><em class="structfield"><code><a name="NMVpnEditorInterface.changed"></a>changed</code></em> ()</p></td>
+<td class="struct_member_description"><p>emitted when the value of a UI widget changes.  May trigger a
+validity check via <em class="parameter"><code>update_connection</code></em>
+to write values to the connection.</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index d42fc029..3d75ec7d 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch06.html" title="VPN Plugin API Reference">
-<link rel="prev" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">
-<link rel="next" href="object-tree.html" title="Object Hierarchy">
+<link rel="prev" href="NMVpnEditor.html" title="NMVpnEditor">
+<link rel="next" href="libnm-nm-vpn-plugin-old.html" title="nm-vpn-plugin-old">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -23,8 +23,8 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch06.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="libnm-nm-vpn-dbus-interface.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="object-tree.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="p" href="NMVpnEditor.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libnm-nm-vpn-plugin-old.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMVpnEditorPlugin"></a><div class="titlepage"></div>
@@ -61,7 +61,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor"><span class="returnvalue">NMVpnEditor</span></a> *
+<a class="link" href="NMVpnEditor.html" title="NMVpnEditor"><span class="returnvalue">NMVpnEditor</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMVpnEditorPlugin.html#nm-vpn-editor-plugin-get-editor" title="nm_vpn_editor_plugin_get_editor ()">nm_vpn_editor_plugin_get_editor</a> <span class="c_punctuation">()</span>
@@ -125,7 +125,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="returnvalue">NMVpnPluginInfo</span></a> *
+<a class="link" href="libnm-nm-vpn-plugin-info.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="returnvalue">NMVpnPluginInfo</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMVpnEditorPlugin.html#nm-vpn-editor-plugin-get-plugin-info" title="nm_vpn_editor_plugin_get_plugin_info ()">nm_vpn_editor_plugin_get_plugin_info</a> <span class="c_punctuation">()</span>
@@ -225,7 +225,7 @@
 </tr>
 <tr>
 <td class="datatype_keyword"> </td>
-<td class="function_name"><a class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo">NMVpnPluginInfo</a></td>
+<td class="function_name"><a class="link" href="libnm-nm-vpn-plugin-info.html#NMVpnPluginInfo" title="NMVpnPluginInfo">NMVpnPluginInfo</a></td>
 </tr>
 </tbody>
 </table></div>
@@ -264,7 +264,7 @@ nm_vpn_editor_plugin_factory (<em class="parameter"><code><a href="https://devel
 <hr>
 <div class="refsect2">
 <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> *
+<pre class="programlisting"><a class="link" href="NMVpnEditor.html" title="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 class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
@@ -297,7 +297,7 @@ nm_vpn_editor_plugin_get_editor (<em class="parameter"><code><a class="link" hre
 </div>
 <div class="refsect3">
 <a name="nm-vpn-editor-plugin-get-editor.returns"></a><h4>Returns</h4>
-<p>a new <a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor"><span class="type">NMVpnEditor</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
+<p>a new <a class="link" href="NMVpnEditor.html" title="NMVpnEditor"><span class="type">NMVpnEditor</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> 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>
 </div>
@@ -547,7 +547,7 @@ the given service.</p></td>
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-editor-plugin-get-plugin-info"></a><h3>nm_vpn_editor_plugin_get_plugin_info ()</h3>
-<pre class="programlisting"><a class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="returnvalue">NMVpnPluginInfo</span></a> *
+<pre class="programlisting"><a class="link" href="libnm-nm-vpn-plugin-info.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="returnvalue">NMVpnPluginInfo</span></a> *
 nm_vpn_editor_plugin_get_plugin_info (<em class="parameter"><code><a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> *plugin</code></em>);</pre>
 <div class="refsect3">
 <a name="nm-vpn-editor-plugin-get-plugin-info.parameters"></a><h4>Parameters</h4>
@@ -566,7 +566,7 @@ nm_vpn_editor_plugin_get_plugin_info (<em class="parameter"><code><a class="link
 </div>
 <div class="refsect3">
 <a name="nm-vpn-editor-plugin-get-plugin-info.returns"></a><h4>Returns</h4>
-<p>if set, return the <a class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="type">NMVpnPluginInfo</span></a> instance. </p>
+<p>if set, return the <a class="link" href="libnm-nm-vpn-plugin-info.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="type">NMVpnPluginInfo</span></a> instance. </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: 1.4</p>
@@ -576,7 +576,7 @@ nm_vpn_editor_plugin_get_plugin_info (<em class="parameter"><code><a class="link
 <a name="nm-vpn-editor-plugin-set-plugin-info"></a><h3>nm_vpn_editor_plugin_set_plugin_info ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_editor_plugin_set_plugin_info (<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 class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="type">NMVpnPluginInfo</span></a> *plugin_info</code></em>);</pre>
+                                      <em class="parameter"><code><a class="link" href="libnm-nm-vpn-plugin-info.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="type">NMVpnPluginInfo</span></a> *plugin_info</code></em>);</pre>
 <p>Set or clear the plugin-info instance.
 This takes a weak reference on <em class="parameter"><code>plugin_info</code></em>
 , to avoid circular
@@ -597,7 +597,7 @@ reference as the plugin-info might also reference the editor-plugin.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>plugin_info</p></td>
-<td class="parameter_description"><p>a <a class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="type">NMVpnPluginInfo</span></a> instance or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
+<td class="parameter_description"><p>a <a class="link" href="libnm-nm-vpn-plugin-info.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="type">NMVpnPluginInfo</span></a> instance or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></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>
 </tbody>
@@ -712,7 +712,7 @@ reference as the plugin-info might also reference the editor-plugin.</p>
 <tbody>
 <tr>
 <td class="struct_member_name"><p><em class="structfield"><code><a name="NMVpnEditorPluginInterface.get-editor"></a>get_editor</code></em> ()</p></td>
-<td class="struct_member_description"><p>returns an <a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor"><span class="type">NMVpnEditor</span></a>, pre-filled with values from <em class="parameter"><code>connection</code></em>
+<td class="struct_member_description"><p>returns an <a class="link" href="NMVpnEditor.html" title="NMVpnEditor"><span class="type">NMVpnEditor</span></a>, pre-filled with values from <em class="parameter"><code>connection</code></em>
 if non-<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -814,7 +814,7 @@ the plugin, without requiring to update libnm. Used by <a class="link" href="NMV
 <div class="refsect2">
 <a name="NMVpnEditor-changed"></a><h3>The <code class="literal">“changed”</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-user_function (<a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor"><span class="type">NMVpnEditor</span></a> *nmvpneditor,
+user_function (<a class="link" href="NMVpnEditor.html" title="NMVpnEditor"><span class="type">NMVpnEditor</span></a> *nmvpneditor,
                <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>     user_data)</pre>
 <p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS">Run First</a></p>
 </div>
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index ac116835..3c11bfda 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -497,27 +497,27 @@ NMCheckpoint:rollback-timeout, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-NM_CHECKPOINT_CREATED, macro in nm-checkpoint
+<a class="link" href="libnm-nm-checkpoint.html#NM-CHECKPOINT-CREATED:CAPS" title="NM_CHECKPOINT_CREATED">NM_CHECKPOINT_CREATED</a>, macro in <a class="link" href="libnm-nm-checkpoint.html" title="nm-checkpoint">nm-checkpoint</a>
 </dt>
 <dd></dd>
 <dt>
-NM_CHECKPOINT_DEVICES, macro in nm-checkpoint
+<a class="link" href="libnm-nm-checkpoint.html#NM-CHECKPOINT-DEVICES:CAPS" title="NM_CHECKPOINT_DEVICES">NM_CHECKPOINT_DEVICES</a>, macro in <a class="link" href="libnm-nm-checkpoint.html" title="nm-checkpoint">nm-checkpoint</a>
 </dt>
 <dd></dd>
 <dt>
-nm_checkpoint_get_created, function in nm-checkpoint
+<a class="link" href="libnm-nm-checkpoint.html#nm-checkpoint-get-created" title="nm_checkpoint_get_created ()">nm_checkpoint_get_created</a>, function in <a class="link" href="libnm-nm-checkpoint.html" title="nm-checkpoint">nm-checkpoint</a>
 </dt>
 <dd></dd>
 <dt>
-nm_checkpoint_get_devices, function in nm-checkpoint
+<a class="link" href="libnm-nm-checkpoint.html#nm-checkpoint-get-devices" title="nm_checkpoint_get_devices ()">nm_checkpoint_get_devices</a>, function in <a class="link" href="libnm-nm-checkpoint.html" title="nm-checkpoint">nm-checkpoint</a>
 </dt>
 <dd></dd>
 <dt>
-nm_checkpoint_get_rollback_timeout, function in nm-checkpoint
+<a class="link" href="libnm-nm-checkpoint.html#nm-checkpoint-get-rollback-timeout" title="nm_checkpoint_get_rollback_timeout ()">nm_checkpoint_get_rollback_timeout</a>, function in <a class="link" href="libnm-nm-checkpoint.html" title="nm-checkpoint">nm-checkpoint</a>
 </dt>
 <dd></dd>
 <dt>
-NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in nm-checkpoint
+<a class="link" href="libnm-nm-checkpoint.html#NM-CHECKPOINT-ROLLBACK-TIMEOUT:CAPS" title="NM_CHECKPOINT_ROLLBACK_TIMEOUT">NM_CHECKPOINT_ROLLBACK_TIMEOUT</a>, macro in <a class="link" href="libnm-nm-checkpoint.html" title="nm-checkpoint">nm-checkpoint</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1606,11 +1606,11 @@ NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in nm-checkpoint
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-INTERFACE-VPN:CAPS" title="NM_DBUS_INTERFACE_VPN">NM_DBUS_INTERFACE_VPN</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-INTERFACE-VPN:CAPS">NM_DBUS_INTERFACE_VPN</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-INTERFACE-VPN-CONNECTION:CAPS" title="NM_DBUS_INTERFACE_VPN_CONNECTION">NM_DBUS_INTERFACE_VPN_CONNECTION</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-INTERFACE-VPN-CONNECTION:CAPS">NM_DBUS_INTERFACE_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -1618,15 +1618,15 @@ NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in nm-checkpoint
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-INVALID-VPN-CONNECTION:CAPS" title="NM_DBUS_INVALID_VPN_CONNECTION">NM_DBUS_INVALID_VPN_CONNECTION</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-INVALID-VPN-CONNECTION:CAPS">NM_DBUS_INVALID_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-NO-ACTIVE-VPN-CONNECTION:CAPS" title="NM_DBUS_NO_ACTIVE_VPN_CONNECTION">NM_DBUS_NO_ACTIVE_VPN_CONNECTION</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-NO-ACTIVE-VPN-CONNECTION:CAPS">NM_DBUS_NO_ACTIVE_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-NO-VPN-CONNECTIONS:CAPS" title="NM_DBUS_NO_VPN_CONNECTIONS">NM_DBUS_NO_VPN_CONNECTIONS</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-NO-VPN-CONNECTIONS:CAPS">NM_DBUS_NO_VPN_CONNECTIONS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -1658,11 +1658,11 @@ NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in nm-checkpoint
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-PATH-VPN:CAPS" title="NM_DBUS_PATH_VPN">NM_DBUS_PATH_VPN</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-PATH-VPN:CAPS">NM_DBUS_PATH_VPN</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-PATH-VPN-CONNECTION:CAPS" title="NM_DBUS_PATH_VPN_CONNECTION">NM_DBUS_PATH_VPN_CONNECTION</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-PATH-VPN-CONNECTION:CAPS">NM_DBUS_PATH_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -1674,67 +1674,67 @@ NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in nm-checkpoint
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-ALREADY-STARTED:CAPS" title="NM_DBUS_VPN_ALREADY_STARTED">NM_DBUS_VPN_ALREADY_STARTED</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-ALREADY-STARTED:CAPS">NM_DBUS_VPN_ALREADY_STARTED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-ALREADY-STOPPED:CAPS" title="NM_DBUS_VPN_ALREADY_STOPPED">NM_DBUS_VPN_ALREADY_STOPPED</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-ALREADY-STOPPED:CAPS">NM_DBUS_VPN_ALREADY_STOPPED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-BAD-ARGUMENTS:CAPS" title="NM_DBUS_VPN_BAD_ARGUMENTS">NM_DBUS_VPN_BAD_ARGUMENTS</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-BAD-ARGUMENTS:CAPS">NM_DBUS_VPN_BAD_ARGUMENTS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-ERROR-PREFIX:CAPS" title="NM_DBUS_VPN_ERROR_PREFIX">NM_DBUS_VPN_ERROR_PREFIX</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-ERROR-PREFIX:CAPS">NM_DBUS_VPN_ERROR_PREFIX</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-INTERACTIVE-NOT-SUPPORTED:CAPS" title="NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED">NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-INTERACTIVE-NOT-SUPPORTED:CAPS">NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-CONNECT-FAILED:CAPS" title="NM_DBUS_VPN_SIGNAL_CONNECT_FAILED">NM_DBUS_VPN_SIGNAL_CONNECT_FAILED</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-CONNECT-FAILED:CAPS">NM_DBUS_VPN_SIGNAL_CONNECT_FAILED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS" title="NM_DBUS_VPN_SIGNAL_IP4_CONFIG">NM_DBUS_VPN_SIGNAL_IP4_CONFIG</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS">NM_DBUS_VPN_SIGNAL_IP4_CONFIG</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-IP-CONFIG-BAD:CAPS" title="NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD">NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-IP-CONFIG-BAD:CAPS">NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-LAUNCH-FAILED:CAPS" title="NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED">NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-LAUNCH-FAILED:CAPS">NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-LOGIN-BANNER:CAPS" title="NM_DBUS_VPN_SIGNAL_LOGIN_BANNER">NM_DBUS_VPN_SIGNAL_LOGIN_BANNER</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-LOGIN-BANNER:CAPS">NM_DBUS_VPN_SIGNAL_LOGIN_BANNER</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-LOGIN-FAILED:CAPS" title="NM_DBUS_VPN_SIGNAL_LOGIN_FAILED">NM_DBUS_VPN_SIGNAL_LOGIN_FAILED</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-LOGIN-FAILED:CAPS">NM_DBUS_VPN_SIGNAL_LOGIN_FAILED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS" title="NM_DBUS_VPN_SIGNAL_STATE_CHANGE">NM_DBUS_VPN_SIGNAL_STATE_CHANGE</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS">NM_DBUS_VPN_SIGNAL_STATE_CHANGE</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-VPN-CONFIG-BAD:CAPS" title="NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD">NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-VPN-CONFIG-BAD:CAPS">NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-STARTING-IN-PROGRESS:CAPS" title="NM_DBUS_VPN_STARTING_IN_PROGRESS">NM_DBUS_VPN_STARTING_IN_PROGRESS</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-STARTING-IN-PROGRESS:CAPS">NM_DBUS_VPN_STARTING_IN_PROGRESS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-STOPPING-IN-PROGRESS:CAPS" title="NM_DBUS_VPN_STOPPING_IN_PROGRESS">NM_DBUS_VPN_STOPPING_IN_PROGRESS</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-STOPPING-IN-PROGRESS:CAPS">NM_DBUS_VPN_STOPPING_IN_PROGRESS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-WRONG-STATE:CAPS" title="NM_DBUS_VPN_WRONG_STATE">NM_DBUS_VPN_WRONG_STATE</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-WRONG-STATE:CAPS">NM_DBUS_VPN_WRONG_STATE</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -1798,7 +1798,7 @@ NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in nm-checkpoint
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-8-FOR:CAPS" title="NM_DEPRECATED_IN_1_8_FOR()">NM_DEPRECATED_IN_1_8_FOR</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-8-FOR:CAPS" title="NM_DEPRECATED_IN_1_8_FOR()">NM_DEPRECATED_IN_1_8_FOR</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -5553,27 +5553,27 @@ NMSettingOvsPort:vlan-mode, object property in nm-core-types
 </dt>
 <dd></dd>
 <dt>
-NMSettingProxy, struct in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#NMSettingProxy-struct" title="NMSettingProxy">NMSettingProxy</a>, struct in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-NMSettingProxy:browser-only, object property in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#NMSettingProxy--browser-only" title="The “browser-only” property">NMSettingProxy:browser-only</a>, object property in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-NMSettingProxy:method, object property in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#NMSettingProxy--method" title="The “method” property">NMSettingProxy:method</a>, object property in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-NMSettingProxy:pac-script, object property in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#NMSettingProxy--pac-script" title="The “pac-script” property">NMSettingProxy:pac-script</a>, object property in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-NMSettingProxy:pac-url, object property in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#NMSettingProxy--pac-url" title="The “pac-url” property">NMSettingProxy:pac-url</a>, object property in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-NMSettingProxyMethod, enum in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#NMSettingProxyMethod" title="enum NMSettingProxyMethod">NMSettingProxyMethod</a>, enum in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
@@ -8425,131 +8425,131 @@ NMSettingUser:data, object property in nm-core-types
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_BRIDGE_FAIL_MODE, macro in nm-setting-ovs-bridge
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-FAIL-MODE:CAPS" title="NM_SETTING_OVS_BRIDGE_FAIL_MODE">NM_SETTING_OVS_BRIDGE_FAIL_MODE</a>, macro in <a class="link" href="libnm-nm-setting-ovs-bridge.html" title="nm-setting-ovs-bridge">nm-setting-ovs-bridge</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_bridge_get_fail_mode, function in nm-setting-ovs-bridge
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-get-fail-mode" title="nm_setting_ovs_bridge_get_fail_mode ()">nm_setting_ovs_bridge_get_fail_mode</a>, function in <a class="link" href="libnm-nm-setting-ovs-bridge.html" title="nm-setting-ovs-bridge">nm-setting-ovs-bridge</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_bridge_get_mcast_snooping_enable, function in nm-setting-ovs-bridge
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-get-mcast-snooping-enable" title="nm_setting_ovs_bridge_get_mcast_snooping_enable ()">nm_setting_ovs_bridge_get_mcast_snooping_enable</a>, function in <a class="link" href="libnm-nm-setting-ovs-bridge.html" title="nm-setting-ovs-bridge">nm-setting-ovs-bridge</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_bridge_get_rstp_enable, function in nm-setting-ovs-bridge
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-get-rstp-enable" title="nm_setting_ovs_bridge_get_rstp_enable ()">nm_setting_ovs_bridge_get_rstp_enable</a>, function in <a class="link" href="libnm-nm-setting-ovs-bridge.html" title="nm-setting-ovs-bridge">nm-setting-ovs-bridge</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_bridge_get_stp_enable, function in nm-setting-ovs-bridge
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-get-stp-enable" title="nm_setting_ovs_bridge_get_stp_enable ()">nm_setting_ovs_bridge_get_stp_enable</a>, function in <a class="link" href="libnm-nm-setting-ovs-bridge.html" title="nm-setting-ovs-bridge">nm-setting-ovs-bridge</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE, macro in nm-setting-ovs-bridge
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-MCAST-SNOOPING-ENABLE:CAPS" title="NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE">NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE</a>, macro in <a class="link" href="libnm-nm-setting-ovs-bridge.html" title="nm-setting-ovs-bridge">nm-setting-ovs-bridge</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_bridge_new, function in nm-setting-ovs-bridge
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-new" title="nm_setting_ovs_bridge_new ()">nm_setting_ovs_bridge_new</a>, function in <a class="link" href="libnm-nm-setting-ovs-bridge.html" title="nm-setting-ovs-bridge">nm-setting-ovs-bridge</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_BRIDGE_RSTP_ENABLE, macro in nm-setting-ovs-bridge
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-RSTP-ENABLE:CAPS" title="NM_SETTING_OVS_BRIDGE_RSTP_ENABLE">NM_SETTING_OVS_BRIDGE_RSTP_ENABLE</a>, macro in <a class="link" href="libnm-nm-setting-ovs-bridge.html" title="nm-setting-ovs-bridge">nm-setting-ovs-bridge</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_BRIDGE_SETTING_NAME, macro in nm-setting-ovs-bridge
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-SETTING-NAME:CAPS" title="NM_SETTING_OVS_BRIDGE_SETTING_NAME">NM_SETTING_OVS_BRIDGE_SETTING_NAME</a>, macro in <a class="link" href="libnm-nm-setting-ovs-bridge.html" title="nm-setting-ovs-bridge">nm-setting-ovs-bridge</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_BRIDGE_STP_ENABLE, macro in nm-setting-ovs-bridge
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-STP-ENABLE:CAPS" title="NM_SETTING_OVS_BRIDGE_STP_ENABLE">NM_SETTING_OVS_BRIDGE_STP_ENABLE</a>, macro in <a class="link" href="libnm-nm-setting-ovs-bridge.html" title="nm-setting-ovs-bridge">nm-setting-ovs-bridge</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_interface_get_interface_type, function in nm-setting-ovs-interface
+<a class="link" href="libnm-nm-setting-ovs-interface.html#nm-setting-ovs-interface-get-interface-type" title="nm_setting_ovs_interface_get_interface_type ()">nm_setting_ovs_interface_get_interface_type</a>, function in <a class="link" href="libnm-nm-setting-ovs-interface.html" title="nm-setting-ovs-interface">nm-setting-ovs-interface</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_interface_new, function in nm-setting-ovs-interface
+<a class="link" href="libnm-nm-setting-ovs-interface.html#nm-setting-ovs-interface-new" title="nm_setting_ovs_interface_new ()">nm_setting_ovs_interface_new</a>, function in <a class="link" href="libnm-nm-setting-ovs-interface.html" title="nm-setting-ovs-interface">nm-setting-ovs-interface</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_INTERFACE_SETTING_NAME, macro in nm-setting-ovs-interface
+<a class="link" href="libnm-nm-setting-ovs-interface.html#NM-SETTING-OVS-INTERFACE-SETTING-NAME:CAPS" title="NM_SETTING_OVS_INTERFACE_SETTING_NAME">NM_SETTING_OVS_INTERFACE_SETTING_NAME</a>, macro in <a class="link" href="libnm-nm-setting-ovs-interface.html" title="nm-setting-ovs-interface">nm-setting-ovs-interface</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_INTERFACE_TYPE, macro in nm-setting-ovs-interface
+<a class="link" href="libnm-nm-setting-ovs-interface.html#NM-SETTING-OVS-INTERFACE-TYPE:CAPS" title="NM_SETTING_OVS_INTERFACE_TYPE">NM_SETTING_OVS_INTERFACE_TYPE</a>, macro in <a class="link" href="libnm-nm-setting-ovs-interface.html" title="nm-setting-ovs-interface">nm-setting-ovs-interface</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_patch_get_peer, function in nm-setting-ovs-patch
+<a class="link" href="libnm-nm-setting-ovs-patch.html#nm-setting-ovs-patch-get-peer" title="nm_setting_ovs_patch_get_peer ()">nm_setting_ovs_patch_get_peer</a>, function in <a class="link" href="libnm-nm-setting-ovs-patch.html" title="nm-setting-ovs-patch">nm-setting-ovs-patch</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_patch_new, function in nm-setting-ovs-patch
+<a class="link" href="libnm-nm-setting-ovs-patch.html#nm-setting-ovs-patch-new" title="nm_setting_ovs_patch_new ()">nm_setting_ovs_patch_new</a>, function in <a class="link" href="libnm-nm-setting-ovs-patch.html" title="nm-setting-ovs-patch">nm-setting-ovs-patch</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_PATCH_PEER, macro in nm-setting-ovs-patch
+<a class="link" href="libnm-nm-setting-ovs-patch.html#NM-SETTING-OVS-PATCH-PEER:CAPS" title="NM_SETTING_OVS_PATCH_PEER">NM_SETTING_OVS_PATCH_PEER</a>, macro in <a class="link" href="libnm-nm-setting-ovs-patch.html" title="nm-setting-ovs-patch">nm-setting-ovs-patch</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_PATCH_SETTING_NAME, macro in nm-setting-ovs-patch
+<a class="link" href="libnm-nm-setting-ovs-patch.html#NM-SETTING-OVS-PATCH-SETTING-NAME:CAPS" title="NM_SETTING_OVS_PATCH_SETTING_NAME">NM_SETTING_OVS_PATCH_SETTING_NAME</a>, macro in <a class="link" href="libnm-nm-setting-ovs-patch.html" title="nm-setting-ovs-patch">nm-setting-ovs-patch</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_PORT_BOND_DOWNDELAY, macro in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-BOND-DOWNDELAY:CAPS" title="NM_SETTING_OVS_PORT_BOND_DOWNDELAY">NM_SETTING_OVS_PORT_BOND_DOWNDELAY</a>, macro in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_PORT_BOND_MODE, macro in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-BOND-MODE:CAPS" title="NM_SETTING_OVS_PORT_BOND_MODE">NM_SETTING_OVS_PORT_BOND_MODE</a>, macro in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_PORT_BOND_UPDELAY, macro in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-BOND-UPDELAY:CAPS" title="NM_SETTING_OVS_PORT_BOND_UPDELAY">NM_SETTING_OVS_PORT_BOND_UPDELAY</a>, macro in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_port_get_bond_downdelay, function in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-bond-downdelay" title="nm_setting_ovs_port_get_bond_downdelay ()">nm_setting_ovs_port_get_bond_downdelay</a>, function in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_port_get_bond_mode, function in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-bond-mode" title="nm_setting_ovs_port_get_bond_mode ()">nm_setting_ovs_port_get_bond_mode</a>, function in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_port_get_bond_updelay, function in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-bond-updelay" title="nm_setting_ovs_port_get_bond_updelay ()">nm_setting_ovs_port_get_bond_updelay</a>, function in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_port_get_lacp, function in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-lacp" title="nm_setting_ovs_port_get_lacp ()">nm_setting_ovs_port_get_lacp</a>, function in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_port_get_tag, function in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-tag" title="nm_setting_ovs_port_get_tag ()">nm_setting_ovs_port_get_tag</a>, function in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_port_get_vlan_mode, function in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-vlan-mode" title="nm_setting_ovs_port_get_vlan_mode ()">nm_setting_ovs_port_get_vlan_mode</a>, function in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_PORT_LACP, macro in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-LACP:CAPS" title="NM_SETTING_OVS_PORT_LACP">NM_SETTING_OVS_PORT_LACP</a>, macro in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_ovs_port_new, function in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-new" title="nm_setting_ovs_port_new ()">nm_setting_ovs_port_new</a>, function in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_PORT_SETTING_NAME, macro in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-SETTING-NAME:CAPS" title="NM_SETTING_OVS_PORT_SETTING_NAME">NM_SETTING_OVS_PORT_SETTING_NAME</a>, macro in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_PORT_TAG, macro in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-TAG:CAPS" title="NM_SETTING_OVS_PORT_TAG">NM_SETTING_OVS_PORT_TAG</a>, macro in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_OVS_PORT_VLAN_MODE, macro in nm-setting-ovs-port
+<a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-VLAN-MODE:CAPS" title="NM_SETTING_OVS_PORT_VLAN_MODE">NM_SETTING_OVS_PORT_VLAN_MODE</a>, macro in <a class="link" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">nm-setting-ovs-port</a>
 </dt>
 <dd></dd>
 <dt>
@@ -8765,43 +8765,43 @@ NM_SETTING_OVS_PORT_VLAN_MODE, macro in nm-setting-ovs-port
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_PROXY_BROWSER_ONLY, macro in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#NM-SETTING-PROXY-BROWSER-ONLY:CAPS" title="NM_SETTING_PROXY_BROWSER_ONLY">NM_SETTING_PROXY_BROWSER_ONLY</a>, macro in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_proxy_get_browser_only, function in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#nm-setting-proxy-get-browser-only" title="nm_setting_proxy_get_browser_only ()">nm_setting_proxy_get_browser_only</a>, function in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_proxy_get_method, function in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#nm-setting-proxy-get-method" title="nm_setting_proxy_get_method ()">nm_setting_proxy_get_method</a>, function in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_proxy_get_pac_script, function in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#nm-setting-proxy-get-pac-script" title="nm_setting_proxy_get_pac_script ()">nm_setting_proxy_get_pac_script</a>, function in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_proxy_get_pac_url, function in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#nm-setting-proxy-get-pac-url" title="nm_setting_proxy_get_pac_url ()">nm_setting_proxy_get_pac_url</a>, function in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_PROXY_METHOD, macro in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#NM-SETTING-PROXY-METHOD:CAPS" title="NM_SETTING_PROXY_METHOD">NM_SETTING_PROXY_METHOD</a>, macro in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_proxy_new, function in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#nm-setting-proxy-new" title="nm_setting_proxy_new ()">nm_setting_proxy_new</a>, function in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_PROXY_PAC_SCRIPT, macro in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#NM-SETTING-PROXY-PAC-SCRIPT:CAPS" title="NM_SETTING_PROXY_PAC_SCRIPT">NM_SETTING_PROXY_PAC_SCRIPT</a>, macro in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_PROXY_PAC_URL, macro in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#NM-SETTING-PROXY-PAC-URL:CAPS" title="NM_SETTING_PROXY_PAC_URL">NM_SETTING_PROXY_PAC_URL</a>, macro in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_PROXY_SETTING_NAME, macro in NMSettingProxy
+<a class="link" href="NMSettingProxy.html#NM-SETTING-PROXY-SETTING-NAME:CAPS" title="NM_SETTING_PROXY_SETTING_NAME">NM_SETTING_PROXY_SETTING_NAME</a>, macro in <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
 </dt>
 <dd></dd>
 <dt>
@@ -8857,67 +8857,67 @@ NM_SETTING_PROXY_SETTING_NAME, macro in NMSettingProxy
 </dt>
 <dd></dd>
 <dt>
-nm_setting_tc_config_add_qdisc, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-add-qdisc" title="nm_setting_tc_config_add_qdisc ()">nm_setting_tc_config_add_qdisc</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_tc_config_add_tfilter, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-add-tfilter" title="nm_setting_tc_config_add_tfilter ()">nm_setting_tc_config_add_tfilter</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_tc_config_clear_qdiscs, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-clear-qdiscs" title="nm_setting_tc_config_clear_qdiscs ()">nm_setting_tc_config_clear_qdiscs</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_tc_config_clear_tfilters, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-clear-tfilters" title="nm_setting_tc_config_clear_tfilters ()">nm_setting_tc_config_clear_tfilters</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_tc_config_get_num_qdiscs, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-get-num-qdiscs" title="nm_setting_tc_config_get_num_qdiscs ()">nm_setting_tc_config_get_num_qdiscs</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_tc_config_get_num_tfilters, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-get-num-tfilters" title="nm_setting_tc_config_get_num_tfilters ()">nm_setting_tc_config_get_num_tfilters</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_tc_config_get_qdisc, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-get-qdisc" title="nm_setting_tc_config_get_qdisc ()">nm_setting_tc_config_get_qdisc</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_tc_config_get_tfilter, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-get-tfilter" title="nm_setting_tc_config_get_tfilter ()">nm_setting_tc_config_get_tfilter</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_tc_config_new, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-new" title="nm_setting_tc_config_new ()">nm_setting_tc_config_new</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_TC_CONFIG_QDISCS, macro in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#NM-SETTING-TC-CONFIG-QDISCS:CAPS" title="NM_SETTING_TC_CONFIG_QDISCS">NM_SETTING_TC_CONFIG_QDISCS</a>, macro in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_tc_config_remove_qdisc, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-remove-qdisc" title="nm_setting_tc_config_remove_qdisc ()">nm_setting_tc_config_remove_qdisc</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_tc_config_remove_qdisc_by_value, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-remove-qdisc-by-value" title="nm_setting_tc_config_remove_qdisc_by_value ()">nm_setting_tc_config_remove_qdisc_by_value</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_tc_config_remove_tfilter, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-remove-tfilter" title="nm_setting_tc_config_remove_tfilter ()">nm_setting_tc_config_remove_tfilter</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_tc_config_remove_tfilter_by_value, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-remove-tfilter-by-value" title="nm_setting_tc_config_remove_tfilter_by_value ()">nm_setting_tc_config_remove_tfilter_by_value</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_TC_CONFIG_SETTING_NAME, macro in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#NM-SETTING-TC-CONFIG-SETTING-NAME:CAPS" title="NM_SETTING_TC_CONFIG_SETTING_NAME">NM_SETTING_TC_CONFIG_SETTING_NAME</a>, macro in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_TC_CONFIG_TFILTERS, macro in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#NM-SETTING-TC-CONFIG-TFILTERS:CAPS" title="NM_SETTING_TC_CONFIG_TFILTERS">NM_SETTING_TC_CONFIG_TFILTERS</a>, macro in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
@@ -9329,35 +9329,35 @@ NM_SETTING_TC_CONFIG_TFILTERS, macro in nm-setting-tc-config
 </dt>
 <dd></dd>
 <dt>
-nm_setting_user_check_key, function in nm-setting-user
+<a class="link" href="libnm-nm-setting-user.html#nm-setting-user-check-key" title="nm_setting_user_check_key ()">nm_setting_user_check_key</a>, function in <a class="link" href="libnm-nm-setting-user.html" title="nm-setting-user">nm-setting-user</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_user_check_val, function in nm-setting-user
+<a class="link" href="libnm-nm-setting-user.html#nm-setting-user-check-val" title="nm_setting_user_check_val ()">nm_setting_user_check_val</a>, function in <a class="link" href="libnm-nm-setting-user.html" title="nm-setting-user">nm-setting-user</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_USER_DATA, macro in nm-setting-user
+<a class="link" href="libnm-nm-setting-user.html#NM-SETTING-USER-DATA:CAPS" title="NM_SETTING_USER_DATA">NM_SETTING_USER_DATA</a>, macro in <a class="link" href="libnm-nm-setting-user.html" title="nm-setting-user">nm-setting-user</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_user_get_data, function in nm-setting-user
+<a class="link" href="libnm-nm-setting-user.html#nm-setting-user-get-data" title="nm_setting_user_get_data ()">nm_setting_user_get_data</a>, function in <a class="link" href="libnm-nm-setting-user.html" title="nm-setting-user">nm-setting-user</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_user_get_keys, function in nm-setting-user
+<a class="link" href="libnm-nm-setting-user.html#nm-setting-user-get-keys" title="nm_setting_user_get_keys ()">nm_setting_user_get_keys</a>, function in <a class="link" href="libnm-nm-setting-user.html" title="nm-setting-user">nm-setting-user</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_user_new, function in nm-setting-user
+<a class="link" href="libnm-nm-setting-user.html#nm-setting-user-new" title="nm_setting_user_new ()">nm_setting_user_new</a>, function in <a class="link" href="libnm-nm-setting-user.html" title="nm-setting-user">nm-setting-user</a>
 </dt>
 <dd></dd>
 <dt>
-NM_SETTING_USER_SETTING_NAME, macro in nm-setting-user
+<a class="link" href="libnm-nm-setting-user.html#NM-SETTING-USER-SETTING-NAME:CAPS" title="NM_SETTING_USER_SETTING_NAME">NM_SETTING_USER_SETTING_NAME</a>, macro in <a class="link" href="libnm-nm-setting-user.html" title="nm-setting-user">nm-setting-user</a>
 </dt>
 <dd></dd>
 <dt>
-nm_setting_user_set_data, function in nm-setting-user
+<a class="link" href="libnm-nm-setting-user.html#nm-setting-user-set-data" title="nm_setting_user_set_data ()">nm_setting_user_set_data</a>, function in <a class="link" href="libnm-nm-setting-user.html" title="nm-setting-user">nm-setting-user</a>
 </dt>
 <dd></dd>
 <dt>
@@ -10298,119 +10298,119 @@ nm_setting_user_set_data, function in nm-setting-user
 <dd></dd>
 <a name="idxT"></a><h3 class="title">T</h3>
 <dt>
-nm_tc_action_dup, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-dup" title="nm_tc_action_dup ()">nm_tc_action_dup</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_action_equal, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-equal" title="nm_tc_action_equal ()">nm_tc_action_equal</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_action_get_attribute, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-get-attribute" title="nm_tc_action_get_attribute ()">nm_tc_action_get_attribute</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_action_get_attribute_names, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-get-attribute-names" title="nm_tc_action_get_attribute_names ()">nm_tc_action_get_attribute_names</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_action_get_kind, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-get-kind" title="nm_tc_action_get_kind ()">nm_tc_action_get_kind</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_action_new, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-new" title="nm_tc_action_new ()">nm_tc_action_new</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_action_ref, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-ref" title="nm_tc_action_ref ()">nm_tc_action_ref</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_action_set_attribute, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-set-attribute" title="nm_tc_action_set_attribute ()">nm_tc_action_set_attribute</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_action_unref, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-unref" title="nm_tc_action_unref ()">nm_tc_action_unref</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_qdisc_dup, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-dup" title="nm_tc_qdisc_dup ()">nm_tc_qdisc_dup</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_qdisc_equal, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-equal" title="nm_tc_qdisc_equal ()">nm_tc_qdisc_equal</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_qdisc_get_handle, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-get-handle" title="nm_tc_qdisc_get_handle ()">nm_tc_qdisc_get_handle</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_qdisc_get_kind, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-get-kind" title="nm_tc_qdisc_get_kind ()">nm_tc_qdisc_get_kind</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_qdisc_get_parent, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-get-parent" title="nm_tc_qdisc_get_parent ()">nm_tc_qdisc_get_parent</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_qdisc_new, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-new" title="nm_tc_qdisc_new ()">nm_tc_qdisc_new</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_qdisc_ref, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-ref" title="nm_tc_qdisc_ref ()">nm_tc_qdisc_ref</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_qdisc_set_handle, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-set-handle" title="nm_tc_qdisc_set_handle ()">nm_tc_qdisc_set_handle</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_qdisc_unref, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-unref" title="nm_tc_qdisc_unref ()">nm_tc_qdisc_unref</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_tfilter_dup, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-dup" title="nm_tc_tfilter_dup ()">nm_tc_tfilter_dup</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_tfilter_equal, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-equal" title="nm_tc_tfilter_equal ()">nm_tc_tfilter_equal</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_tfilter_get_action, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-get-action" title="nm_tc_tfilter_get_action ()">nm_tc_tfilter_get_action</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_tfilter_get_handle, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-get-handle" title="nm_tc_tfilter_get_handle ()">nm_tc_tfilter_get_handle</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_tfilter_get_kind, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-get-kind" title="nm_tc_tfilter_get_kind ()">nm_tc_tfilter_get_kind</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_tfilter_get_parent, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-get-parent" title="nm_tc_tfilter_get_parent ()">nm_tc_tfilter_get_parent</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_tfilter_new, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-new" title="nm_tc_tfilter_new ()">nm_tc_tfilter_new</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_tfilter_ref, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-ref" title="nm_tc_tfilter_ref ()">nm_tc_tfilter_ref</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_tfilter_set_action, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-set-action" title="nm_tc_tfilter_set_action ()">nm_tc_tfilter_set_action</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_tfilter_set_handle, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-set-handle" title="nm_tc_tfilter_set_handle ()">nm_tc_tfilter_set_handle</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
-nm_tc_tfilter_unref, function in nm-setting-tc-config
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-unref" title="nm_tc_tfilter_unref ()">nm_tc_tfilter_unref</a>, function in <a class="link" href="libnm-nm-setting-tc-config.html" title="nm-setting-tc-config">nm-setting-tc-config</a>
 </dt>
 <dd></dd>
 <dt>
@@ -10852,11 +10852,11 @@ nm_utils_fixup_vendor_string, function in nm-libnm-utils
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState" title="enum NMVpnConnectionState">NMVpnConnectionState</a>, enum in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState">NMVpnConnectionState</a>, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionStateReason" title="enum NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>, enum in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -10868,7 +10868,7 @@ nm_utils_fixup_vendor_string, function in nm-libnm-utils
 </dt>
 <dd></dd>
 <dt>
-NMVpnEditorInterface, struct in <a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor">NMVpnEditor</a>
+<a class="link" href="NMVpnEditor.html#NMVpnEditorInterface" title="NMVpnEditorInterface">NMVpnEditorInterface</a>, struct in <a class="link" href="NMVpnEditor.html" title="NMVpnEditor">NMVpnEditor</a>
 </dt>
 <dd></dd>
 <dt>
@@ -10908,15 +10908,15 @@ NMVpnEditorInterface, struct in <a class="link" href="NMVpnEditorPlugin.html#NMV
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure" title="enum NMVpnPluginFailure">NMVpnPluginFailure</a>, enum in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure">NMVpnPluginFailure</a>, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo">NMVpnPluginInfo</a>, struct in nm-vpn-plugin-info
+<a class="link" href="libnm-nm-vpn-plugin-info.html#NMVpnPluginInfo" title="NMVpnPluginInfo">NMVpnPluginInfo</a>, struct in <a class="link" href="libnm-nm-vpn-plugin-info.html" title="nm-vpn-plugin-info">nm-vpn-plugin-info</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState" title="enum NMVpnServiceState">NMVpnServiceState</a>, enum in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState">NMVpnServiceState</a>, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -10936,15 +10936,15 @@ NMVpnEditorInterface, struct in <a class="link" href="NMVpnEditorPlugin.html#NMV
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-DBUS-PLUGIN-INTERFACE:CAPS" title="NM_VPN_DBUS_PLUGIN_INTERFACE">NM_VPN_DBUS_PLUGIN_INTERFACE</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-DBUS-PLUGIN-INTERFACE:CAPS">NM_VPN_DBUS_PLUGIN_INTERFACE</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-DBUS-PLUGIN-PATH:CAPS" title="NM_VPN_DBUS_PLUGIN_PATH">NM_VPN_DBUS_PLUGIN_PATH</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-DBUS-PLUGIN-PATH:CAPS">NM_VPN_DBUS_PLUGIN_PATH</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<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>
+<a class="link" href="NMVpnEditor.html#nm-vpn-editor-get-widget" title="nm_vpn_editor_get_widget ()">nm_vpn_editor_get_widget</a>, function in <a class="link" href="NMVpnEditor.html" title="NMVpnEditor">NMVpnEditor</a>
 </dt>
 <dd></dd>
 <dt>
@@ -11004,39 +11004,39 @@ NMVpnEditorInterface, struct in <a class="link" href="NMVpnEditorPlugin.html#NMV
 </dt>
 <dd></dd>
 <dt>
-<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>
+<a class="link" href="NMVpnEditor.html#nm-vpn-editor-update-connection" title="nm_vpn_editor_update_connection ()">nm_vpn_editor_update_connection</a>, function in <a class="link" href="NMVpnEditor.html" title="NMVpnEditor">NMVpnEditor</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CAN-PERSIST:CAPS" title="NM_VPN_PLUGIN_CAN_PERSIST">NM_VPN_PLUGIN_CAN_PERSIST</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CAN-PERSIST:CAPS">NM_VPN_PLUGIN_CAN_PERSIST</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-BANNER:CAPS" title="NM_VPN_PLUGIN_CONFIG_BANNER">NM_VPN_PLUGIN_CONFIG_BANNER</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-BANNER:CAPS">NM_VPN_PLUGIN_CONFIG_BANNER</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS" title="NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY">NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS">NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-HAS-IP4:CAPS" title="NM_VPN_PLUGIN_CONFIG_HAS_IP4">NM_VPN_PLUGIN_CONFIG_HAS_IP4</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-HAS-IP4:CAPS">NM_VPN_PLUGIN_CONFIG_HAS_IP4</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-HAS-IP6:CAPS" title="NM_VPN_PLUGIN_CONFIG_HAS_IP6">NM_VPN_PLUGIN_CONFIG_HAS_IP6</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-HAS-IP6:CAPS">NM_VPN_PLUGIN_CONFIG_HAS_IP6</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-MTU:CAPS" title="NM_VPN_PLUGIN_CONFIG_MTU">NM_VPN_PLUGIN_CONFIG_MTU</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-MTU:CAPS">NM_VPN_PLUGIN_CONFIG_MTU</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-PROXY-PAC:CAPS" title="NM_VPN_PLUGIN_CONFIG_PROXY_PAC">NM_VPN_PLUGIN_CONFIG_PROXY_PAC</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-PROXY-PAC:CAPS">NM_VPN_PLUGIN_CONFIG_PROXY_PAC</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS" title="NM_VPN_PLUGIN_CONFIG_TUNDEV">NM_VPN_PLUGIN_CONFIG_TUNDEV</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS">NM_VPN_PLUGIN_CONFIG_TUNDEV</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -11048,159 +11048,159 @@ NMVpnEditorInterface, struct in <a class="link" href="NMVpnEditorPlugin.html#NMV
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_INFO_FILENAME, macro in nm-vpn-plugin-info
+<a class="link" href="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-FILENAME:CAPS" title="NM_VPN_PLUGIN_INFO_FILENAME">NM_VPN_PLUGIN_INFO_FILENAME</a>, macro in <a class="link" href="libnm-nm-vpn-plugin-info.html" title="nm-vpn-plugin-info">nm-vpn-plugin-info</a>
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_INFO_KEYFILE, macro in nm-vpn-plugin-info
+<a class="link" href="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-KEYFILE:CAPS" title="NM_VPN_PLUGIN_INFO_KEYFILE">NM_VPN_PLUGIN_INFO_KEYFILE</a>, macro in <a class="link" href="libnm-nm-vpn-plugin-info.html" title="nm-vpn-plugin-info">nm-vpn-plugin-info</a>
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION, macro in nm-vpn-plugin-info
+<a class="link" href="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-KF-GROUP-CONNECTION:CAPS" title="NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION">NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION</a>, macro in <a class="link" href="libnm-nm-vpn-plugin-info.html" title="nm-vpn-plugin-info">nm-vpn-plugin-info</a>
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME, macro in nm-vpn-plugin-info
+<a class="link" href="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-KF-GROUP-GNOME:CAPS" title="NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME">NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME</a>, macro in <a class="link" href="libnm-nm-vpn-plugin-info.html" title="nm-vpn-plugin-info">nm-vpn-plugin-info</a>
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM, macro in nm-vpn-plugin-info
+<a class="link" href="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-KF-GROUP-LIBNM:CAPS" title="NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM">NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM</a>, macro in <a class="link" href="libnm-nm-vpn-plugin-info.html" title="nm-vpn-plugin-info">nm-vpn-plugin-info</a>
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_INFO_NAME, macro in nm-vpn-plugin-info
+<a class="link" href="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-NAME:CAPS" title="NM_VPN_PLUGIN_INFO_NAME">NM_VPN_PLUGIN_INFO_NAME</a>, macro in <a class="link" href="libnm-nm-vpn-plugin-info.html" title="nm-vpn-plugin-info">nm-vpn-plugin-info</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-ADDRESS:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS">NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-ADDRESS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-BANNER:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_BANNER">NM_VPN_PLUGIN_IP4_CONFIG_BANNER</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-BANNER:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_BANNER</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-DNS:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_DNS">NM_VPN_PLUGIN_IP4_CONFIG_DNS</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-DNS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_DNS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAIN:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN">NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAIN:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAINS:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS">NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAINS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-EXT-GATEWAY:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY">NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-EXT-GATEWAY:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-GATEWAY:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY">NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-GATEWAY:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-INT-GATEWAY:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY">NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-INT-GATEWAY:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-MSS:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_MSS">NM_VPN_PLUGIN_IP4_CONFIG_MSS</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-MSS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_MSS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-MTU:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_MTU">NM_VPN_PLUGIN_IP4_CONFIG_MTU</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-MTU:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_MTU</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-NBNS:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_NBNS">NM_VPN_PLUGIN_IP4_CONFIG_NBNS</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-NBNS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_NBNS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-NEVER-DEFAULT:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT">NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-NEVER-DEFAULT:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-PREFIX:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_PREFIX">NM_VPN_PLUGIN_IP4_CONFIG_PREFIX</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-PREFIX:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_PREFIX</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-PRESERVE-ROUTES:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES">NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-PRESERVE-ROUTES:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-PTP:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_PTP">NM_VPN_PLUGIN_IP4_CONFIG_PTP</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-PTP:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_PTP</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-ROUTES:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_ROUTES">NM_VPN_PLUGIN_IP4_CONFIG_ROUTES</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-ROUTES:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_ROUTES</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-TUNDEV:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV">NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-TUNDEV:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-ADDRESS:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS">NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-ADDRESS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-DNS:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_DNS">NM_VPN_PLUGIN_IP6_CONFIG_DNS</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-DNS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_DNS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAIN:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN">NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAIN:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAINS:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS">NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAINS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-INT-GATEWAY:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY">NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-INT-GATEWAY:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-MSS:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_MSS">NM_VPN_PLUGIN_IP6_CONFIG_MSS</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-MSS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_MSS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-NEVER-DEFAULT:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT">NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-NEVER-DEFAULT:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-PREFIX:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_PREFIX">NM_VPN_PLUGIN_IP6_CONFIG_PREFIX</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-PREFIX:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_PREFIX</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-PRESERVE-ROUTES:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES">NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-PRESERVE-ROUTES:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-PTP:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_PTP">NM_VPN_PLUGIN_IP6_CONFIG_PTP</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-PTP:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_PTP</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-ROUTES:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_ROUTES">NM_VPN_PLUGIN_IP6_CONFIG_ROUTES</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-ROUTES:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_ROUTES</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME, macro in nm-vpn-plugin-old
+<a class="link" href="libnm-nm-vpn-plugin-old.html#NM-VPN-PLUGIN-OLD-DBUS-SERVICE-NAME:CAPS" title="NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME">NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME</a>, macro in <a class="link" href="libnm-nm-vpn-plugin-old.html" title="nm-vpn-plugin-old">nm-vpn-plugin-old</a>
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_OLD_STATE, macro in nm-vpn-plugin-old
+<a class="link" href="libnm-nm-vpn-plugin-old.html#NM-VPN-PLUGIN-OLD-STATE:CAPS" title="NM_VPN_PLUGIN_OLD_STATE">NM_VPN_PLUGIN_OLD_STATE</a>, macro in <a class="link" href="libnm-nm-vpn-plugin-old.html" title="nm-vpn-plugin-old">nm-vpn-plugin-old</a>
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME, macro in nm-vpn-service-plugin
+<a class="link" href="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-DBUS-SERVICE-NAME:CAPS" title="NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME">NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME</a>, macro in <a class="link" href="libnm-nm-vpn-service-plugin.html" title="nm-vpn-service-plugin">nm-vpn-service-plugin</a>
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER, macro in nm-vpn-service-plugin
+<a class="link" href="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-DBUS-WATCH-PEER:CAPS" title="NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER">NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER</a>, macro in <a class="link" href="libnm-nm-vpn-service-plugin.html" title="nm-vpn-service-plugin">nm-vpn-service-plugin</a>
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_SERVICE_PLUGIN_STATE, macro in nm-vpn-service-plugin
+<a class="link" href="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-STATE:CAPS" title="NM_VPN_SERVICE_PLUGIN_STATE">NM_VPN_SERVICE_PLUGIN_STATE</a>, macro in <a class="link" href="libnm-nm-vpn-service-plugin.html" title="nm-vpn-service-plugin">nm-vpn-service-plugin</a>
 </dt>
 <dd></dd>
 <a name="idxW"></a><h3 class="title">W</h3>
diff --git a/docs/libnm/html/ch03.html b/docs/libnm/html/ch03.html
index 0b82d176..a7e21db2 100644
--- a/docs/libnm/html/ch03.html
+++ b/docs/libnm/html/ch03.html
@@ -27,7 +27,10 @@
 <span class="refentrytitle"><a href="NMConnection.html">NMConnection</a></span><span class="refpurpose"> — Describes a connection to specific network or provider</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSimpleConnection.html">NMSimpleConnection</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="NMSimpleConnection.html">NMSimpleConnection</a></span><span class="refpurpose"> — An unmanaged connection</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="NMRemoteConnection.html">NMRemoteConnection</a></span><span class="refpurpose"> — A connection managed by NetworkManager server</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMSetting.html">NMSetting</a></span><span class="refpurpose"> — Describes related configuration information</span>
@@ -48,10 +51,10 @@
 <span class="refentrytitle"><a href="NMSettingBond.html">NMSettingBond</a></span><span class="refpurpose"> — Describes connection properties for bonds</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSettingBridge.html">NMSettingBridge</a></span><span class="refpurpose"> — Describes connection properties for bridges</span>
+<span class="refentrytitle"><a href="NMSettingBridgePort.html">NMSettingBridgePort</a></span><span class="refpurpose"> — Describes connection properties for bridge ports</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSettingBridgePort.html">NMSettingBridgePort</a></span><span class="refpurpose"> — Describes connection properties for bridge ports</span>
+<span class="refentrytitle"><a href="NMSettingBridge.html">NMSettingBridge</a></span><span class="refpurpose"> — Describes connection properties for bridges</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMSettingCdma.html">NMSettingCdma</a></span><span class="refpurpose"> — Describes CDMA-based mobile broadband properties</span>
@@ -94,26 +97,47 @@
 <span class="refentrytitle"><a href="NMSettingOlpcMesh.html">NMSettingOlpcMesh</a></span><span class="refpurpose"> — Describes connection properties for OLPC-Mesh devices</span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="libnm-nm-setting-ovs-bridge.html">nm-setting-ovs-bridge</a></span><span class="refpurpose"> — Describes connection properties for Open vSwitch bridges.</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-setting-ovs-interface.html">nm-setting-ovs-interface</a></span><span class="refpurpose"> — Describes connection properties for Open vSwitch interfaces.</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-setting-ovs-patch.html">nm-setting-ovs-patch</a></span><span class="refpurpose"> — Describes connection properties for Open vSwitch patch interfaces.</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-setting-ovs-port.html">nm-setting-ovs-port</a></span><span class="refpurpose"> — Describes connection properties for Open vSwitch ports.</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="NMSettingPppoe.html">NMSettingPppoe</a></span><span class="refpurpose"> — Describes PPPoE connection properties</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="NMSettingPpp.html">NMSettingPpp</a></span><span class="refpurpose"> — Describes connection properties for devices/networks
 that require PPP to deliver IP capability</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSettingPppoe.html">NMSettingPppoe</a></span><span class="refpurpose"> — Describes PPPoE connection properties</span>
+<span class="refentrytitle"><a href="NMSettingProxy.html">NMSettingProxy</a></span><span class="refpurpose"> — Describes proxy URL, script and other related properties</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMSettingSerial.html">NMSettingSerial</a></span><span class="refpurpose"> — Describes connection properties for devices that use
 serial communications</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSettingTeam.html">NMSettingTeam</a></span><span class="refpurpose"> — Describes connection properties for teams</span>
+<span class="refentrytitle"><a href="libnm-nm-setting-tc-config.html">nm-setting-tc-config</a></span><span class="refpurpose"> — Describes connection properties for the Linux Traffic Control</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMSettingTeamPort.html">NMSettingTeamPort</a></span><span class="refpurpose"> — Describes connection properties for team ports</span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="NMSettingTeam.html">NMSettingTeam</a></span><span class="refpurpose"> — Describes connection properties for teams</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="NMSettingTun.html">NMSettingTun</a></span><span class="refpurpose"> — Describes connection properties for TUN/TAP interfaces</span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="libnm-nm-setting-user.html">nm-setting-user</a></span><span class="refpurpose"> — Describes user properties</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="NMSettingVlan.html">NMSettingVlan</a></span><span class="refpurpose"> — Describes connection properties for VLAN interfaces</span>
 </dt>
 <dt>
@@ -129,12 +153,12 @@ serial communications</span>
 <span class="refentrytitle"><a href="NMSettingWired.html">NMSettingWired</a></span><span class="refpurpose"> — Describes connection properties for Ethernet-based networks</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSettingWireless.html">NMSettingWireless</a></span><span class="refpurpose"> — Describes connection properties for 802.11 Wi-Fi networks</span>
-</dt>
-<dt>
 <span class="refentrytitle"><a href="NMSettingWirelessSecurity.html">NMSettingWirelessSecurity</a></span><span class="refpurpose"> — Describes connection properties for Wi-Fi networks that
 use WEP, LEAP, WPA or WPA2/RSN security</span>
 </dt>
+<dt>
+<span class="refentrytitle"><a href="NMSettingWireless.html">NMSettingWireless</a></span><span class="refpurpose"> — Describes connection properties for 802.11 Wi-Fi networks</span>
+</dt>
 </dl></div>
 </div>
 <div class="footer">
diff --git a/docs/libnm/html/ch04.html b/docs/libnm/html/ch04.html
index 65d59372..457c9b8b 100644
--- a/docs/libnm/html/ch04.html
+++ b/docs/libnm/html/ch04.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
-<link rel="prev" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
+<link rel="prev" href="NMSettingWireless.html" title="NMSettingWireless">
 <link rel="next" href="NMDevice.html" title="NMDevice">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -16,7 +16,7 @@
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
-<td><a accesskey="p" href="NMSettingWirelessSecurity.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="NMSettingWireless.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="NMDevice.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
@@ -66,6 +66,18 @@
 <span class="refentrytitle"><a href="NMDeviceOlpcMesh.html">NMDeviceOlpcMesh</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="libnm-nm-device-ovs-bridge.html">nm-device-ovs-bridge</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-device-ovs-interface.html">nm-device-ovs-interface</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-device-ovs-port.html">nm-device-ovs-port</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-device-ppp.html">nm-device-ppp</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="NMDeviceTeam.html">NMDeviceTeam</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
@@ -90,9 +102,6 @@
 <span class="refentrytitle"><a href="NMVpnConnection.html">NMVpnConnection</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMRemoteConnection.html">NMRemoteConnection</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
 <span class="refentrytitle"><a href="NMAccessPoint.html">NMAccessPoint</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
@@ -104,6 +113,9 @@
 <dt>
 <span class="refentrytitle"><a href="NMDhcpConfig.html">NMDhcpConfig</a></span><span class="refpurpose"></span>
 </dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-checkpoint.html">nm-checkpoint</a></span><span class="refpurpose"></span>
+</dt>
 </dl></div>
 </div>
 <div class="footer">
diff --git a/docs/libnm/html/ch05.html b/docs/libnm/html/ch05.html
index 072f1900..d14f04b8 100644
--- a/docs/libnm/html/ch05.html
+++ b/docs/libnm/html/ch05.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
-<link rel="prev" href="NMDhcpConfig.html" title="NMDhcpConfig">
+<link rel="prev" href="libnm-nm-checkpoint.html" title="nm-checkpoint">
 <link rel="next" href="libnm-nm-utils.html" title="nm-utils">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -16,7 +16,7 @@
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
-<td><a accesskey="p" href="NMDhcpConfig.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="libnm-nm-checkpoint.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="libnm-nm-utils.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
diff --git a/docs/libnm/html/ch06.html b/docs/libnm/html/ch06.html
index c38a2b79..2b0a97d8 100644
--- a/docs/libnm/html/ch06.html
+++ b/docs/libnm/html/ch06.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="libnm-nm-version.html" title="nm-version">
-<link rel="next" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">
+<link rel="next" href="libnm-nm-vpn-service-plugin.html" title="nm-vpn-service-plugin">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -17,18 +17,27 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
 <td><a accesskey="p" href="libnm-nm-version.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="libnm-nm-vpn-dbus-interface.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="libnm-nm-vpn-service-plugin.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h1 class="title">
 <a name="id-1.7"></a>VPN Plugin API Reference</h1></div></div></div>
 <div class="toc"><dl class="toc">
 <dt>
-<span class="refentrytitle"><a href="libnm-nm-vpn-dbus-interface.html">nm-vpn-dbus-interface</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="libnm-nm-vpn-service-plugin.html">nm-vpn-service-plugin</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-vpn-plugin-info.html">nm-vpn-plugin-info</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="NMVpnEditor.html">NMVpnEditor</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMVpnEditorPlugin.html">NMVpnEditorPlugin</a></span><span class="refpurpose"></span>
 </dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-vpn-plugin-old.html">nm-vpn-plugin-old</a></span><span class="refpurpose"></span>
+</dt>
 </dl></div>
 </div>
 <div class="footer">
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index 15c305e6..56924e52 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm 1.11.90
+      for libnm 1.12.0
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm/stable/" target="_top">https://developer.gnome.org/libnm/stable/</a>.
@@ -76,7 +76,10 @@
 <span class="refentrytitle"><a href="NMConnection.html">NMConnection</a></span><span class="refpurpose"> — Describes a connection to specific network or provider</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSimpleConnection.html">NMSimpleConnection</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="NMSimpleConnection.html">NMSimpleConnection</a></span><span class="refpurpose"> — An unmanaged connection</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="NMRemoteConnection.html">NMRemoteConnection</a></span><span class="refpurpose"> — A connection managed by NetworkManager server</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMSetting.html">NMSetting</a></span><span class="refpurpose"> — Describes related configuration information</span>
@@ -97,10 +100,10 @@
 <span class="refentrytitle"><a href="NMSettingBond.html">NMSettingBond</a></span><span class="refpurpose"> — Describes connection properties for bonds</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSettingBridge.html">NMSettingBridge</a></span><span class="refpurpose"> — Describes connection properties for bridges</span>
+<span class="refentrytitle"><a href="NMSettingBridgePort.html">NMSettingBridgePort</a></span><span class="refpurpose"> — Describes connection properties for bridge ports</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSettingBridgePort.html">NMSettingBridgePort</a></span><span class="refpurpose"> — Describes connection properties for bridge ports</span>
+<span class="refentrytitle"><a href="NMSettingBridge.html">NMSettingBridge</a></span><span class="refpurpose"> — Describes connection properties for bridges</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMSettingCdma.html">NMSettingCdma</a></span><span class="refpurpose"> — Describes CDMA-based mobile broadband properties</span>
@@ -143,26 +146,47 @@
 <span class="refentrytitle"><a href="NMSettingOlpcMesh.html">NMSettingOlpcMesh</a></span><span class="refpurpose"> — Describes connection properties for OLPC-Mesh devices</span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="libnm-nm-setting-ovs-bridge.html">nm-setting-ovs-bridge</a></span><span class="refpurpose"> — Describes connection properties for Open vSwitch bridges.</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-setting-ovs-interface.html">nm-setting-ovs-interface</a></span><span class="refpurpose"> — Describes connection properties for Open vSwitch interfaces.</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-setting-ovs-patch.html">nm-setting-ovs-patch</a></span><span class="refpurpose"> — Describes connection properties for Open vSwitch patch interfaces.</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-setting-ovs-port.html">nm-setting-ovs-port</a></span><span class="refpurpose"> — Describes connection properties for Open vSwitch ports.</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="NMSettingPppoe.html">NMSettingPppoe</a></span><span class="refpurpose"> — Describes PPPoE connection properties</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="NMSettingPpp.html">NMSettingPpp</a></span><span class="refpurpose"> — Describes connection properties for devices/networks
 that require PPP to deliver IP capability</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSettingPppoe.html">NMSettingPppoe</a></span><span class="refpurpose"> — Describes PPPoE connection properties</span>
+<span class="refentrytitle"><a href="NMSettingProxy.html">NMSettingProxy</a></span><span class="refpurpose"> — Describes proxy URL, script and other related properties</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMSettingSerial.html">NMSettingSerial</a></span><span class="refpurpose"> — Describes connection properties for devices that use
 serial communications</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSettingTeam.html">NMSettingTeam</a></span><span class="refpurpose"> — Describes connection properties for teams</span>
+<span class="refentrytitle"><a href="libnm-nm-setting-tc-config.html">nm-setting-tc-config</a></span><span class="refpurpose"> — Describes connection properties for the Linux Traffic Control</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMSettingTeamPort.html">NMSettingTeamPort</a></span><span class="refpurpose"> — Describes connection properties for team ports</span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="NMSettingTeam.html">NMSettingTeam</a></span><span class="refpurpose"> — Describes connection properties for teams</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="NMSettingTun.html">NMSettingTun</a></span><span class="refpurpose"> — Describes connection properties for TUN/TAP interfaces</span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="libnm-nm-setting-user.html">nm-setting-user</a></span><span class="refpurpose"> — Describes user properties</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="NMSettingVlan.html">NMSettingVlan</a></span><span class="refpurpose"> — Describes connection properties for VLAN interfaces</span>
 </dt>
 <dt>
@@ -178,12 +202,12 @@ serial communications</span>
 <span class="refentrytitle"><a href="NMSettingWired.html">NMSettingWired</a></span><span class="refpurpose"> — Describes connection properties for Ethernet-based networks</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMSettingWireless.html">NMSettingWireless</a></span><span class="refpurpose"> — Describes connection properties for 802.11 Wi-Fi networks</span>
-</dt>
-<dt>
 <span class="refentrytitle"><a href="NMSettingWirelessSecurity.html">NMSettingWirelessSecurity</a></span><span class="refpurpose"> — Describes connection properties for Wi-Fi networks that
 use WEP, LEAP, WPA or WPA2/RSN security</span>
 </dt>
+<dt>
+<span class="refentrytitle"><a href="NMSettingWireless.html">NMSettingWireless</a></span><span class="refpurpose"> — Describes connection properties for 802.11 Wi-Fi networks</span>
+</dt>
 </dl></dd>
 <dt><span class="chapter"><a href="ch04.html">Device and Runtime Configuration API Reference</a></span></dt>
 <dd><dl>
@@ -230,6 +254,18 @@ use WEP, LEAP, WPA or WPA2/RSN security</span>
 <span class="refentrytitle"><a href="NMDeviceOlpcMesh.html">NMDeviceOlpcMesh</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
+<span class="refentrytitle"><a href="libnm-nm-device-ovs-bridge.html">nm-device-ovs-bridge</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-device-ovs-interface.html">nm-device-ovs-interface</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-device-ovs-port.html">nm-device-ovs-port</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-device-ppp.html">nm-device-ppp</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="NMDeviceTeam.html">NMDeviceTeam</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
@@ -254,9 +290,6 @@ use WEP, LEAP, WPA or WPA2/RSN security</span>
 <span class="refentrytitle"><a href="NMVpnConnection.html">NMVpnConnection</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="NMRemoteConnection.html">NMRemoteConnection</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
 <span class="refentrytitle"><a href="NMAccessPoint.html">NMAccessPoint</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
@@ -268,6 +301,9 @@ use WEP, LEAP, WPA or WPA2/RSN security</span>
 <dt>
 <span class="refentrytitle"><a href="NMDhcpConfig.html">NMDhcpConfig</a></span><span class="refpurpose"></span>
 </dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-checkpoint.html">nm-checkpoint</a></span><span class="refpurpose"></span>
+</dt>
 </dl></dd>
 <dt><span class="chapter"><a href="ch05.html">Utility API Reference</a></span></dt>
 <dd><dl>
@@ -281,11 +317,20 @@ use WEP, LEAP, WPA or WPA2/RSN security</span>
 <dt><span class="chapter"><a href="ch06.html">VPN Plugin API Reference</a></span></dt>
 <dd><dl>
 <dt>
-<span class="refentrytitle"><a href="libnm-nm-vpn-dbus-interface.html">nm-vpn-dbus-interface</a></span><span class="refpurpose"></span>
+<span class="refentrytitle"><a href="libnm-nm-vpn-service-plugin.html">nm-vpn-service-plugin</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-vpn-plugin-info.html">nm-vpn-plugin-info</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="NMVpnEditor.html">NMVpnEditor</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMVpnEditorPlugin.html">NMVpnEditorPlugin</a></span><span class="refpurpose"></span>
 </dt>
+<dt>
+<span class="refentrytitle"><a href="libnm-nm-vpn-plugin-old.html">nm-vpn-plugin-old</a></span><span class="refpurpose"></span>
+</dt>
 </dl></dd>
 <dt><span class="chapter"><a href="object-tree.html">Object Hierarchy</a></span></dt>
 <dt><span class="index"><a href="api-index-full.html">API Index</a></span></dt>
diff --git a/docs/libnm/html/libnm-nm-checkpoint.html b/docs/libnm/html/libnm-nm-checkpoint.html
new file mode 100644
index 00000000..de43b78b
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-checkpoint.html
@@ -0,0 +1,204 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-checkpoint: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
+<link rel="prev" href="NMDhcpConfig.html" title="NMDhcpConfig">
+<link rel="next" href="ch05.html" title="Utility API Reference">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-checkpoint.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="NMDhcpConfig.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="ch05.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-checkpoint"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-checkpoint.top_of_page"></a>nm-checkpoint</span></h2>
+<p>nm-checkpoint</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-checkpoint.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-checkpoint.html#nm-checkpoint-get-devices" title="nm_checkpoint_get_devices ()">nm_checkpoint_get_devices</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-checkpoint.html#nm-checkpoint-get-created" title="nm_checkpoint_get_created ()">nm_checkpoint_get_created</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-checkpoint.html#nm-checkpoint-get-rollback-timeout" title="nm_checkpoint_get_rollback_timeout ()">nm_checkpoint_get_rollback_timeout</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-checkpoint.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-checkpoint.html#NM-CHECKPOINT-DEVICES:CAPS" title="NM_CHECKPOINT_DEVICES">NM_CHECKPOINT_DEVICES</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-checkpoint.html#NM-CHECKPOINT-CREATED:CAPS" title="NM_CHECKPOINT_CREATED">NM_CHECKPOINT_CREATED</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-checkpoint.html#NM-CHECKPOINT-ROLLBACK-TIMEOUT:CAPS" title="NM_CHECKPOINT_ROLLBACK_TIMEOUT">NM_CHECKPOINT_ROLLBACK_TIMEOUT</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-checkpoint.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-checkpoint.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="nm-checkpoint-get-devices"></a><h3>nm_checkpoint_get_devices ()</h3>
+<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *
+nm_checkpoint_get_devices (<em class="parameter"><code><span class="type">NMCheckpoint</span> *checkpoint</code></em>);</pre>
+<p>The devices that are part of this checkpoint.</p>
+<div class="refsect3">
+<a name="nm-checkpoint-get-devices.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>checkpoint</p></td>
+<td class="parameter_description"><p>a <span class="type">NMCheckpoint</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-checkpoint-get-devices.returns"></a><h4>Returns</h4>
+<p>the devices list. </p>
+<p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-checkpoint-get-created"></a><h3>nm_checkpoint_get_created ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
+nm_checkpoint_get_created (<em class="parameter"><code><span class="type">NMCheckpoint</span> *checkpoint</code></em>);</pre>
+<p>Gets the timestamp (in CLOCK_BOOTTIME milliseconds) of checkpoint creation.</p>
+<p>Use <a class="link" href="libnm-nm-utils.html#nm-utils-get-timestamp-msec" title="nm_utils_get_timestamp_msec ()"><code class="function">nm_utils_get_timestamp_msec()</code></a> to obtain current time value suitable for
+comparing to this value.</p>
+<div class="refsect3">
+<a name="nm-checkpoint-get-created.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>checkpoint</p></td>
+<td class="parameter_description"><p>a <span class="type">NMCheckpoint</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-checkpoint-get-created.returns"></a><h4>Returns</h4>
+<p> the timestamp of checkpoint creation.</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-checkpoint-get-rollback-timeout"></a><h3>nm_checkpoint_get_rollback_timeout ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+nm_checkpoint_get_rollback_timeout (<em class="parameter"><code><span class="type">NMCheckpoint</span> *checkpoint</code></em>);</pre>
+<p>Gets the the timeout in seconds for automatic rollback.</p>
+<div class="refsect3">
+<a name="nm-checkpoint-get-rollback-timeout.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>checkpoint</p></td>
+<td class="parameter_description"><p>a <span class="type">NMCheckpoint</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-checkpoint-get-rollback-timeout.returns"></a><h4>Returns</h4>
+<p> the rollback timeout.</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-checkpoint.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NM-CHECKPOINT-DEVICES:CAPS"></a><h3>NM_CHECKPOINT_DEVICES</h3>
+<pre class="programlisting">#define NM_CHECKPOINT_DEVICES          "devices"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-CHECKPOINT-CREATED:CAPS"></a><h3>NM_CHECKPOINT_CREATED</h3>
+<pre class="programlisting">#define NM_CHECKPOINT_CREATED          "created"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-CHECKPOINT-ROLLBACK-TIMEOUT:CAPS"></a><h3>NM_CHECKPOINT_ROLLBACK_TIMEOUT</h3>
+<pre class="programlisting">#define NM_CHECKPOINT_ROLLBACK_TIMEOUT "rollback-timeout"
+</pre>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 03257ef2..19e86974 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -1146,21 +1146,21 @@ GSM/UMTS, or LTE network access protocols</p>
 <tr>
 <td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-OVS-INTERFACE:CAPS"></a>NM_DEVICE_TYPE_OVS_INTERFACE</p></td>
 <td class="enum_member_description">
-<p>a OpenVSwitch interface</p>
+<p>a Open vSwitch interface</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
 <tr>
 <td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-OVS-PORT:CAPS"></a>NM_DEVICE_TYPE_OVS_PORT</p></td>
 <td class="enum_member_description">
-<p>a OpenVSwitch port</p>
+<p>a Open vSwitch port</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
 <tr>
 <td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-OVS-BRIDGE:CAPS"></a>NM_DEVICE_TYPE_OVS_BRIDGE</p></td>
 <td class="enum_member_description">
-<p>a OpenVSwitch bridge</p>
+<p>a Open vSwitch bridge</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -2256,7 +2256,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 <tr>
 <td class="enum_member_name"><p><a name="NM-DEVICE-STATE-REASON-OVSDB-FAILED:CAPS"></a>NM_DEVICE_STATE_REASON_OVSDB_FAILED</p></td>
 <td class="enum_member_description">
-<p>problem communicating with OpenVSwitch database</p>
+<p>problem communicating with Open vSwitch database</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
diff --git a/docs/libnm/html/libnm-nm-device-ovs-bridge.html b/docs/libnm/html/libnm-nm-device-ovs-bridge.html
new file mode 100644
index 00000000..7e48db31
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-device-ovs-bridge.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-device-ovs-bridge: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
+<link rel="prev" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">
+<link rel="next" href="libnm-nm-device-ovs-interface.html" title="nm-device-ovs-interface">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-device-ovs-bridge.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="NMDeviceOlpcMesh.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libnm-nm-device-ovs-interface.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-device-ovs-bridge"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-device-ovs-bridge.top_of_page"></a>nm-device-ovs-bridge</span></h2>
+<p>nm-device-ovs-bridge</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-device-ovs-bridge.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-device-ovs-bridge.functions_details"></a><h2>Functions</h2>
+<p></p>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-device-ovs-bridge.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-device-ovs-interface.html b/docs/libnm/html/libnm-nm-device-ovs-interface.html
new file mode 100644
index 00000000..8c5b6b67
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-device-ovs-interface.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-device-ovs-interface: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
+<link rel="prev" href="libnm-nm-device-ovs-bridge.html" title="nm-device-ovs-bridge">
+<link rel="next" href="libnm-nm-device-ovs-port.html" title="nm-device-ovs-port">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-device-ovs-interface.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libnm-nm-device-ovs-bridge.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libnm-nm-device-ovs-port.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-device-ovs-interface"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-device-ovs-interface.top_of_page"></a>nm-device-ovs-interface</span></h2>
+<p>nm-device-ovs-interface</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-device-ovs-interface.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-device-ovs-interface.functions_details"></a><h2>Functions</h2>
+<p></p>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-device-ovs-interface.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-device-ovs-port.html b/docs/libnm/html/libnm-nm-device-ovs-port.html
new file mode 100644
index 00000000..9f454287
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-device-ovs-port.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-device-ovs-port: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
+<link rel="prev" href="libnm-nm-device-ovs-interface.html" title="nm-device-ovs-interface">
+<link rel="next" href="libnm-nm-device-ppp.html" title="nm-device-ppp">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-device-ovs-port.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libnm-nm-device-ovs-interface.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libnm-nm-device-ppp.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-device-ovs-port"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-device-ovs-port.top_of_page"></a>nm-device-ovs-port</span></h2>
+<p>nm-device-ovs-port</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-device-ovs-port.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-device-ovs-port.functions_details"></a><h2>Functions</h2>
+<p></p>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-device-ovs-port.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-device-ppp.html b/docs/libnm/html/libnm-nm-device-ppp.html
new file mode 100644
index 00000000..07b4ce34
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-device-ppp.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-device-ppp: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
+<link rel="prev" href="libnm-nm-device-ovs-port.html" title="nm-device-ovs-port">
+<link rel="next" href="NMDeviceTeam.html" title="NMDeviceTeam">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-device-ppp.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libnm-nm-device-ovs-port.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMDeviceTeam.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-device-ppp"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-device-ppp.top_of_page"></a>nm-device-ppp</span></h2>
+<p>nm-device-ppp</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-device-ppp.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-device-ppp.functions_details"></a><h2>Functions</h2>
+<p></p>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-device-ppp.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-setting-ovs-bridge.html b/docs/libnm/html/libnm-nm-setting-ovs-bridge.html
new file mode 100644
index 00000000..269f5362
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-setting-ovs-bridge.html
@@ -0,0 +1,276 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-setting-ovs-bridge: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch03.html" title="Connection and Setting API Reference">
+<link rel="prev" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
+<link rel="next" href="libnm-nm-setting-ovs-interface.html" title="nm-setting-ovs-interface">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-setting-ovs-bridge.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="NMSettingOlpcMesh.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libnm-nm-setting-ovs-interface.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-setting-ovs-bridge"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-setting-ovs-bridge.top_of_page"></a>nm-setting-ovs-bridge</span></h2>
+<p>nm-setting-ovs-bridge — Describes connection properties for Open vSwitch bridges.</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-bridge.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-new" title="nm_setting_ovs_bridge_new ()">nm_setting_ovs_bridge_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-get-fail-mode" title="nm_setting_ovs_bridge_get_fail_mode ()">nm_setting_ovs_bridge_get_fail_mode</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-get-mcast-snooping-enable" title="nm_setting_ovs_bridge_get_mcast_snooping_enable ()">nm_setting_ovs_bridge_get_mcast_snooping_enable</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-get-rstp-enable" title="nm_setting_ovs_bridge_get_rstp_enable ()">nm_setting_ovs_bridge_get_rstp_enable</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-get-stp-enable" title="nm_setting_ovs_bridge_get_stp_enable ()">nm_setting_ovs_bridge_get_stp_enable</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-bridge.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-SETTING-NAME:CAPS" title="NM_SETTING_OVS_BRIDGE_SETTING_NAME">NM_SETTING_OVS_BRIDGE_SETTING_NAME</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-FAIL-MODE:CAPS" title="NM_SETTING_OVS_BRIDGE_FAIL_MODE">NM_SETTING_OVS_BRIDGE_FAIL_MODE</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-MCAST-SNOOPING-ENABLE:CAPS" title="NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE">NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-RSTP-ENABLE:CAPS" title="NM_SETTING_OVS_BRIDGE_RSTP_ENABLE">NM_SETTING_OVS_BRIDGE_RSTP_ENABLE</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-STP-ENABLE:CAPS" title="NM_SETTING_OVS_BRIDGE_STP_ENABLE">NM_SETTING_OVS_BRIDGE_STP_ENABLE</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-bridge.description"></a><h2>Description</h2>
+<p>The <span class="type">NMSettingOvsBridge</span> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes properties
+necessary for Open vSwitch bridges.</p>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-bridge.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="nm-setting-ovs-bridge-new"></a><h3>nm_setting_ovs_bridge_new ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+nm_setting_ovs_bridge_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Creates a new <span class="type">NMSettingOvsBridge</span> object with default values.</p>
+<div class="refsect3">
+<a name="nm-setting-ovs-bridge-new.returns"></a><h4>Returns</h4>
+<p>the new empty <span class="type">NMSettingOvsBridge</span> 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>
+<p class="since">Since: 1.10</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ovs-bridge-get-fail-mode"></a><h3>nm_setting_ovs_bridge_get_fail_mode ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_ovs_bridge_get_fail_mode (<em class="parameter"><code><span class="type">NMSettingOvsBridge</span> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ovs-bridge-get-fail-mode.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingOvsBridge</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ovs-bridge-get-fail-mode.returns"></a><h4>Returns</h4>
+<p> the <span class="type">“fail_mode”</span> property of the setting</p>
+</div>
+<p class="since">Since: 1.10</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ovs-bridge-get-mcast-snooping-enable"></a><h3>nm_setting_ovs_bridge_get_mcast_snooping_enable ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_ovs_bridge_get_mcast_snooping_enable
+                               (<em class="parameter"><code><span class="type">NMSettingOvsBridge</span> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ovs-bridge-get-mcast-snooping-enable.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingOvsBridge</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ovs-bridge-get-mcast-snooping-enable.returns"></a><h4>Returns</h4>
+<p> the <span class="type">“mcast_snooping_enable”</span> property of the setting</p>
+</div>
+<p class="since">Since: 1.10</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ovs-bridge-get-rstp-enable"></a><h3>nm_setting_ovs_bridge_get_rstp_enable ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_ovs_bridge_get_rstp_enable (<em class="parameter"><code><span class="type">NMSettingOvsBridge</span> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ovs-bridge-get-rstp-enable.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingOvsBridge</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ovs-bridge-get-rstp-enable.returns"></a><h4>Returns</h4>
+<p> the <span class="type">“rstp_enable”</span> property of the setting</p>
+</div>
+<p class="since">Since: 1.10</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ovs-bridge-get-stp-enable"></a><h3>nm_setting_ovs_bridge_get_stp_enable ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_ovs_bridge_get_stp_enable (<em class="parameter"><code><span class="type">NMSettingOvsBridge</span> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ovs-bridge-get-stp-enable.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingOvsBridge</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ovs-bridge-get-stp-enable.returns"></a><h4>Returns</h4>
+<p> the <span class="type">“stp_enable”</span> property of the setting</p>
+</div>
+<p class="since">Since: 1.10</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-bridge.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-BRIDGE-SETTING-NAME:CAPS"></a><h3>NM_SETTING_OVS_BRIDGE_SETTING_NAME</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_BRIDGE_SETTING_NAME          "ovs-bridge"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-BRIDGE-FAIL-MODE:CAPS"></a><h3>NM_SETTING_OVS_BRIDGE_FAIL_MODE</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_BRIDGE_FAIL_MODE             "fail-mode"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-BRIDGE-MCAST-SNOOPING-ENABLE:CAPS"></a><h3>NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE "mcast-snooping-enable"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-BRIDGE-RSTP-ENABLE:CAPS"></a><h3>NM_SETTING_OVS_BRIDGE_RSTP_ENABLE</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_BRIDGE_RSTP_ENABLE           "rstp-enable"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-BRIDGE-STP-ENABLE:CAPS"></a><h3>NM_SETTING_OVS_BRIDGE_STP_ENABLE</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_BRIDGE_STP_ENABLE            "stp-enable"
+</pre>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-setting-ovs-interface.html b/docs/libnm/html/libnm-nm-setting-ovs-interface.html
new file mode 100644
index 00000000..f56c3b3f
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-setting-ovs-interface.html
@@ -0,0 +1,144 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-setting-ovs-interface: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch03.html" title="Connection and Setting API Reference">
+<link rel="prev" href="libnm-nm-setting-ovs-bridge.html" title="nm-setting-ovs-bridge">
+<link rel="next" href="libnm-nm-setting-ovs-patch.html" title="nm-setting-ovs-patch">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-setting-ovs-interface.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libnm-nm-setting-ovs-bridge.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libnm-nm-setting-ovs-patch.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-setting-ovs-interface"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-setting-ovs-interface.top_of_page"></a>nm-setting-ovs-interface</span></h2>
+<p>nm-setting-ovs-interface — Describes connection properties for Open vSwitch interfaces.</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-interface.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-interface.html#nm-setting-ovs-interface-new" title="nm_setting_ovs_interface_new ()">nm_setting_ovs_interface_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-interface.html#nm-setting-ovs-interface-get-interface-type" title="nm_setting_ovs_interface_get_interface_type ()">nm_setting_ovs_interface_get_interface_type</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-interface.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-interface.html#NM-SETTING-OVS-INTERFACE-SETTING-NAME:CAPS" title="NM_SETTING_OVS_INTERFACE_SETTING_NAME">NM_SETTING_OVS_INTERFACE_SETTING_NAME</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-interface.html#NM-SETTING-OVS-INTERFACE-TYPE:CAPS" title="NM_SETTING_OVS_INTERFACE_TYPE">NM_SETTING_OVS_INTERFACE_TYPE</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-interface.description"></a><h2>Description</h2>
+<p>The <span class="type">NMSettingOvsInterface</span> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes properties
+necessary for Open vSwitch interfaces.</p>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-interface.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="nm-setting-ovs-interface-new"></a><h3>nm_setting_ovs_interface_new ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+nm_setting_ovs_interface_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Creates a new <span class="type">NMSettingOvsInterface</span> object with default values.</p>
+<div class="refsect3">
+<a name="nm-setting-ovs-interface-new.returns"></a><h4>Returns</h4>
+<p>the new empty <span class="type">NMSettingOvsInterface</span> 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>
+<p class="since">Since: 1.10</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ovs-interface-get-interface-type"></a><h3>nm_setting_ovs_interface_get_interface_type ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_ovs_interface_get_interface_type
+                               (<em class="parameter"><code><span class="type">NMSettingOvsInterface</span> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ovs-interface-get-interface-type.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingOvsInterface</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ovs-interface-get-interface-type.returns"></a><h4>Returns</h4>
+<p> the <span class="type">“type”</span> property of the setting</p>
+</div>
+<p class="since">Since: 1.10</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-interface.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-INTERFACE-SETTING-NAME:CAPS"></a><h3>NM_SETTING_OVS_INTERFACE_SETTING_NAME</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_INTERFACE_SETTING_NAME "ovs-interface"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-INTERFACE-TYPE:CAPS"></a><h3>NM_SETTING_OVS_INTERFACE_TYPE</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_INTERFACE_TYPE         "type"
+</pre>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-setting-ovs-patch.html b/docs/libnm/html/libnm-nm-setting-ovs-patch.html
new file mode 100644
index 00000000..50dff9aa
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-setting-ovs-patch.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-setting-ovs-patch: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch03.html" title="Connection and Setting API Reference">
+<link rel="prev" href="libnm-nm-setting-ovs-interface.html" title="nm-setting-ovs-interface">
+<link rel="next" href="libnm-nm-setting-ovs-port.html" title="nm-setting-ovs-port">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-setting-ovs-patch.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libnm-nm-setting-ovs-interface.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libnm-nm-setting-ovs-port.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-setting-ovs-patch"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-setting-ovs-patch.top_of_page"></a>nm-setting-ovs-patch</span></h2>
+<p>nm-setting-ovs-patch — Describes connection properties for Open vSwitch patch interfaces.</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-patch.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-patch.html#nm-setting-ovs-patch-new" title="nm_setting_ovs_patch_new ()">nm_setting_ovs_patch_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-patch.html#nm-setting-ovs-patch-get-peer" title="nm_setting_ovs_patch_get_peer ()">nm_setting_ovs_patch_get_peer</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-patch.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-patch.html#NM-SETTING-OVS-PATCH-SETTING-NAME:CAPS" title="NM_SETTING_OVS_PATCH_SETTING_NAME">NM_SETTING_OVS_PATCH_SETTING_NAME</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-patch.html#NM-SETTING-OVS-PATCH-PEER:CAPS" title="NM_SETTING_OVS_PATCH_PEER">NM_SETTING_OVS_PATCH_PEER</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-patch.description"></a><h2>Description</h2>
+<p>The <span class="type">NMSettingOvsPatch</span> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes properties
+necessary for Open vSwitch interfaces of type "patch".</p>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-patch.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="nm-setting-ovs-patch-new"></a><h3>nm_setting_ovs_patch_new ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+nm_setting_ovs_patch_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Creates a new <span class="type">NMSettingOvsPatch</span> object with default values.</p>
+<div class="refsect3">
+<a name="nm-setting-ovs-patch-new.returns"></a><h4>Returns</h4>
+<p>the new empty <span class="type">NMSettingOvsPatch</span> 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>
+<p class="since">Since: 1.10</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ovs-patch-get-peer"></a><h3>nm_setting_ovs_patch_get_peer ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_ovs_patch_get_peer (<em class="parameter"><code><span class="type">NMSettingOvsPatch</span> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ovs-patch-get-peer.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingOvsPatch</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ovs-patch-get-peer.returns"></a><h4>Returns</h4>
+<p> the <span class="type">“peer”</span> property of the setting</p>
+</div>
+<p class="since">Since: 1.10</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-patch.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-PATCH-SETTING-NAME:CAPS"></a><h3>NM_SETTING_OVS_PATCH_SETTING_NAME</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_PATCH_SETTING_NAME        "ovs-patch"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-PATCH-PEER:CAPS"></a><h3>NM_SETTING_OVS_PATCH_PEER</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_PATCH_PEER                "peer"
+</pre>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-setting-ovs-port.html b/docs/libnm/html/libnm-nm-setting-ovs-port.html
new file mode 100644
index 00000000..29783683
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-setting-ovs-port.html
@@ -0,0 +1,362 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-setting-ovs-port: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch03.html" title="Connection and Setting API Reference">
+<link rel="prev" href="libnm-nm-setting-ovs-patch.html" title="nm-setting-ovs-patch">
+<link rel="next" href="NMSettingPppoe.html" title="NMSettingPppoe">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-setting-ovs-port.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libnm-nm-setting-ovs-patch.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMSettingPppoe.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-setting-ovs-port"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-setting-ovs-port.top_of_page"></a>nm-setting-ovs-port</span></h2>
+<p>nm-setting-ovs-port — Describes connection properties for Open vSwitch ports.</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-port.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-new" title="nm_setting_ovs_port_new ()">nm_setting_ovs_port_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-vlan-mode" title="nm_setting_ovs_port_get_vlan_mode ()">nm_setting_ovs_port_get_vlan_mode</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-tag" title="nm_setting_ovs_port_get_tag ()">nm_setting_ovs_port_get_tag</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-lacp" title="nm_setting_ovs_port_get_lacp ()">nm_setting_ovs_port_get_lacp</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-bond-mode" title="nm_setting_ovs_port_get_bond_mode ()">nm_setting_ovs_port_get_bond_mode</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-bond-updelay" title="nm_setting_ovs_port_get_bond_updelay ()">nm_setting_ovs_port_get_bond_updelay</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-bond-downdelay" title="nm_setting_ovs_port_get_bond_downdelay ()">nm_setting_ovs_port_get_bond_downdelay</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-port.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-SETTING-NAME:CAPS" title="NM_SETTING_OVS_PORT_SETTING_NAME">NM_SETTING_OVS_PORT_SETTING_NAME</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-VLAN-MODE:CAPS" title="NM_SETTING_OVS_PORT_VLAN_MODE">NM_SETTING_OVS_PORT_VLAN_MODE</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-TAG:CAPS" title="NM_SETTING_OVS_PORT_TAG">NM_SETTING_OVS_PORT_TAG</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-LACP:CAPS" title="NM_SETTING_OVS_PORT_LACP">NM_SETTING_OVS_PORT_LACP</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-BOND-MODE:CAPS" title="NM_SETTING_OVS_PORT_BOND_MODE">NM_SETTING_OVS_PORT_BOND_MODE</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-BOND-UPDELAY:CAPS" title="NM_SETTING_OVS_PORT_BOND_UPDELAY">NM_SETTING_OVS_PORT_BOND_UPDELAY</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-BOND-DOWNDELAY:CAPS" title="NM_SETTING_OVS_PORT_BOND_DOWNDELAY">NM_SETTING_OVS_PORT_BOND_DOWNDELAY</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-port.description"></a><h2>Description</h2>
+<p>The <span class="type">NMSettingOvsPort</span> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes properties
+necessary for Open vSwitch ports.</p>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-port.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="nm-setting-ovs-port-new"></a><h3>nm_setting_ovs_port_new ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+nm_setting_ovs_port_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Creates a new <span class="type">NMSettingOvsPort</span> object with default values.</p>
+<div class="refsect3">
+<a name="nm-setting-ovs-port-new.returns"></a><h4>Returns</h4>
+<p>the new empty <span class="type">NMSettingOvsPort</span> 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>
+<p class="since">Since: 1.10</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ovs-port-get-vlan-mode"></a><h3>nm_setting_ovs_port_get_vlan_mode ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_ovs_port_get_vlan_mode (<em class="parameter"><code><span class="type">NMSettingOvsPort</span> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ovs-port-get-vlan-mode.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingOvsPort</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ovs-port-get-vlan-mode.returns"></a><h4>Returns</h4>
+<p> the <span class="type">“vlan-mode”</span> property of the setting</p>
+</div>
+<p class="since">Since: 1.10</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ovs-port-get-tag"></a><h3>nm_setting_ovs_port_get_tag ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+nm_setting_ovs_port_get_tag (<em class="parameter"><code><span class="type">NMSettingOvsPort</span> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ovs-port-get-tag.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingOvsPort</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ovs-port-get-tag.returns"></a><h4>Returns</h4>
+<p> the <span class="type">“tag”</span> property of the setting</p>
+</div>
+<p class="since">Since: 1.10</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ovs-port-get-lacp"></a><h3>nm_setting_ovs_port_get_lacp ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_ovs_port_get_lacp (<em class="parameter"><code><span class="type">NMSettingOvsPort</span> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ovs-port-get-lacp.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingOvsPort</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ovs-port-get-lacp.returns"></a><h4>Returns</h4>
+<p> the <span class="type">“lacp”</span> property of the setting</p>
+</div>
+<p class="since">Since: 1.10</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ovs-port-get-bond-mode"></a><h3>nm_setting_ovs_port_get_bond_mode ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_ovs_port_get_bond_mode (<em class="parameter"><code><span class="type">NMSettingOvsPort</span> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ovs-port-get-bond-mode.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingOvsPort</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ovs-port-get-bond-mode.returns"></a><h4>Returns</h4>
+<p> the <span class="type">“bond-mode”</span> property of the setting</p>
+</div>
+<p class="since">Since: 1.10</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ovs-port-get-bond-updelay"></a><h3>nm_setting_ovs_port_get_bond_updelay ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+nm_setting_ovs_port_get_bond_updelay (<em class="parameter"><code><span class="type">NMSettingOvsPort</span> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ovs-port-get-bond-updelay.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingOvsPort</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ovs-port-get-bond-updelay.returns"></a><h4>Returns</h4>
+<p> the <span class="type">“bond-updelay”</span> property of the setting</p>
+</div>
+<p class="since">Since: 1.10</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ovs-port-get-bond-downdelay"></a><h3>nm_setting_ovs_port_get_bond_downdelay ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+nm_setting_ovs_port_get_bond_downdelay
+                               (<em class="parameter"><code><span class="type">NMSettingOvsPort</span> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ovs-port-get-bond-downdelay.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingOvsPort</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ovs-port-get-bond-downdelay.returns"></a><h4>Returns</h4>
+<p> the <span class="type">“bond-downdelay”</span> property of the setting</p>
+</div>
+<p class="since">Since: 1.10</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-ovs-port.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-PORT-SETTING-NAME:CAPS"></a><h3>NM_SETTING_OVS_PORT_SETTING_NAME</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_PORT_SETTING_NAME        "ovs-port"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-PORT-VLAN-MODE:CAPS"></a><h3>NM_SETTING_OVS_PORT_VLAN_MODE</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_PORT_VLAN_MODE           "vlan-mode"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-PORT-TAG:CAPS"></a><h3>NM_SETTING_OVS_PORT_TAG</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_PORT_TAG                 "tag"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-PORT-LACP:CAPS"></a><h3>NM_SETTING_OVS_PORT_LACP</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_PORT_LACP                "lacp"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-PORT-BOND-MODE:CAPS"></a><h3>NM_SETTING_OVS_PORT_BOND_MODE</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_PORT_BOND_MODE           "bond-mode"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-PORT-BOND-UPDELAY:CAPS"></a><h3>NM_SETTING_OVS_PORT_BOND_UPDELAY</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_PORT_BOND_UPDELAY        "bond-updelay"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-PORT-BOND-DOWNDELAY:CAPS"></a><h3>NM_SETTING_OVS_PORT_BOND_DOWNDELAY</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_PORT_BOND_DOWNDELAY      "bond-downdelay"
+</pre>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-setting-tc-config.html b/docs/libnm/html/libnm-nm-setting-tc-config.html
new file mode 100644
index 00000000..6e1ca873
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-setting-tc-config.html
@@ -0,0 +1,1698 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-setting-tc-config: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch03.html" title="Connection and Setting API Reference">
+<link rel="prev" href="NMSettingSerial.html" title="NMSettingSerial">
+<link rel="next" href="NMSettingTeamPort.html" title="NMSettingTeamPort">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-setting-tc-config.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-setting-tc-config.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="NMSettingSerial.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMSettingTeamPort.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-setting-tc-config"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-setting-tc-config.top_of_page"></a>nm-setting-tc-config</span></h2>
+<p>nm-setting-tc-config — Describes connection properties for the Linux Traffic Control</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-setting-tc-config.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="returnvalue">NMTCQdisc</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-new" title="nm_tc_qdisc_new ()">nm_tc_qdisc_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-ref" title="nm_tc_qdisc_ref ()">nm_tc_qdisc_ref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-unref" title="nm_tc_qdisc_unref ()">nm_tc_qdisc_unref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-equal" title="nm_tc_qdisc_equal ()">nm_tc_qdisc_equal</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="returnvalue">NMTCQdisc</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-dup" title="nm_tc_qdisc_dup ()">nm_tc_qdisc_dup</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-get-kind" title="nm_tc_qdisc_get_kind ()">nm_tc_qdisc_get_kind</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-get-handle" title="nm_tc_qdisc_get_handle ()">nm_tc_qdisc_get_handle</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-set-handle" title="nm_tc_qdisc_set_handle ()">nm_tc_qdisc_set_handle</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-qdisc-get-parent" title="nm_tc_qdisc_get_parent ()">nm_tc_qdisc_get_parent</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="returnvalue">NMTCAction</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-new" title="nm_tc_action_new ()">nm_tc_action_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-ref" title="nm_tc_action_ref ()">nm_tc_action_ref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-unref" title="nm_tc_action_unref ()">nm_tc_action_unref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-equal" title="nm_tc_action_equal ()">nm_tc_action_equal</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="returnvalue">NMTCAction</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-dup" title="nm_tc_action_dup ()">nm_tc_action_dup</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-get-kind" title="nm_tc_action_get_kind ()">nm_tc_action_get_kind</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">char</span> **
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-get-attribute-names" title="nm_tc_action_get_attribute_names ()">nm_tc_action_get_attribute_names</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-get-attribute" title="nm_tc_action_get_attribute ()">nm_tc_action_get_attribute</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-action-set-attribute" title="nm_tc_action_set_attribute ()">nm_tc_action_set_attribute</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="returnvalue">NMTCTfilter</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-new" title="nm_tc_tfilter_new ()">nm_tc_tfilter_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-ref" title="nm_tc_tfilter_ref ()">nm_tc_tfilter_ref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-unref" title="nm_tc_tfilter_unref ()">nm_tc_tfilter_unref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-equal" title="nm_tc_tfilter_equal ()">nm_tc_tfilter_equal</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="returnvalue">NMTCTfilter</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-dup" title="nm_tc_tfilter_dup ()">nm_tc_tfilter_dup</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-get-kind" title="nm_tc_tfilter_get_kind ()">nm_tc_tfilter_get_kind</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-get-handle" title="nm_tc_tfilter_get_handle ()">nm_tc_tfilter_get_handle</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-set-handle" title="nm_tc_tfilter_set_handle ()">nm_tc_tfilter_set_handle</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-get-parent" title="nm_tc_tfilter_get_parent ()">nm_tc_tfilter_get_parent</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="returnvalue">NMTCAction</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-get-action" title="nm_tc_tfilter_get_action ()">nm_tc_tfilter_get_action</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-tc-tfilter-set-action" title="nm_tc_tfilter_set_action ()">nm_tc_tfilter_set_action</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-new" title="nm_setting_tc_config_new ()">nm_setting_tc_config_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-get-num-qdiscs" title="nm_setting_tc_config_get_num_qdiscs ()">nm_setting_tc_config_get_num_qdiscs</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="returnvalue">NMTCQdisc</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-get-qdisc" title="nm_setting_tc_config_get_qdisc ()">nm_setting_tc_config_get_qdisc</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-add-qdisc" title="nm_setting_tc_config_add_qdisc ()">nm_setting_tc_config_add_qdisc</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-remove-qdisc" title="nm_setting_tc_config_remove_qdisc ()">nm_setting_tc_config_remove_qdisc</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-remove-qdisc-by-value" title="nm_setting_tc_config_remove_qdisc_by_value ()">nm_setting_tc_config_remove_qdisc_by_value</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-clear-qdiscs" title="nm_setting_tc_config_clear_qdiscs ()">nm_setting_tc_config_clear_qdiscs</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-get-num-tfilters" title="nm_setting_tc_config_get_num_tfilters ()">nm_setting_tc_config_get_num_tfilters</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="returnvalue">NMTCTfilter</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-get-tfilter" title="nm_setting_tc_config_get_tfilter ()">nm_setting_tc_config_get_tfilter</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-add-tfilter" title="nm_setting_tc_config_add_tfilter ()">nm_setting_tc_config_add_tfilter</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-remove-tfilter" title="nm_setting_tc_config_remove_tfilter ()">nm_setting_tc_config_remove_tfilter</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-remove-tfilter-by-value" title="nm_setting_tc_config_remove_tfilter_by_value ()">nm_setting_tc_config_remove_tfilter_by_value</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-tc-config.html#nm-setting-tc-config-clear-tfilters" title="nm_setting_tc_config_clear_tfilters ()">nm_setting_tc_config_clear_tfilters</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<a name="NMTCAction"></a><a name="NMTCQdisc"></a><a name="NMTCTfilter"></a><div class="refsect1">
+<a name="libnm-nm-setting-tc-config.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-tc-config.html#NM-SETTING-TC-CONFIG-SETTING-NAME:CAPS" title="NM_SETTING_TC_CONFIG_SETTING_NAME">NM_SETTING_TC_CONFIG_SETTING_NAME</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-tc-config.html#NM-SETTING-TC-CONFIG-QDISCS:CAPS" title="NM_SETTING_TC_CONFIG_QDISCS">NM_SETTING_TC_CONFIG_QDISCS</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-tc-config.html#NM-SETTING-TC-CONFIG-TFILTERS:CAPS" title="NM_SETTING_TC_CONFIG_TFILTERS">NM_SETTING_TC_CONFIG_TFILTERS</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-tc-config.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
+    <span class="lineart">├──</span> NMTCAction
+    <span class="lineart">├──</span> NMTCQdisc
+    <span class="lineart">╰──</span> NMTCTfilter
+</pre>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-tc-config.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;nm-setting-tc-config.h&gt;
+</pre>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-tc-config.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-tc-config.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="nm-tc-qdisc-new"></a><h3>nm_tc_qdisc_new ()</h3>
+<pre class="programlisting"><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="returnvalue">NMTCQdisc</span></a> *
+nm_tc_qdisc_new (<em class="parameter"><code>const <span class="type">char</span> *kind</code></em>,
+                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> parent</code></em>,
+                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Creates a new <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> object.</p>
+<div class="refsect3">
+<a name="nm-tc-qdisc-new.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>kind</p></td>
+<td class="parameter_description"><p>name of the queueing discipline</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>parent</p></td>
+<td class="parameter_description"><p>the parent queueing discipline</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>location to store error, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-qdisc-new.returns"></a><h4>Returns</h4>
+<p>the new <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> 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>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-qdisc-ref"></a><h3>nm_tc_qdisc_ref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_tc_qdisc_ref (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>);</pre>
+<p>Increases the reference count of the object.</p>
+<div class="refsect3">
+<a name="nm-tc-qdisc-ref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>qdisc</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-qdisc-unref"></a><h3>nm_tc_qdisc_unref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_tc_qdisc_unref (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>);</pre>
+<p>Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.</p>
+<div class="refsect3">
+<a name="nm-tc-qdisc-unref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>qdisc</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-qdisc-equal"></a><h3>nm_tc_qdisc_equal ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_tc_qdisc_equal (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>,
+                   <em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *other</code></em>);</pre>
+<p>Determines if two <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> objects contain the same kind, * handle
+and parent.</p>
+<div class="refsect3">
+<a name="nm-tc-qdisc-equal.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>qdisc</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>other</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> to compare <em class="parameter"><code>qdisc</code></em>
+to.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-qdisc-equal.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the objects contain the same values, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not.</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-qdisc-dup"></a><h3>nm_tc_qdisc_dup ()</h3>
+<pre class="programlisting"><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="returnvalue">NMTCQdisc</span></a> *
+nm_tc_qdisc_dup (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>);</pre>
+<p>Creates a copy of <em class="parameter"><code>qdisc</code></em>
+</p>
+<div class="refsect3">
+<a name="nm-tc-qdisc-dup.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>qdisc</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-qdisc-dup.returns"></a><h4>Returns</h4>
+<p>a copy of <em class="parameter"><code>qdisc</code></em>
+. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-qdisc-get-kind"></a><h3>nm_tc_qdisc_get_kind ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_tc_qdisc_get_kind (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-tc-qdisc-get-kind.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>qdisc</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-qdisc-get-handle"></a><h3>nm_tc_qdisc_get_handle ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+nm_tc_qdisc_get_handle (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-tc-qdisc-get-handle.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>qdisc</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-qdisc-get-handle.returns"></a><h4>Returns</h4>
+<p> the queueing discipline handle</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-qdisc-set-handle"></a><h3>nm_tc_qdisc_set_handle ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_tc_qdisc_set_handle (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> handle</code></em>);</pre>
+<p>Sets the queueing discipline handle.</p>
+<div class="refsect3">
+<a name="nm-tc-qdisc-set-handle.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>qdisc</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>handle</p></td>
+<td class="parameter_description"><p>the queueing discipline handle</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-qdisc-get-parent"></a><h3>nm_tc_qdisc_get_parent ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+nm_tc_qdisc_get_parent (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-tc-qdisc-get-parent.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>qdisc</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-qdisc-get-parent.returns"></a><h4>Returns</h4>
+<p> the parent class</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-action-new"></a><h3>nm_tc_action_new ()</h3>
+<pre class="programlisting"><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="returnvalue">NMTCAction</span></a> *
+nm_tc_action_new (<em class="parameter"><code>const <span class="type">char</span> *kind</code></em>,
+                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Creates a new <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> object.</p>
+<div class="refsect3">
+<a name="nm-tc-action-new.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>kind</p></td>
+<td class="parameter_description"><p>name of the queueing discipline</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>location to store error, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-action-new.returns"></a><h4>Returns</h4>
+<p>the new <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> 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>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-action-ref"></a><h3>nm_tc_action_ref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_tc_action_ref (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> *action</code></em>);</pre>
+<p>Increases the reference count of the object.</p>
+<div class="refsect3">
+<a name="nm-tc-action-ref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>action</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-action-unref"></a><h3>nm_tc_action_unref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_tc_action_unref (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> *action</code></em>);</pre>
+<p>Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.</p>
+<div class="refsect3">
+<a name="nm-tc-action-unref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>action</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-action-equal"></a><h3>nm_tc_action_equal ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_tc_action_equal (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> *action</code></em>,
+                    <em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> *other</code></em>);</pre>
+<p>Determines if two <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> objects contain the same kind, family,
+handle, parent and info.</p>
+<div class="refsect3">
+<a name="nm-tc-action-equal.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>action</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>other</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> to compare <em class="parameter"><code>action</code></em>
+to.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-action-equal.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the objects contain the same values, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not.</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-action-dup"></a><h3>nm_tc_action_dup ()</h3>
+<pre class="programlisting"><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="returnvalue">NMTCAction</span></a> *
+nm_tc_action_dup (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> *action</code></em>);</pre>
+<p>Creates a copy of <em class="parameter"><code>action</code></em>
+</p>
+<div class="refsect3">
+<a name="nm-tc-action-dup.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>action</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-action-dup.returns"></a><h4>Returns</h4>
+<p>a copy of <em class="parameter"><code>action</code></em>
+. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-action-get-kind"></a><h3>nm_tc_action_get_kind ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_tc_action_get_kind (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> *action</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-tc-action-get-kind.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>action</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-action-get-attribute-names"></a><h3>nm_tc_action_get_attribute_names ()</h3>
+<pre class="programlisting"><span class="returnvalue">char</span> **
+nm_tc_action_get_attribute_names (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> *action</code></em>);</pre>
+<p>Gets an array of attribute names defined on <em class="parameter"><code>action</code></em>
+.</p>
+<div class="refsect3">
+<a name="nm-tc-action-get-attribute-names.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>action</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-action-get-attribute-names.returns"></a><h4>Returns</h4>
+<p>a <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of attribute names,. </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-tc-action-get-attribute"></a><h3>nm_tc_action_get_attribute ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
+nm_tc_action_get_attribute (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> *action</code></em>,
+                            <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
+<p>Gets the value of the attribute with name <em class="parameter"><code>name</code></em>
+ on <em class="parameter"><code>action</code></em>
+</p>
+<div class="refsect3">
+<a name="nm-tc-action-get-attribute.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>action</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>the name of an action attribute</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-action-get-attribute.returns"></a><h4>Returns</h4>
+<p>the value of the attribute with name <em class="parameter"><code>name</code></em>
+on
+<em class="parameter"><code>action</code></em>
+, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>action</code></em>
+has no such attribute. </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>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-action-set-attribute"></a><h3>nm_tc_action_set_attribute ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_tc_action_set_attribute (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> *action</code></em>,
+                            <em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> *value</code></em>);</pre>
+<p>Sets or clears the named attribute on <em class="parameter"><code>action</code></em>
+ to the given value.</p>
+<div class="refsect3">
+<a name="nm-tc-action-set-attribute.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>action</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>the name of an action attribute</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>the value. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-tfilter-new"></a><h3>nm_tc_tfilter_new ()</h3>
+<pre class="programlisting"><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="returnvalue">NMTCTfilter</span></a> *
+nm_tc_tfilter_new (<em class="parameter"><code>const <span class="type">char</span> *kind</code></em>,
+                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> parent</code></em>,
+                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Creates a new <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> object.</p>
+<div class="refsect3">
+<a name="nm-tc-tfilter-new.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>kind</p></td>
+<td class="parameter_description"><p>name of the queueing discipline</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>parent</p></td>
+<td class="parameter_description"><p>the parent queueing discipline</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>location to store error, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-tfilter-new.returns"></a><h4>Returns</h4>
+<p>the new <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> 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>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-tfilter-ref"></a><h3>nm_tc_tfilter_ref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_tc_tfilter_ref (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *tfilter</code></em>);</pre>
+<p>Increases the reference count of the object.</p>
+<div class="refsect3">
+<a name="nm-tc-tfilter-ref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>tfilter</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-tfilter-unref"></a><h3>nm_tc_tfilter_unref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_tc_tfilter_unref (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *tfilter</code></em>);</pre>
+<p>Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.</p>
+<div class="refsect3">
+<a name="nm-tc-tfilter-unref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>tfilter</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-tfilter-equal"></a><h3>nm_tc_tfilter_equal ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_tc_tfilter_equal (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *tfilter</code></em>,
+                     <em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *other</code></em>);</pre>
+<p>Determines if two <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> objects contain the same kind, family,
+handle, parent and info.</p>
+<div class="refsect3">
+<a name="nm-tc-tfilter-equal.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>tfilter</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>other</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> to compare <em class="parameter"><code>tfilter</code></em>
+to.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-tfilter-equal.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the objects contain the same values, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not.</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-tfilter-dup"></a><h3>nm_tc_tfilter_dup ()</h3>
+<pre class="programlisting"><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="returnvalue">NMTCTfilter</span></a> *
+nm_tc_tfilter_dup (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *tfilter</code></em>);</pre>
+<p>Creates a copy of <em class="parameter"><code>tfilter</code></em>
+</p>
+<div class="refsect3">
+<a name="nm-tc-tfilter-dup.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>tfilter</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-tfilter-dup.returns"></a><h4>Returns</h4>
+<p>a copy of <em class="parameter"><code>tfilter</code></em>
+. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-tfilter-get-kind"></a><h3>nm_tc_tfilter_get_kind ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_tc_tfilter_get_kind (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *tfilter</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-tc-tfilter-get-kind.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>tfilter</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-tfilter-get-handle"></a><h3>nm_tc_tfilter_get_handle ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+nm_tc_tfilter_get_handle (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *tfilter</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-tc-tfilter-get-handle.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>tfilter</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-tfilter-get-handle.returns"></a><h4>Returns</h4>
+<p> the queueing discipline handle</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-tfilter-set-handle"></a><h3>nm_tc_tfilter_set_handle ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_tc_tfilter_set_handle (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *tfilter</code></em>,
+                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> handle</code></em>);</pre>
+<p>Sets the queueing discipline handle.</p>
+<div class="refsect3">
+<a name="nm-tc-tfilter-set-handle.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>tfilter</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>handle</p></td>
+<td class="parameter_description"><p>the queueing discipline handle</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-tfilter-get-parent"></a><h3>nm_tc_tfilter_get_parent ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+nm_tc_tfilter_get_parent (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *tfilter</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-tc-tfilter-get-parent.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>tfilter</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-tfilter-get-parent.returns"></a><h4>Returns</h4>
+<p> the parent class</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-tfilter-get-action"></a><h3>nm_tc_tfilter_get_action ()</h3>
+<pre class="programlisting"><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="returnvalue">NMTCAction</span></a> *
+nm_tc_tfilter_get_action (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *tfilter</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-tc-tfilter-get-action.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>tfilter</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-tfilter-get-action.returns"></a><h4>Returns</h4>
+<p> the action associated with a traffic filter.</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-tfilter-set-action"></a><h3>nm_tc_tfilter_set_action ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_tc_tfilter_set_action (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *tfilter</code></em>,
+                          <em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> *action</code></em>);</pre>
+<p>Sets the action associated with a traffic filter.</p>
+<div class="refsect3">
+<a name="nm-tc-tfilter-set-action.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>tfilter</p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>action</p></td>
+<td class="parameter_description"><p>the action object</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-tc-config-new"></a><h3>nm_setting_tc_config_new ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+nm_setting_tc_config_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Creates a new <span class="type">NMSettingTCConfig</span> object with default values.</p>
+<div class="refsect3">
+<a name="nm-setting-tc-config-new.returns"></a><h4>Returns</h4>
+<p>the new empty <span class="type">NMSettingTCConfig</span> 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>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-tc-config-get-num-qdiscs"></a><h3>nm_setting_tc_config_get_num_qdiscs ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+nm_setting_tc_config_get_num_qdiscs (<em class="parameter"><code><span class="type">NMSettingTCConfig</span> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-tc-config-get-num-qdiscs.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingTCConfig</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-tc-config-get-num-qdiscs.returns"></a><h4>Returns</h4>
+<p> the number of configured queueing disciplines</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-tc-config-get-qdisc"></a><h3>nm_setting_tc_config_get_qdisc ()</h3>
+<pre class="programlisting"><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="returnvalue">NMTCQdisc</span></a> *
+nm_setting_tc_config_get_qdisc (<em class="parameter"><code><span class="type">NMSettingTCConfig</span> *setting</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> idx</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-tc-config-get-qdisc.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingTCConfig</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>idx</p></td>
+<td class="parameter_description"><p>index number of the qdisc to return</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-tc-config-get-qdisc.returns"></a><h4>Returns</h4>
+<p>the qdisc at index <em class="parameter"><code>idx</code></em>
+. </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: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-tc-config-add-qdisc"></a><h3>nm_setting_tc_config_add_qdisc ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_tc_config_add_qdisc (<em class="parameter"><code><span class="type">NMSettingTCConfig</span> *setting</code></em>,
+                                <em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>);</pre>
+<p>Appends a new qdisc and associated information to the setting.  The
+given qdisc is duplicated internally and is not changed by this function.
+If an identical qdisc (considering attributes as well) already exists, the
+qdisc is not added and the function returns <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.</p>
+<div class="refsect3">
+<a name="nm-setting-tc-config-add-qdisc.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingTCConfig</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>qdisc</p></td>
+<td class="parameter_description"><p>the qdisc to add</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-tc-config-add-qdisc.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the qdisc was added; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if the qdisc was already known.</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-tc-config-remove-qdisc"></a><h3>nm_setting_tc_config_remove_qdisc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_setting_tc_config_remove_qdisc (<em class="parameter"><code><span class="type">NMSettingTCConfig</span> *setting</code></em>,
+                                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> idx</code></em>);</pre>
+<p>Removes the qdisc at index <em class="parameter"><code>idx</code></em>
+.</p>
+<div class="refsect3">
+<a name="nm-setting-tc-config-remove-qdisc.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingTCConfig</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>idx</p></td>
+<td class="parameter_description"><p>index number of the qdisc</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-tc-config-remove-qdisc-by-value"></a><h3>nm_setting_tc_config_remove_qdisc_by_value ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_tc_config_remove_qdisc_by_value
+                               (<em class="parameter"><code><span class="type">NMSettingTCConfig</span> *setting</code></em>,
+                                <em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>);</pre>
+<p>Removes the first matching qdisc that matches <em class="parameter"><code>qdisc</code></em>
+.</p>
+<div class="refsect3">
+<a name="nm-setting-tc-config-remove-qdisc-by-value.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingTCConfig</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>qdisc</p></td>
+<td class="parameter_description"><p>the qdisc to remove</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-tc-config-remove-qdisc-by-value.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the qdisc was found and removed; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it was not.</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-tc-config-clear-qdiscs"></a><h3>nm_setting_tc_config_clear_qdiscs ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_setting_tc_config_clear_qdiscs (<em class="parameter"><code><span class="type">NMSettingTCConfig</span> *setting</code></em>);</pre>
+<p>Removes all configured queueing disciplines.</p>
+<div class="refsect3">
+<a name="nm-setting-tc-config-clear-qdiscs.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingTCConfig</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-tc-config-get-num-tfilters"></a><h3>nm_setting_tc_config_get_num_tfilters ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+nm_setting_tc_config_get_num_tfilters (<em class="parameter"><code><span class="type">NMSettingTCConfig</span> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-tc-config-get-num-tfilters.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingTCConfig</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-tc-config-get-num-tfilters.returns"></a><h4>Returns</h4>
+<p> the number of configured queueing disciplines</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-tc-config-get-tfilter"></a><h3>nm_setting_tc_config_get_tfilter ()</h3>
+<pre class="programlisting"><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="returnvalue">NMTCTfilter</span></a> *
+nm_setting_tc_config_get_tfilter (<em class="parameter"><code><span class="type">NMSettingTCConfig</span> *setting</code></em>,
+                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> idx</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-tc-config-get-tfilter.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingTCConfig</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>idx</p></td>
+<td class="parameter_description"><p>index number of the tfilter to return</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-tc-config-get-tfilter.returns"></a><h4>Returns</h4>
+<p>the tfilter at index <em class="parameter"><code>idx</code></em>
+. </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: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-tc-config-add-tfilter"></a><h3>nm_setting_tc_config_add_tfilter ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_tc_config_add_tfilter (<em class="parameter"><code><span class="type">NMSettingTCConfig</span> *setting</code></em>,
+                                  <em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *tfilter</code></em>);</pre>
+<p>Appends a new tfilter and associated information to the setting.  The
+given tfilter is duplicated internally and is not changed by this function.
+If an identical tfilter (considering attributes as well) already exists, the
+tfilter is not added and the function returns <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.</p>
+<div class="refsect3">
+<a name="nm-setting-tc-config-add-tfilter.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingTCConfig</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>tfilter</p></td>
+<td class="parameter_description"><p>the tfilter to add</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-tc-config-add-tfilter.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the tfilter was added; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if the tfilter was already known.</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-tc-config-remove-tfilter"></a><h3>nm_setting_tc_config_remove_tfilter ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_setting_tc_config_remove_tfilter (<em class="parameter"><code><span class="type">NMSettingTCConfig</span> *setting</code></em>,
+                                     <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> idx</code></em>);</pre>
+<p>Removes the tfilter at index <em class="parameter"><code>idx</code></em>
+.</p>
+<div class="refsect3">
+<a name="nm-setting-tc-config-remove-tfilter.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingTCConfig</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>idx</p></td>
+<td class="parameter_description"><p>index number of the tfilter</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-tc-config-remove-tfilter-by-value"></a><h3>nm_setting_tc_config_remove_tfilter_by_value ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_tc_config_remove_tfilter_by_value
+                               (<em class="parameter"><code><span class="type">NMSettingTCConfig</span> *setting</code></em>,
+                                <em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *tfilter</code></em>);</pre>
+<p>Removes the first matching tfilter that matches <em class="parameter"><code>tfilter</code></em>
+.</p>
+<div class="refsect3">
+<a name="nm-setting-tc-config-remove-tfilter-by-value.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingTCConfig</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>tfilter</p></td>
+<td class="parameter_description"><p>the tfilter to remove</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-tc-config-remove-tfilter-by-value.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the tfilter was found and removed; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it was not.</p>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-tc-config-clear-tfilters"></a><h3>nm_setting_tc_config_clear_tfilters ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_setting_tc_config_clear_tfilters (<em class="parameter"><code><span class="type">NMSettingTCConfig</span> *setting</code></em>);</pre>
+<p>Removes all configured queueing disciplines.</p>
+<div class="refsect3">
+<a name="nm-setting-tc-config-clear-tfilters.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingTCConfig</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.12</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-tc-config.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NM-SETTING-TC-CONFIG-SETTING-NAME:CAPS"></a><h3>NM_SETTING_TC_CONFIG_SETTING_NAME</h3>
+<pre class="programlisting">#define NM_SETTING_TC_CONFIG_SETTING_NAME    "tc"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-TC-CONFIG-QDISCS:CAPS"></a><h3>NM_SETTING_TC_CONFIG_QDISCS</h3>
+<pre class="programlisting">#define NM_SETTING_TC_CONFIG_QDISCS          "qdiscs"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-TC-CONFIG-TFILTERS:CAPS"></a><h3>NM_SETTING_TC_CONFIG_TFILTERS</h3>
+<pre class="programlisting">#define NM_SETTING_TC_CONFIG_TFILTERS        "tfilters"
+</pre>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-setting-user.html b/docs/libnm/html/libnm-nm-setting-user.html
new file mode 100644
index 00000000..e679be55
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-setting-user.html
@@ -0,0 +1,347 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-setting-user: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch03.html" title="Connection and Setting API Reference">
+<link rel="prev" href="NMSettingTun.html" title="NMSettingTun">
+<link rel="next" href="NMSettingVlan.html" title="NMSettingVlan">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-setting-user.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="NMSettingTun.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMSettingVlan.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-setting-user"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-setting-user.top_of_page"></a>nm-setting-user</span></h2>
+<p>nm-setting-user — Describes user properties</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-setting-user.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-user.html#nm-setting-user-new" title="nm_setting_user_new ()">nm_setting_user_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *const*
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-user.html#nm-setting-user-get-keys" title="nm_setting_user_get_keys ()">nm_setting_user_get_keys</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-user.html#nm-setting-user-get-data" title="nm_setting_user_get_data ()">nm_setting_user_get_data</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-user.html#nm-setting-user-set-data" title="nm_setting_user_set_data ()">nm_setting_user_set_data</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-user.html#nm-setting-user-check-key" title="nm_setting_user_check_key ()">nm_setting_user_check_key</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-setting-user.html#nm-setting-user-check-val" title="nm_setting_user_check_val ()">nm_setting_user_check_val</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-user.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-user.html#NM-SETTING-USER-SETTING-NAME:CAPS" title="NM_SETTING_USER_SETTING_NAME">NM_SETTING_USER_SETTING_NAME</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-setting-user.html#NM-SETTING-USER-DATA:CAPS" title="NM_SETTING_USER_DATA">NM_SETTING_USER_DATA</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-user.description"></a><h2>Description</h2>
+<p>The <span class="type">NMSettingUser</span> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that allow to attach
+arbitrary user data to <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> objects.</p>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-user.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="nm-setting-user-new"></a><h3>nm_setting_user_new ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
+nm_setting_user_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Creates a new <span class="type">NMSettingUser</span> object with default values.</p>
+<div class="refsect3">
+<a name="nm-setting-user-new.returns"></a><h4>Returns</h4>
+<p> the new empty <span class="type">NMSettingUser</span> object</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-user-get-keys"></a><h3>nm_setting_user_get_keys ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *const*
+nm_setting_user_get_keys (<em class="parameter"><code><span class="type">NMSettingUser</span> *setting</code></em>,
+                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *out_len</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-user-get-keys.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingUser</span></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>out_len</p></td>
+<td class="parameter_description"><p>the length of the returned array. </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>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-user-get-keys.returns"></a><h4>Returns</h4>
+<p>a
+<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array containing each key from the table. </p>
+<p><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=out_len][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-user-get-data"></a><h3>nm_setting_user_get_data ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_user_get_data (<em class="parameter"><code><span class="type">NMSettingUser</span> *setting</code></em>,
+                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-user-get-data.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingUser</span> instance</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>key</p></td>
+<td class="parameter_description"><p>the key to lookup</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-user-get-data.returns"></a><h4>Returns</h4>
+<p>the value associated with <em class="parameter"><code>key</code></em>
+or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if no such
+value exists. </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: 1.8</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-user-set-data"></a><h3>nm_setting_user_set_data ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_user_set_data (<em class="parameter"><code><span class="type">NMSettingUser</span> *setting</code></em>,
+                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
+                          <em class="parameter"><code>const <span class="type">char</span> *val</code></em>,
+                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-user-set-data.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <span class="type">NMSettingUser</span> instance</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>key</p></td>
+<td class="parameter_description"><p>the key to set</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>the value to set or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to clear a key. </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>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>optional error argument. </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>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-user-set-data.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the operation was successful. The operation
+can fail if <em class="parameter"><code>key</code></em>
+or <em class="parameter"><code>val</code></em>
+are not valid strings according
+to <a class="link" href="libnm-nm-setting-user.html#nm-setting-user-check-key" title="nm_setting_user_check_key ()"><code class="function">nm_setting_user_check_key()</code></a> and <a class="link" href="libnm-nm-setting-user.html#nm-setting-user-check-val" title="nm_setting_user_check_val ()"><code class="function">nm_setting_user_check_val()</code></a>.</p>
+</div>
+<p class="since">Since: 1.8</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-user-check-key"></a><h3>nm_setting_user_check_key ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_user_check_key (<em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Checks whether <em class="parameter"><code>key</code></em>
+ is a valid user data key. This means,
+key is not <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, not too large and valid ASCII. Also,
+only digits and numbers are allowed with a few special
+characters. The key must contain at least one '.' and
+look like a fully qualified DNS name.</p>
+<div class="refsect3">
+<a name="nm-setting-user-check-key.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>key</p></td>
+<td class="parameter_description"><p>the key to check</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-user-check-key.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>key</code></em>
+is a valid user data key.</p>
+</div>
+<p class="since">Since: 1.8</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-user-check-val"></a><h3>nm_setting_user_check_val ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_user_check_val (<em class="parameter"><code>const <span class="type">char</span> *val</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Checks whether <em class="parameter"><code>val</code></em>
+ is a valid user data value. This means,
+value is not <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, not too large and valid UTF-8.</p>
+<div class="refsect3">
+<a name="nm-setting-user-check-val.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>the value to check</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-user-check-val.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>val</code></em>
+is a valid user data value.</p>
+</div>
+<p class="since">Since: 1.8</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-setting-user.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NM-SETTING-USER-SETTING-NAME:CAPS"></a><h3>NM_SETTING_USER_SETTING_NAME</h3>
+<pre class="programlisting">#define NM_SETTING_USER_SETTING_NAME    "user"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-USER-DATA:CAPS"></a><h3>NM_SETTING_USER_DATA</h3>
+<pre class="programlisting">#define NM_SETTING_USER_DATA            "data"
+</pre>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 82ee975d..9d12cf83 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -561,7 +561,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">NMTCQdisc</span> *
+<a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="returnvalue">NMTCQdisc</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="libnm-nm-utils.html#nm-utils-tc-qdisc-from-str" title="nm_utils_tc_qdisc_from_str ()">nm_utils_tc_qdisc_from_str</a> <span class="c_punctuation">()</span>
@@ -577,7 +577,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">NMTCAction</span> *
+<a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="returnvalue">NMTCAction</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="libnm-nm-utils.html#nm-utils-tc-action-from-str" title="nm_utils_tc_action_from_str ()">nm_utils_tc_action_from_str</a> <span class="c_punctuation">()</span>
@@ -593,7 +593,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">NMTCTfilter</span> *
+<a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="returnvalue">NMTCTfilter</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="libnm-nm-utils.html#nm-utils-tc-tfilter-from-str" title="nm_utils_tc_tfilter_from_str ()">nm_utils_tc_tfilter_from_str</a> <span class="c_punctuation">()</span>
@@ -3042,11 +3042,11 @@ nm_utils_format_variant_attributes (<em class="parameter"><code><a href="https:/
 <hr>
 <div class="refsect2">
 <a name="nm-utils-tc-qdisc-from-str"></a><h3>nm_utils_tc_qdisc_from_str ()</h3>
-<pre class="programlisting"><span class="returnvalue">NMTCQdisc</span> *
+<pre class="programlisting"><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="returnvalue">NMTCQdisc</span></a> *
 nm_utils_tc_qdisc_from_str (<em class="parameter"><code>const <span class="type">char</span> *str</code></em>,
                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Parces the tc style string qdisc representation of the queueing
-discipline to a <code class="literal">NMTCQdisc</code> instance. Supports a subset of the tc language.</p>
+discipline to a <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><code class="literal">NMTCQdisc</code></a> instance. Supports a subset of the tc language.</p>
 <div class="refsect3">
 <a name="nm-utils-tc-qdisc-from-str.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -3071,7 +3071,7 @@ discipline to a <code class="literal">NMTCQdisc</code> instance. Supports a subs
 </div>
 <div class="refsect3">
 <a name="nm-utils-tc-qdisc-from-str.returns"></a><h4>Returns</h4>
-<p> the <code class="literal">NMTCQdisc</code> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+<p> the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><code class="literal">NMTCQdisc</code></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
 </div>
 <p class="since">Since: 1.12</p>
 </div>
@@ -3079,9 +3079,9 @@ discipline to a <code class="literal">NMTCQdisc</code> instance. Supports a subs
 <div class="refsect2">
 <a name="nm-utils-tc-qdisc-to-str"></a><h3>nm_utils_tc_qdisc_to_str ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *
-nm_utils_tc_qdisc_to_str (<em class="parameter"><code><span class="type">NMTCQdisc</span> *qdisc</code></em>,
+nm_utils_tc_qdisc_to_str (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>,
                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Turns the <code class="literal">NMTCQdisc</code> into a tc style string representation of the queueing
+<p>Turns the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><code class="literal">NMTCQdisc</code></a> into a tc style string representation of the queueing
 discipline.</p>
 <div class="refsect3">
 <a name="nm-utils-tc-qdisc-to-str.parameters"></a><h4>Parameters</h4>
@@ -3094,7 +3094,7 @@ discipline.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>qdisc</p></td>
-<td class="parameter_description"><p>the <code class="literal">NMTCQdisc</code></p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc"><code class="literal">NMTCQdisc</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -3114,11 +3114,11 @@ discipline.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-utils-tc-action-from-str"></a><h3>nm_utils_tc_action_from_str ()</h3>
-<pre class="programlisting"><span class="returnvalue">NMTCAction</span> *
+<pre class="programlisting"><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="returnvalue">NMTCAction</span></a> *
 nm_utils_tc_action_from_str (<em class="parameter"><code>const <span class="type">char</span> *str</code></em>,
                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Parces the tc style string action representation of the queueing
-discipline to a <code class="literal">NMTCAction</code> instance. Supports a subset of the tc language.</p>
+discipline to a <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><code class="literal">NMTCAction</code></a> instance. Supports a subset of the tc language.</p>
 <div class="refsect3">
 <a name="nm-utils-tc-action-from-str.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -3143,7 +3143,7 @@ discipline to a <code class="literal">NMTCAction</code> instance. Supports a sub
 </div>
 <div class="refsect3">
 <a name="nm-utils-tc-action-from-str.returns"></a><h4>Returns</h4>
-<p> the <code class="literal">NMTCAction</code> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+<p> the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><code class="literal">NMTCAction</code></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
 </div>
 <p class="since">Since: 1.12</p>
 </div>
@@ -3151,9 +3151,9 @@ discipline to a <code class="literal">NMTCAction</code> instance. Supports a sub
 <div class="refsect2">
 <a name="nm-utils-tc-action-to-str"></a><h3>nm_utils_tc_action_to_str ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *
-nm_utils_tc_action_to_str (<em class="parameter"><code><span class="type">NMTCAction</span> *action</code></em>,
+nm_utils_tc_action_to_str (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><span class="type">NMTCAction</span></a> *action</code></em>,
                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Turns the <code class="literal">NMTCAction</code> into a tc style string representation of the queueing
+<p>Turns the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><code class="literal">NMTCAction</code></a> into a tc style string representation of the queueing
 discipline.</p>
 <div class="refsect3">
 <a name="nm-utils-tc-action-to-str.parameters"></a><h4>Parameters</h4>
@@ -3166,7 +3166,7 @@ discipline.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>action</p></td>
-<td class="parameter_description"><p>the <code class="literal">NMTCAction</code></p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction"><code class="literal">NMTCAction</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -3186,11 +3186,11 @@ discipline.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-utils-tc-tfilter-from-str"></a><h3>nm_utils_tc_tfilter_from_str ()</h3>
-<pre class="programlisting"><span class="returnvalue">NMTCTfilter</span> *
+<pre class="programlisting"><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="returnvalue">NMTCTfilter</span></a> *
 nm_utils_tc_tfilter_from_str (<em class="parameter"><code>const <span class="type">char</span> *str</code></em>,
                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Parces the tc style string tfilter representation of the queueing
-discipline to a <code class="literal">NMTCTfilter</code> instance. Supports a subset of the tc language.</p>
+discipline to a <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><code class="literal">NMTCTfilter</code></a> instance. Supports a subset of the tc language.</p>
 <div class="refsect3">
 <a name="nm-utils-tc-tfilter-from-str.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -3215,7 +3215,7 @@ discipline to a <code class="literal">NMTCTfilter</code> instance. Supports a su
 </div>
 <div class="refsect3">
 <a name="nm-utils-tc-tfilter-from-str.returns"></a><h4>Returns</h4>
-<p> the <code class="literal">NMTCTfilter</code> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+<p> the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><code class="literal">NMTCTfilter</code></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
 </div>
 <p class="since">Since: 1.12</p>
 </div>
@@ -3223,9 +3223,9 @@ discipline to a <code class="literal">NMTCTfilter</code> instance. Supports a su
 <div class="refsect2">
 <a name="nm-utils-tc-tfilter-to-str"></a><h3>nm_utils_tc_tfilter_to_str ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *
-nm_utils_tc_tfilter_to_str (<em class="parameter"><code><span class="type">NMTCTfilter</span> *tfilter</code></em>,
+nm_utils_tc_tfilter_to_str (<em class="parameter"><code><a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><span class="type">NMTCTfilter</span></a> *tfilter</code></em>,
                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Turns the <code class="literal">NMTCTfilter</code> into a tc style string representation of the queueing
+<p>Turns the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><code class="literal">NMTCTfilter</code></a> into a tc style string representation of the queueing
 discipline.</p>
 <div class="refsect3">
 <a name="nm-utils-tc-tfilter-to-str.parameters"></a><h4>Parameters</h4>
@@ -3238,7 +3238,7 @@ discipline.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>tfilter</p></td>
-<td class="parameter_description"><p>the <code class="literal">NMTCTfilter</code></p></td>
+<td class="parameter_description"><p>the <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter"><code class="literal">NMTCTfilter</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
deleted file mode 100644
index d541c6b1..00000000
--- a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
+++ /dev/null
@@ -1,1009 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>nm-vpn-dbus-interface: libnm Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
-<link rel="home" href="index.html" title="libnm Reference Manual">
-<link rel="up" href="ch06.html" title="VPN Plugin API Reference">
-<link rel="prev" href="ch06.html" title="VPN Plugin API Reference">
-<link rel="next" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin">
-<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
-<td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
-                  <a href="#libnm-nm-vpn-dbus-interface.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#libnm-nm-vpn-dbus-interface.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
-</td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
-<td><a accesskey="u" href="ch06.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="ch06.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMVpnEditorPlugin.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="refentry">
-<a name="libnm-nm-vpn-dbus-interface"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="libnm-nm-vpn-dbus-interface.top_of_page"></a>nm-vpn-dbus-interface</span></h2>
-<p>nm-vpn-dbus-interface</p>
-</td>
-<td class="gallery_image" valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1">
-<a name="libnm-nm-vpn-dbus-interface.functions"></a><h2>Functions</h2>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="functions_return">
-<col class="functions_name">
-</colgroup>
-<tbody><tr>
-<td class="define_keyword">#define</td>
-<td class="function_name">
-<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-8-FOR:CAPS" title="NM_DEPRECATED_IN_1_8_FOR()">NM_DEPRECATED_IN_1_8_FOR</a><span class="c_punctuation">()</span>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<div class="refsect1">
-<a name="libnm-nm-vpn-dbus-interface.other"></a><h2>Types and Values</h2>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="name">
-<col class="description">
-</colgroup>
-<tbody>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-PATH-VPN:CAPS" title="NM_DBUS_PATH_VPN">NM_DBUS_PATH_VPN</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-INTERFACE-VPN:CAPS" title="NM_DBUS_INTERFACE_VPN">NM_DBUS_INTERFACE_VPN</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-PATH-VPN-CONNECTION:CAPS" title="NM_DBUS_PATH_VPN_CONNECTION">NM_DBUS_PATH_VPN_CONNECTION</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-INTERFACE-VPN-CONNECTION:CAPS" title="NM_DBUS_INTERFACE_VPN_CONNECTION">NM_DBUS_INTERFACE_VPN_CONNECTION</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-DBUS-PLUGIN-PATH:CAPS" title="NM_VPN_DBUS_PLUGIN_PATH">NM_VPN_DBUS_PLUGIN_PATH</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-DBUS-PLUGIN-INTERFACE:CAPS" title="NM_VPN_DBUS_PLUGIN_INTERFACE">NM_VPN_DBUS_PLUGIN_INTERFACE</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-NO-ACTIVE-VPN-CONNECTION:CAPS" title="NM_DBUS_NO_ACTIVE_VPN_CONNECTION">NM_DBUS_NO_ACTIVE_VPN_CONNECTION</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-NO-VPN-CONNECTIONS:CAPS" title="NM_DBUS_NO_VPN_CONNECTIONS">NM_DBUS_NO_VPN_CONNECTIONS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-INVALID-VPN-CONNECTION:CAPS" title="NM_DBUS_INVALID_VPN_CONNECTION">NM_DBUS_INVALID_VPN_CONNECTION</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-ERROR-PREFIX:CAPS" title="NM_DBUS_VPN_ERROR_PREFIX">NM_DBUS_VPN_ERROR_PREFIX</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-STARTING-IN-PROGRESS:CAPS" title="NM_DBUS_VPN_STARTING_IN_PROGRESS">NM_DBUS_VPN_STARTING_IN_PROGRESS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-ALREADY-STARTED:CAPS" title="NM_DBUS_VPN_ALREADY_STARTED">NM_DBUS_VPN_ALREADY_STARTED</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-STOPPING-IN-PROGRESS:CAPS" title="NM_DBUS_VPN_STOPPING_IN_PROGRESS">NM_DBUS_VPN_STOPPING_IN_PROGRESS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-ALREADY-STOPPED:CAPS" title="NM_DBUS_VPN_ALREADY_STOPPED">NM_DBUS_VPN_ALREADY_STOPPED</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-WRONG-STATE:CAPS" title="NM_DBUS_VPN_WRONG_STATE">NM_DBUS_VPN_WRONG_STATE</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-BAD-ARGUMENTS:CAPS" title="NM_DBUS_VPN_BAD_ARGUMENTS">NM_DBUS_VPN_BAD_ARGUMENTS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-INTERACTIVE-NOT-SUPPORTED:CAPS" title="NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED">NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-LOGIN-BANNER:CAPS" title="NM_DBUS_VPN_SIGNAL_LOGIN_BANNER">NM_DBUS_VPN_SIGNAL_LOGIN_BANNER</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-LOGIN-FAILED:CAPS" title="NM_DBUS_VPN_SIGNAL_LOGIN_FAILED">NM_DBUS_VPN_SIGNAL_LOGIN_FAILED</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-LAUNCH-FAILED:CAPS" title="NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED">NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-CONNECT-FAILED:CAPS" title="NM_DBUS_VPN_SIGNAL_CONNECT_FAILED">NM_DBUS_VPN_SIGNAL_CONNECT_FAILED</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-VPN-CONFIG-BAD:CAPS" title="NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD">NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-IP-CONFIG-BAD:CAPS" title="NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD">NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS" title="NM_DBUS_VPN_SIGNAL_STATE_CHANGE">NM_DBUS_VPN_SIGNAL_STATE_CHANGE</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS" title="NM_DBUS_VPN_SIGNAL_IP4_CONFIG">NM_DBUS_VPN_SIGNAL_IP4_CONFIG</a></td>
-</tr>
-<tr>
-<td class="datatype_keyword">enum</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState" title="enum NMVpnServiceState">NMVpnServiceState</a></td>
-</tr>
-<tr>
-<td class="datatype_keyword">enum</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState" title="enum NMVpnConnectionState">NMVpnConnectionState</a></td>
-</tr>
-<tr>
-<td class="datatype_keyword">enum</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionStateReason" title="enum NMVpnConnectionStateReason">NMVpnConnectionStateReason</a></td>
-</tr>
-<tr>
-<td class="datatype_keyword">enum</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure" title="enum NMVpnPluginFailure">NMVpnPluginFailure</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS" title="NM_VPN_PLUGIN_CONFIG_TUNDEV">NM_VPN_PLUGIN_CONFIG_TUNDEV</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-PROXY-PAC:CAPS" title="NM_VPN_PLUGIN_CONFIG_PROXY_PAC">NM_VPN_PLUGIN_CONFIG_PROXY_PAC</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-BANNER:CAPS" title="NM_VPN_PLUGIN_CONFIG_BANNER">NM_VPN_PLUGIN_CONFIG_BANNER</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS" title="NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY">NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-MTU:CAPS" title="NM_VPN_PLUGIN_CONFIG_MTU">NM_VPN_PLUGIN_CONFIG_MTU</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-HAS-IP4:CAPS" title="NM_VPN_PLUGIN_CONFIG_HAS_IP4">NM_VPN_PLUGIN_CONFIG_HAS_IP4</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-HAS-IP6:CAPS" title="NM_VPN_PLUGIN_CONFIG_HAS_IP6">NM_VPN_PLUGIN_CONFIG_HAS_IP6</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CAN-PERSIST:CAPS" title="NM_VPN_PLUGIN_CAN_PERSIST">NM_VPN_PLUGIN_CAN_PERSIST</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-INT-GATEWAY:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY">NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-ADDRESS:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS">NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-PTP:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_PTP">NM_VPN_PLUGIN_IP4_CONFIG_PTP</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-PREFIX:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_PREFIX">NM_VPN_PLUGIN_IP4_CONFIG_PREFIX</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-DNS:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_DNS">NM_VPN_PLUGIN_IP4_CONFIG_DNS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-NBNS:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_NBNS">NM_VPN_PLUGIN_IP4_CONFIG_NBNS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-MSS:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_MSS">NM_VPN_PLUGIN_IP4_CONFIG_MSS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAIN:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN">NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAINS:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS">NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-ROUTES:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_ROUTES">NM_VPN_PLUGIN_IP4_CONFIG_ROUTES</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-PRESERVE-ROUTES:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES">NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-NEVER-DEFAULT:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT">NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-GATEWAY:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY">NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-BANNER:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_BANNER">NM_VPN_PLUGIN_IP4_CONFIG_BANNER</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-EXT-GATEWAY:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY">NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-MTU:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_MTU">NM_VPN_PLUGIN_IP4_CONFIG_MTU</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-TUNDEV:CAPS" title="NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV">NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-INT-GATEWAY:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY">NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-ADDRESS:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS">NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-PTP:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_PTP">NM_VPN_PLUGIN_IP6_CONFIG_PTP</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-PREFIX:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_PREFIX">NM_VPN_PLUGIN_IP6_CONFIG_PREFIX</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-DNS:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_DNS">NM_VPN_PLUGIN_IP6_CONFIG_DNS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-MSS:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_MSS">NM_VPN_PLUGIN_IP6_CONFIG_MSS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAIN:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN">NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAINS:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS">NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-ROUTES:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_ROUTES">NM_VPN_PLUGIN_IP6_CONFIG_ROUTES</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-PRESERVE-ROUTES:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES">NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-NEVER-DEFAULT:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT">NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT</a></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect1">
-<a name="libnm-nm-vpn-dbus-interface.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
-    <span class="lineart">├──</span> NMVpnConnectionState
-    <span class="lineart">├──</span> NMVpnConnectionStateReason
-    <span class="lineart">├──</span> NMVpnPluginFailure
-    <span class="lineart">╰──</span> NMVpnServiceState
-</pre>
-</div>
-<div class="refsect1">
-<a name="libnm-nm-vpn-dbus-interface.description"></a><h2>Description</h2>
-</div>
-<div class="refsect1">
-<a name="libnm-nm-vpn-dbus-interface.functions_details"></a><h2>Functions</h2>
-<div class="refsect2">
-<a name="NM-DEPRECATED-IN-1-8-FOR:CAPS"></a><h3>NM_DEPRECATED_IN_1_8_FOR()</h3>
-<pre class="programlisting">#define             NM_DEPRECATED_IN_1_8_FOR(f)</pre>
-</div>
-</div>
-<div class="refsect1">
-<a name="libnm-nm-vpn-dbus-interface.other_details"></a><h2>Types and Values</h2>
-<div class="refsect2">
-<a name="NM-DBUS-PATH-VPN:CAPS"></a><h3>NM_DBUS_PATH_VPN</h3>
-<pre class="programlisting">#define NM_DBUS_PATH_VPN                  "/org/freedesktop/NetworkManager/VPN/Manager"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-INTERFACE-VPN:CAPS"></a><h3>NM_DBUS_INTERFACE_VPN</h3>
-<pre class="programlisting">#define NM_DBUS_INTERFACE_VPN             "org.freedesktop.NetworkManager.VPN.Manager"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-PATH-VPN-CONNECTION:CAPS"></a><h3>NM_DBUS_PATH_VPN_CONNECTION</h3>
-<pre class="programlisting">#define NM_DBUS_PATH_VPN_CONNECTION       "/org/freedesktop/NetworkManager/VPN/Connection"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-INTERFACE-VPN-CONNECTION:CAPS"></a><h3>NM_DBUS_INTERFACE_VPN_CONNECTION</h3>
-<pre class="programlisting">#define NM_DBUS_INTERFACE_VPN_CONNECTION  "org.freedesktop.NetworkManager.VPN.Connection"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-DBUS-PLUGIN-PATH:CAPS"></a><h3>NM_VPN_DBUS_PLUGIN_PATH</h3>
-<pre class="programlisting">#define NM_VPN_DBUS_PLUGIN_PATH           "/org/freedesktop/NetworkManager/VPN/Plugin"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-DBUS-PLUGIN-INTERFACE:CAPS"></a><h3>NM_VPN_DBUS_PLUGIN_INTERFACE</h3>
-<pre class="programlisting">#define NM_VPN_DBUS_PLUGIN_INTERFACE      "org.freedesktop.NetworkManager.VPN.Plugin"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-NO-ACTIVE-VPN-CONNECTION:CAPS"></a><h3>NM_DBUS_NO_ACTIVE_VPN_CONNECTION</h3>
-<pre class="programlisting">#define NM_DBUS_NO_ACTIVE_VPN_CONNECTION "org.freedesktop.NetworkManager.VPNConnections.NoActiveVPNConnection"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-NO-VPN-CONNECTIONS:CAPS"></a><h3>NM_DBUS_NO_VPN_CONNECTIONS</h3>
-<pre class="programlisting">#define NM_DBUS_NO_VPN_CONNECTIONS       "org.freedesktop.NetworkManager.VPNConnections.NoVPNConnections"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-INVALID-VPN-CONNECTION:CAPS"></a><h3>NM_DBUS_INVALID_VPN_CONNECTION</h3>
-<pre class="programlisting">#define NM_DBUS_INVALID_VPN_CONNECTION   "org.freedesktop.NetworkManager.VPNConnections.InvalidVPNConnection"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-ERROR-PREFIX:CAPS"></a><h3>NM_DBUS_VPN_ERROR_PREFIX</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_ERROR_PREFIX              "org.freedesktop.NetworkManager.VPN.Error"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-STARTING-IN-PROGRESS:CAPS"></a><h3>NM_DBUS_VPN_STARTING_IN_PROGRESS</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_STARTING_IN_PROGRESS      "StartingInProgress"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-ALREADY-STARTED:CAPS"></a><h3>NM_DBUS_VPN_ALREADY_STARTED</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_ALREADY_STARTED           "AlreadyStarted"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-STOPPING-IN-PROGRESS:CAPS"></a><h3>NM_DBUS_VPN_STOPPING_IN_PROGRESS</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_STOPPING_IN_PROGRESS      "StoppingInProgress"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-ALREADY-STOPPED:CAPS"></a><h3>NM_DBUS_VPN_ALREADY_STOPPED</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_ALREADY_STOPPED           "AlreadyStopped"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-WRONG-STATE:CAPS"></a><h3>NM_DBUS_VPN_WRONG_STATE</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_WRONG_STATE               "WrongState"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-BAD-ARGUMENTS:CAPS"></a><h3>NM_DBUS_VPN_BAD_ARGUMENTS</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_BAD_ARGUMENTS             "BadArguments"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-INTERACTIVE-NOT-SUPPORTED:CAPS"></a><h3>NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED "InteractiveNotSupported"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-SIGNAL-LOGIN-BANNER:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_LOGIN_BANNER</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_LOGIN_BANNER   "LoginBanner"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-SIGNAL-LOGIN-FAILED:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_LOGIN_FAILED</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_LOGIN_FAILED   "LoginFailed"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-SIGNAL-LAUNCH-FAILED:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED  "LaunchFailed"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-SIGNAL-CONNECT-FAILED:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_CONNECT_FAILED</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_CONNECT_FAILED "ConnectFailed"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-SIGNAL-VPN-CONFIG-BAD:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD "VPNConfigBad"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-SIGNAL-IP-CONFIG-BAD:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD  "IPConfigBad"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_STATE_CHANGE</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE   "StateChange"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_IP4_CONFIG</h3>
-<pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_IP4_CONFIG     "IP4Config"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NMVpnServiceState"></a><h3>enum NMVpnServiceState</h3>
-<p>VPN daemon states</p>
-<div class="refsect3">
-<a name="NMVpnServiceState.members"></a><h4>Members</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="300px" class="enum_members_name">
-<col class="enum_members_description">
-<col width="200px" class="enum_members_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-SERVICE-STATE-UNKNOWN:CAPS"></a>NM_VPN_SERVICE_STATE_UNKNOWN</p></td>
-<td class="enum_member_description">
-<p>The state of the VPN plugin is unknown.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-SERVICE-STATE-INIT:CAPS"></a>NM_VPN_SERVICE_STATE_INIT</p></td>
-<td class="enum_member_description">
-<p>The VPN plugin is initialized.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-SERVICE-STATE-SHUTDOWN:CAPS"></a>NM_VPN_SERVICE_STATE_SHUTDOWN</p></td>
-<td class="enum_member_description">
-<p>Not used.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-SERVICE-STATE-STARTING:CAPS"></a>NM_VPN_SERVICE_STATE_STARTING</p></td>
-<td class="enum_member_description">
-<p>The plugin is attempting to connect to a VPN server.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-SERVICE-STATE-STARTED:CAPS"></a>NM_VPN_SERVICE_STATE_STARTED</p></td>
-<td class="enum_member_description">
-<p>The plugin has connected to a VPN server.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-SERVICE-STATE-STOPPING:CAPS"></a>NM_VPN_SERVICE_STATE_STOPPING</p></td>
-<td class="enum_member_description">
-<p>The plugin is disconnecting from the VPN server.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-SERVICE-STATE-STOPPED:CAPS"></a>NM_VPN_SERVICE_STATE_STOPPED</p></td>
-<td class="enum_member_description">
-<p>The plugin has disconnected from the VPN server.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NMVpnConnectionState"></a><h3>enum NMVpnConnectionState</h3>
-<p>VPN connection states</p>
-<div class="refsect3">
-<a name="NMVpnConnectionState.members"></a><h4>Members</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="300px" class="enum_members_name">
-<col class="enum_members_description">
-<col width="200px" class="enum_members_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-UNKNOWN:CAPS"></a>NM_VPN_CONNECTION_STATE_UNKNOWN</p></td>
-<td class="enum_member_description">
-<p>The state of the VPN connection is
-  unknown.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-PREPARE:CAPS"></a>NM_VPN_CONNECTION_STATE_PREPARE</p></td>
-<td class="enum_member_description">
-<p>The VPN connection is preparing to
-  connect.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-NEED-AUTH:CAPS"></a>NM_VPN_CONNECTION_STATE_NEED_AUTH</p></td>
-<td class="enum_member_description">
-<p>The VPN connection needs authorization
-  credentials.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-CONNECT:CAPS"></a>NM_VPN_CONNECTION_STATE_CONNECT</p></td>
-<td class="enum_member_description">
-<p>The VPN connection is being established.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-IP-CONFIG-GET:CAPS"></a>NM_VPN_CONNECTION_STATE_IP_CONFIG_GET</p></td>
-<td class="enum_member_description">
-<p>The VPN connection is getting an IP
-  address.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-ACTIVATED:CAPS"></a>NM_VPN_CONNECTION_STATE_ACTIVATED</p></td>
-<td class="enum_member_description">
-<p>The VPN connection is active.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-FAILED:CAPS"></a>NM_VPN_CONNECTION_STATE_FAILED</p></td>
-<td class="enum_member_description">
-<p>The VPN connection failed.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-DISCONNECTED:CAPS"></a>NM_VPN_CONNECTION_STATE_DISCONNECTED</p></td>
-<td class="enum_member_description">
-<p>The VPN connection is disconnected.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NMVpnConnectionStateReason"></a><h3>enum NMVpnConnectionStateReason</h3>
-<div class="warning"><p><code class="literal">NMVpnConnectionStateReason</code> is deprecated and should not be used in newly-written code.</p></div>
-<p>VPN connection state reasons</p>
-<div class="refsect3">
-<a name="NMVpnConnectionStateReason.members"></a><h4>Members</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="300px" class="enum_members_name">
-<col class="enum_members_description">
-<col width="200px" class="enum_members_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-REASON-UNKNOWN:CAPS"></a>NM_VPN_CONNECTION_STATE_REASON_UNKNOWN</p></td>
-<td class="enum_member_description">
-<p>The reason for the VPN connection
-  state change is unknown.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-REASON-NONE:CAPS"></a>NM_VPN_CONNECTION_STATE_REASON_NONE</p></td>
-<td class="enum_member_description">
-<p>No reason was given for the VPN
-  connection state change.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-REASON-USER-DISCONNECTED:CAPS"></a>NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED</p></td>
-<td class="enum_member_description">
-<p>The VPN connection changed
-  state because the user disconnected it.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-REASON-DEVICE-DISCONNECTED:CAPS"></a>NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED</p></td>
-<td class="enum_member_description">
-<p>The VPN connection
-  changed state because the device it was using was disconnected.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-REASON-SERVICE-STOPPED:CAPS"></a>NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED</p></td>
-<td class="enum_member_description">
-<p>The service providing the
-  VPN connection was stopped.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-REASON-IP-CONFIG-INVALID:CAPS"></a>NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID</p></td>
-<td class="enum_member_description">
-<p>The IP config of the VPN
-  connection was invalid.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-REASON-CONNECT-TIMEOUT:CAPS"></a>NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT</p></td>
-<td class="enum_member_description">
-<p>The connection attempt to
-  the VPN service timed out.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-TIMEOUT:CAPS"></a>NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT</p></td>
-<td class="enum_member_description">
-<p>A timeout occurred
-  while starting the service providing the VPN connection.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-FAILED:CAPS"></a>NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED</p></td>
-<td class="enum_member_description">
-<p>Starting the service
-  starting the service providing the VPN connection failed.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-REASON-NO-SECRETS:CAPS"></a>NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS</p></td>
-<td class="enum_member_description">
-<p>Necessary secrets for the VPN
-  connection were not provided.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-REASON-LOGIN-FAILED:CAPS"></a>NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED</p></td>
-<td class="enum_member_description">
-<p>Authentication to the VPN
-  server failed.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-CONNECTION-STATE-REASON-CONNECTION-REMOVED:CAPS"></a>NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED</p></td>
-<td class="enum_member_description">
-<p>The connection was
-  deleted from settings.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NMVpnPluginFailure"></a><h3>enum NMVpnPluginFailure</h3>
-<p>VPN plugin failure reasons</p>
-<div class="refsect3">
-<a name="NMVpnPluginFailure.members"></a><h4>Members</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="300px" class="enum_members_name">
-<col class="enum_members_description">
-<col width="200px" class="enum_members_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-PLUGIN-FAILURE-LOGIN-FAILED:CAPS"></a>NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED</p></td>
-<td class="enum_member_description">
-<p>Login failed.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-PLUGIN-FAILURE-CONNECT-FAILED:CAPS"></a>NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED</p></td>
-<td class="enum_member_description">
-<p>Connect failed.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-VPN-PLUGIN-FAILURE-BAD-IP-CONFIG:CAPS"></a>NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG</p></td>
-<td class="enum_member_description">
-<p>Invalid IP configuration returned from
-  the VPN plugin.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_TUNDEV</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_TUNDEV      "tundev"
-</pre>
-<div class="warning"><p><code class="literal">NM_VPN_PLUGIN_CONFIG_TUNDEV</code> is deprecated and should not be used in newly-written code.</p></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-CONFIG-PROXY-PAC:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_PROXY_PAC</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_PROXY_PAC   "pac"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-CONFIG-BANNER:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_BANNER</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_BANNER      "banner"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY "gateway"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-CONFIG-MTU:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_MTU</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_MTU         "mtu"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-CONFIG-HAS-IP4:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_HAS_IP4</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_HAS_IP4     "has-ip4"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-CONFIG-HAS-IP6:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_HAS_IP6</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_HAS_IP6     "has-ip6"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-CAN-PERSIST:CAPS"></a><h3>NM_VPN_PLUGIN_CAN_PERSIST</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_CAN_PERSIST        "can-persist"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-INT-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY "internal-gateway"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-ADDRESS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS     "address"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-PTP:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_PTP</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_PTP         "ptp"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-PREFIX:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_PREFIX</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_PREFIX      "prefix"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-DNS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_DNS</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_DNS         "dns"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-NBNS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_NBNS</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_NBNS        "nbns"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-MSS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_MSS</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_MSS         "mss"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-DOMAIN:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN      "domain"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-DOMAINS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS     "domains"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-ROUTES:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_ROUTES</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_ROUTES      "routes"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-PRESERVE-ROUTES:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES "preserve-routes"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT "never-default"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY   NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-BANNER:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_BANNER</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_BANNER      NM_VPN_PLUGIN_CONFIG_BANNER
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-EXT-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-MTU:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_MTU</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_MTU         NM_VPN_PLUGIN_CONFIG_MTU
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP4-CONFIG-TUNDEV:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV      NM_VPN_PLUGIN_CONFIG_TUNDEV
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP6-CONFIG-INT-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY "internal-gateway"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP6-CONFIG-ADDRESS:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS     "address"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP6-CONFIG-PTP:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_PTP</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_PTP         "ptp"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP6-CONFIG-PREFIX:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_PREFIX</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_PREFIX      "prefix"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP6-CONFIG-DNS:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_DNS</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_DNS         "dns"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP6-CONFIG-MSS:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_MSS</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_MSS         "mss"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP6-CONFIG-DOMAIN:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN      "domain"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP6-CONFIG-DOMAINS:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS     "domains"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP6-CONFIG-ROUTES:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_ROUTES</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_ROUTES      "routes"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP6-CONFIG-PRESERVE-ROUTES:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES "preserve-routes"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-VPN-PLUGIN-IP6-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT</h3>
-<pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT "never-default"
-</pre>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>Generated by GTK-Doc V1.28</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-vpn-plugin-info.html b/docs/libnm/html/libnm-nm-vpn-plugin-info.html
new file mode 100644
index 00000000..930b74d7
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-vpn-plugin-info.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-vpn-plugin-info: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch06.html" title="VPN Plugin API Reference">
+<link rel="prev" href="libnm-nm-vpn-service-plugin.html" title="nm-vpn-service-plugin">
+<link rel="next" href="NMVpnEditor.html" title="NMVpnEditor">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-vpn-plugin-info.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch06.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libnm-nm-vpn-service-plugin.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NMVpnEditor.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-vpn-plugin-info"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-vpn-plugin-info.top_of_page"></a>nm-vpn-plugin-info</span></h2>
+<p>nm-vpn-plugin-info</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-vpn-plugin-info.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-NAME:CAPS" title="NM_VPN_PLUGIN_INFO_NAME">NM_VPN_PLUGIN_INFO_NAME</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-FILENAME:CAPS" title="NM_VPN_PLUGIN_INFO_FILENAME">NM_VPN_PLUGIN_INFO_FILENAME</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-KEYFILE:CAPS" title="NM_VPN_PLUGIN_INFO_KEYFILE">NM_VPN_PLUGIN_INFO_KEYFILE</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-KF-GROUP-CONNECTION:CAPS" title="NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION">NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-KF-GROUP-LIBNM:CAPS" title="NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM">NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-KF-GROUP-GNOME:CAPS" title="NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME">NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libnm-nm-vpn-plugin-info.html#NMVpnPluginInfo" title="NMVpnPluginInfo">NMVpnPluginInfo</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-vpn-plugin-info.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-vpn-plugin-info.functions_details"></a><h2>Functions</h2>
+<p></p>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-vpn-plugin-info.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NM-VPN-PLUGIN-INFO-NAME:CAPS"></a><h3>NM_VPN_PLUGIN_INFO_NAME</h3>
+<pre class="programlisting">#define NM_VPN_PLUGIN_INFO_NAME        "name"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-VPN-PLUGIN-INFO-FILENAME:CAPS"></a><h3>NM_VPN_PLUGIN_INFO_FILENAME</h3>
+<pre class="programlisting">#define NM_VPN_PLUGIN_INFO_FILENAME    "filename"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-VPN-PLUGIN-INFO-KEYFILE:CAPS"></a><h3>NM_VPN_PLUGIN_INFO_KEYFILE</h3>
+<pre class="programlisting">#define NM_VPN_PLUGIN_INFO_KEYFILE     "keyfile"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-VPN-PLUGIN-INFO-KF-GROUP-CONNECTION:CAPS"></a><h3>NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION</h3>
+<pre class="programlisting">#define NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION   "VPN Connection"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-VPN-PLUGIN-INFO-KF-GROUP-LIBNM:CAPS"></a><h3>NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM</h3>
+<pre class="programlisting">#define NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM        "libnm"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-VPN-PLUGIN-INFO-KF-GROUP-GNOME:CAPS"></a><h3>NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME</h3>
+<pre class="programlisting">#define NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME        "GNOME"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMVpnPluginInfo"></a><h3>NMVpnPluginInfo</h3>
+<pre class="programlisting">typedef struct {
+	NM_AVAILABLE_IN_1_2
+	GObject parent;
+} NMVpnPluginInfo;
+</pre>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-vpn-plugin-old.html b/docs/libnm/html/libnm-nm-vpn-plugin-old.html
new file mode 100644
index 00000000..86a7fe28
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-vpn-plugin-old.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-vpn-plugin-old: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch06.html" title="VPN Plugin API Reference">
+<link rel="prev" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin">
+<link rel="next" href="object-tree.html" title="Object Hierarchy">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-vpn-plugin-old.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch06.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="NMVpnEditorPlugin.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="object-tree.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-vpn-plugin-old"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-vpn-plugin-old.top_of_page"></a>nm-vpn-plugin-old</span></h2>
+<p>nm-vpn-plugin-old</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-vpn-plugin-old.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-vpn-plugin-old.html#NM-VPN-PLUGIN-OLD-DBUS-SERVICE-NAME:CAPS" title="NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME">NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-vpn-plugin-old.html#NM-VPN-PLUGIN-OLD-STATE:CAPS" title="NM_VPN_PLUGIN_OLD_STATE">NM_VPN_PLUGIN_OLD_STATE</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-vpn-plugin-old.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-vpn-plugin-old.functions_details"></a><h2>Functions</h2>
+<p></p>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-vpn-plugin-old.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NM-VPN-PLUGIN-OLD-DBUS-SERVICE-NAME:CAPS"></a><h3>NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME</h3>
+<pre class="programlisting">#define NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME "service-name"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-VPN-PLUGIN-OLD-STATE:CAPS"></a><h3>NM_VPN_PLUGIN_OLD_STATE</h3>
+<pre class="programlisting">#define NM_VPN_PLUGIN_OLD_STATE             "state"
+</pre>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-vpn-service-plugin.html b/docs/libnm/html/libnm-nm-vpn-service-plugin.html
new file mode 100644
index 00000000..a73f4d78
--- /dev/null
+++ b/docs/libnm/html/libnm-nm-vpn-service-plugin.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-vpn-service-plugin: libnm Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="libnm Reference Manual">
+<link rel="up" href="ch06.html" title="VPN Plugin API Reference">
+<link rel="prev" href="ch06.html" title="VPN Plugin API Reference">
+<link rel="next" href="libnm-nm-vpn-plugin-info.html" title="nm-vpn-plugin-info">
+<meta name="generator" content="GTK-Doc V1.28 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#libnm-nm-vpn-service-plugin.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch06.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="ch06.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libnm-nm-vpn-plugin-info.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="libnm-nm-vpn-service-plugin"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="libnm-nm-vpn-service-plugin.top_of_page"></a>nm-vpn-service-plugin</span></h2>
+<p>nm-vpn-service-plugin</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="libnm-nm-vpn-service-plugin.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-DBUS-SERVICE-NAME:CAPS" title="NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME">NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-DBUS-WATCH-PEER:CAPS" title="NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER">NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-STATE:CAPS" title="NM_VPN_SERVICE_PLUGIN_STATE">NM_VPN_SERVICE_PLUGIN_STATE</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-vpn-service-plugin.description"></a><h2>Description</h2>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-vpn-service-plugin.functions_details"></a><h2>Functions</h2>
+<p></p>
+</div>
+<div class="refsect1">
+<a name="libnm-nm-vpn-service-plugin.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NM-VPN-SERVICE-PLUGIN-DBUS-SERVICE-NAME:CAPS"></a><h3>NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME</h3>
+<pre class="programlisting">#define NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME "service-name"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-VPN-SERVICE-PLUGIN-DBUS-WATCH-PEER:CAPS"></a><h3>NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER</h3>
+<pre class="programlisting">#define NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER   "watch-peer"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-VPN-SERVICE-PLUGIN-STATE:CAPS"></a><h3>NM_VPN_SERVICE_PLUGIN_STATE</h3>
+<pre class="programlisting">#define NM_VPN_SERVICE_PLUGIN_STATE             "state"
+</pre>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.28</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index 11ed6a2f..c1fbfed7 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -15,14 +15,15 @@
     <sub name="Connection and Setting API Reference" link="ch03.html">
       <sub name="NMConnection" link="NMConnection.html"/>
       <sub name="NMSimpleConnection" link="NMSimpleConnection.html"/>
+      <sub name="NMRemoteConnection" link="NMRemoteConnection.html"/>
       <sub name="NMSetting" link="NMSetting.html"/>
       <sub name="NMSettingConnection" link="NMSettingConnection.html"/>
       <sub name="NMSetting8021x" link="NMSetting8021x.html"/>
       <sub name="NMSettingAdsl" link="NMSettingAdsl.html"/>
       <sub name="NMSettingBluetooth" link="NMSettingBluetooth.html"/>
       <sub name="NMSettingBond" link="NMSettingBond.html"/>
-      <sub name="NMSettingBridge" link="NMSettingBridge.html"/>
       <sub name="NMSettingBridgePort" link="NMSettingBridgePort.html"/>
+      <sub name="NMSettingBridge" link="NMSettingBridge.html"/>
       <sub name="NMSettingCdma" link="NMSettingCdma.html"/>
       <sub name="NMSettingDcb" link="NMSettingDcb.html"/>
       <sub name="NMSettingDummy" link="NMSettingDummy.html"/>
@@ -36,19 +37,26 @@
       <sub name="NMSettingMacsec" link="NMSettingMacsec.html"/>
       <sub name="NMSettingMacvlan" link="NMSettingMacvlan.html"/>
       <sub name="NMSettingOlpcMesh" link="NMSettingOlpcMesh.html"/>
-      <sub name="NMSettingPpp" link="NMSettingPpp.html"/>
+      <sub name="nm-setting-ovs-bridge" link="libnm-nm-setting-ovs-bridge.html"/>
+      <sub name="nm-setting-ovs-interface" link="libnm-nm-setting-ovs-interface.html"/>
+      <sub name="nm-setting-ovs-patch" link="libnm-nm-setting-ovs-patch.html"/>
+      <sub name="nm-setting-ovs-port" link="libnm-nm-setting-ovs-port.html"/>
       <sub name="NMSettingPppoe" link="NMSettingPppoe.html"/>
+      <sub name="NMSettingPpp" link="NMSettingPpp.html"/>
+      <sub name="NMSettingProxy" link="NMSettingProxy.html"/>
       <sub name="NMSettingSerial" link="NMSettingSerial.html"/>
-      <sub name="NMSettingTeam" link="NMSettingTeam.html"/>
+      <sub name="nm-setting-tc-config" link="libnm-nm-setting-tc-config.html"/>
       <sub name="NMSettingTeamPort" link="NMSettingTeamPort.html"/>
+      <sub name="NMSettingTeam" link="NMSettingTeam.html"/>
       <sub name="NMSettingTun" link="NMSettingTun.html"/>
+      <sub name="nm-setting-user" link="libnm-nm-setting-user.html"/>
       <sub name="NMSettingVlan" link="NMSettingVlan.html"/>
       <sub name="NMSettingVpn" link="NMSettingVpn.html"/>
       <sub name="NMSettingVxlan" link="NMSettingVxlan.html"/>
       <sub name="NMSettingWimax" link="NMSettingWimax.html"/>
       <sub name="NMSettingWired" link="NMSettingWired.html"/>
-      <sub name="NMSettingWireless" link="NMSettingWireless.html"/>
       <sub name="NMSettingWirelessSecurity" link="NMSettingWirelessSecurity.html"/>
+      <sub name="NMSettingWireless" link="NMSettingWireless.html"/>
     </sub>
     <sub name="Device and Runtime Configuration API Reference" link="ch04.html">
       <sub name="NMDevice" link="NMDevice.html"/>
@@ -65,6 +73,10 @@
       <sub name="NMDeviceMacvlan" link="NMDeviceMacvlan.html"/>
       <sub name="NMDeviceModem" link="NMDeviceModem.html"/>
       <sub name="NMDeviceOlpcMesh" link="NMDeviceOlpcMesh.html"/>
+      <sub name="nm-device-ovs-bridge" link="libnm-nm-device-ovs-bridge.html"/>
+      <sub name="nm-device-ovs-interface" link="libnm-nm-device-ovs-interface.html"/>
+      <sub name="nm-device-ovs-port" link="libnm-nm-device-ovs-port.html"/>
+      <sub name="nm-device-ppp" link="libnm-nm-device-ppp.html"/>
       <sub name="NMDeviceTeam" link="NMDeviceTeam.html"/>
       <sub name="NMDeviceTun" link="NMDeviceTun.html"/>
       <sub name="NMDeviceVlan" link="NMDeviceVlan.html"/>
@@ -73,19 +85,22 @@
       <sub name="NMDeviceWimax" link="NMDeviceWimax.html"/>
       <sub name="NMActiveConnection" link="NMActiveConnection.html"/>
       <sub name="NMVpnConnection" link="NMVpnConnection.html"/>
-      <sub name="NMRemoteConnection" link="NMRemoteConnection.html"/>
       <sub name="NMAccessPoint" link="NMAccessPoint.html"/>
       <sub name="NMWimaxNsp" link="NMWimaxNsp.html"/>
       <sub name="NMIPConfig" link="NMIPConfig.html"/>
       <sub name="NMDhcpConfig" link="NMDhcpConfig.html"/>
+      <sub name="nm-checkpoint" link="libnm-nm-checkpoint.html"/>
     </sub>
     <sub name="Utility API Reference" link="ch05.html">
       <sub name="nm-utils" link="libnm-nm-utils.html"/>
       <sub name="nm-version" link="libnm-nm-version.html"/>
     </sub>
     <sub name="VPN Plugin API Reference" link="ch06.html">
-      <sub name="nm-vpn-dbus-interface" link="libnm-nm-vpn-dbus-interface.html"/>
+      <sub name="nm-vpn-service-plugin" link="libnm-nm-vpn-service-plugin.html"/>
+      <sub name="nm-vpn-plugin-info" link="libnm-nm-vpn-plugin-info.html"/>
+      <sub name="NMVpnEditor" link="NMVpnEditor.html"/>
       <sub name="NMVpnEditorPlugin" link="NMVpnEditorPlugin.html"/>
+      <sub name="nm-vpn-plugin-old" link="libnm-nm-vpn-plugin-old.html"/>
     </sub>
     <sub name="Object Hierarchy" link="object-tree.html"/>
     <sub name="API Index" link="api-index-full.html"/>
@@ -472,6 +487,35 @@
     <keyword type="function" name="nm_simple_connection_new_from_dbus ()" link="NMSimpleConnection.html#nm-simple-connection-new-from-dbus"/>
     <keyword type="function" name="nm_simple_connection_new_clone ()" link="NMSimpleConnection.html#nm-simple-connection-new-clone"/>
     <keyword type="struct" name="NMSimpleConnection" link="NMSimpleConnection.html#NMSimpleConnection-struct"/>
+    <keyword type="function" name="nm_remote_connection_update2 ()" link="NMRemoteConnection.html#nm-remote-connection-update2" since="1.12"/>
+    <keyword type="function" name="nm_remote_connection_update2_finish ()" link="NMRemoteConnection.html#nm-remote-connection-update2-finish"/>
+    <keyword type="function" name="nm_remote_connection_commit_changes ()" link="NMRemoteConnection.html#nm-remote-connection-commit-changes"/>
+    <keyword type="function" name="nm_remote_connection_commit_changes_async ()" link="NMRemoteConnection.html#nm-remote-connection-commit-changes-async"/>
+    <keyword type="function" name="nm_remote_connection_commit_changes_finish ()" link="NMRemoteConnection.html#nm-remote-connection-commit-changes-finish"/>
+    <keyword type="function" name="nm_remote_connection_save ()" link="NMRemoteConnection.html#nm-remote-connection-save"/>
+    <keyword type="function" name="nm_remote_connection_save_async ()" link="NMRemoteConnection.html#nm-remote-connection-save-async"/>
+    <keyword type="function" name="nm_remote_connection_save_finish ()" link="NMRemoteConnection.html#nm-remote-connection-save-finish"/>
+    <keyword type="function" name="nm_remote_connection_delete ()" link="NMRemoteConnection.html#nm-remote-connection-delete"/>
+    <keyword type="function" name="nm_remote_connection_delete_async ()" link="NMRemoteConnection.html#nm-remote-connection-delete-async"/>
+    <keyword type="function" name="nm_remote_connection_delete_finish ()" link="NMRemoteConnection.html#nm-remote-connection-delete-finish"/>
+    <keyword type="function" name="nm_remote_connection_get_secrets ()" link="NMRemoteConnection.html#nm-remote-connection-get-secrets"/>
+    <keyword type="function" name="nm_remote_connection_get_secrets_async ()" link="NMRemoteConnection.html#nm-remote-connection-get-secrets-async"/>
+    <keyword type="function" name="nm_remote_connection_get_secrets_finish ()" link="NMRemoteConnection.html#nm-remote-connection-get-secrets-finish"/>
+    <keyword type="function" name="nm_remote_connection_get_unsaved ()" link="NMRemoteConnection.html#nm-remote-connection-get-unsaved"/>
+    <keyword type="function" name="nm_remote_connection_get_flags ()" link="NMRemoteConnection.html#nm-remote-connection-get-flags" since="1.12"/>
+    <keyword type="function" name="nm_remote_connection_get_filename ()" link="NMRemoteConnection.html#nm-remote-connection-get-filename" since="1.12"/>
+    <keyword type="function" name="nm_remote_connection_get_visible ()" link="NMRemoteConnection.html#nm-remote-connection-get-visible"/>
+    <keyword type="macro" name="NM_REMOTE_CONNECTION_DBUS_CONNECTION" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-DBUS-CONNECTION:CAPS"/>
+    <keyword type="macro" name="NM_REMOTE_CONNECTION_PATH" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-PATH:CAPS"/>
+    <keyword type="macro" name="NM_REMOTE_CONNECTION_UNSAVED" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-UNSAVED:CAPS"/>
+    <keyword type="macro" name="NM_REMOTE_CONNECTION_FLAGS" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-FLAGS:CAPS"/>
+    <keyword type="macro" name="NM_REMOTE_CONNECTION_FILENAME" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-FILENAME:CAPS"/>
+    <keyword type="macro" name="NM_REMOTE_CONNECTION_VISIBLE" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-VISIBLE:CAPS"/>
+    <keyword type="struct" name="NMRemoteConnection" link="NMRemoteConnection.html#NMRemoteConnection-struct"/>
+    <keyword type="property" name="The “filename” property" link="NMRemoteConnection.html#NMRemoteConnection--filename"/>
+    <keyword type="property" name="The “flags” property" link="NMRemoteConnection.html#NMRemoteConnection--flags"/>
+    <keyword type="property" name="The “unsaved” property" link="NMRemoteConnection.html#NMRemoteConnection--unsaved"/>
+    <keyword type="property" name="The “visible” property" link="NMRemoteConnection.html#NMRemoteConnection--visible"/>
     <keyword type="function" name="NMSettingClearSecretsWithFlagsFn ()" link="NMSetting.html#NMSettingClearSecretsWithFlagsFn"/>
     <keyword type="function" name="NMSettingValueIterFn ()" link="NMSetting.html#NMSettingValueIterFn"/>
     <keyword type="function" name="nm_setting_lookup_type ()" link="NMSetting.html#nm-setting-lookup-type"/>
@@ -841,6 +885,18 @@
     <keyword type="macro" name="NM_SETTING_BOND_OPTION_LP_INTERVAL" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-LP-INTERVAL:CAPS"/>
     <keyword type="struct" name="NMSettingBond" link="NMSettingBond.html#NMSettingBond-struct"/>
     <keyword type="property" name="The “options” property" link="NMSettingBond.html#NMSettingBond--options"/>
+    <keyword type="function" name="nm_setting_bridge_port_new ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-new"/>
+    <keyword type="function" name="nm_setting_bridge_port_get_priority ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-priority"/>
+    <keyword type="function" name="nm_setting_bridge_port_get_path_cost ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-path-cost"/>
+    <keyword type="function" name="nm_setting_bridge_port_get_hairpin_mode ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-hairpin-mode"/>
+    <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_SETTING_NAME" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_PRIORITY" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_PATH_COST" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS"/>
+    <keyword type="struct" name="NMSettingBridgePort" link="NMSettingBridgePort.html#NMSettingBridgePort-struct"/>
+    <keyword type="property" name="The “hairpin-mode” property" link="NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode"/>
+    <keyword type="property" name="The “path-cost” property" link="NMSettingBridgePort.html#NMSettingBridgePort--path-cost"/>
+    <keyword type="property" name="The “priority” property" link="NMSettingBridgePort.html#NMSettingBridgePort--priority"/>
     <keyword type="function" name="nm_setting_bridge_new ()" link="NMSettingBridge.html#nm-setting-bridge-new"/>
     <keyword type="function" name="nm_setting_bridge_get_mac_address ()" link="NMSettingBridge.html#nm-setting-bridge-get-mac-address"/>
     <keyword type="function" name="nm_setting_bridge_get_stp ()" link="NMSettingBridge.html#nm-setting-bridge-get-stp"/>
@@ -871,18 +927,6 @@
     <keyword type="property" name="The “multicast-snooping” property" link="NMSettingBridge.html#NMSettingBridge--multicast-snooping"/>
     <keyword type="property" name="The “priority” property" link="NMSettingBridge.html#NMSettingBridge--priority"/>
     <keyword type="property" name="The “stp” property" link="NMSettingBridge.html#NMSettingBridge--stp"/>
-    <keyword type="function" name="nm_setting_bridge_port_new ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-new"/>
-    <keyword type="function" name="nm_setting_bridge_port_get_priority ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-priority"/>
-    <keyword type="function" name="nm_setting_bridge_port_get_path_cost ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-path-cost"/>
-    <keyword type="function" name="nm_setting_bridge_port_get_hairpin_mode ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-hairpin-mode"/>
-    <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_SETTING_NAME" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_PRIORITY" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_PATH_COST" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS"/>
-    <keyword type="struct" name="NMSettingBridgePort" link="NMSettingBridgePort.html#NMSettingBridgePort-struct"/>
-    <keyword type="property" name="The “hairpin-mode” property" link="NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode"/>
-    <keyword type="property" name="The “path-cost” property" link="NMSettingBridgePort.html#NMSettingBridgePort--path-cost"/>
-    <keyword type="property" name="The “priority” property" link="NMSettingBridgePort.html#NMSettingBridgePort--priority"/>
     <keyword type="function" name="nm_setting_cdma_new ()" link="NMSettingCdma.html#nm-setting-cdma-new"/>
     <keyword type="function" name="nm_setting_cdma_get_number ()" link="NMSettingCdma.html#nm-setting-cdma-get-number"/>
     <keyword type="function" name="nm_setting_cdma_get_username ()" link="NMSettingCdma.html#nm-setting-cdma-get-username"/>
@@ -1322,6 +1366,56 @@
     <keyword type="property" name="The “channel” property" link="NMSettingOlpcMesh.html#NMSettingOlpcMesh--channel"/>
     <keyword type="property" name="The “dhcp-anycast-address” property" link="NMSettingOlpcMesh.html#NMSettingOlpcMesh--dhcp-anycast-address"/>
     <keyword type="property" name="The “ssid” property" link="NMSettingOlpcMesh.html#NMSettingOlpcMesh--ssid"/>
+    <keyword type="function" name="nm_setting_ovs_bridge_new ()" link="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-new" since="1.10"/>
+    <keyword type="function" name="nm_setting_ovs_bridge_get_fail_mode ()" link="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-get-fail-mode" since="1.10"/>
+    <keyword type="function" name="nm_setting_ovs_bridge_get_mcast_snooping_enable ()" link="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-get-mcast-snooping-enable" since="1.10"/>
+    <keyword type="function" name="nm_setting_ovs_bridge_get_rstp_enable ()" link="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-get-rstp-enable" since="1.10"/>
+    <keyword type="function" name="nm_setting_ovs_bridge_get_stp_enable ()" link="libnm-nm-setting-ovs-bridge.html#nm-setting-ovs-bridge-get-stp-enable" since="1.10"/>
+    <keyword type="macro" name="NM_SETTING_OVS_BRIDGE_SETTING_NAME" link="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-SETTING-NAME:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_OVS_BRIDGE_FAIL_MODE" link="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-FAIL-MODE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE" link="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-MCAST-SNOOPING-ENABLE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_OVS_BRIDGE_RSTP_ENABLE" link="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-RSTP-ENABLE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_OVS_BRIDGE_STP_ENABLE" link="libnm-nm-setting-ovs-bridge.html#NM-SETTING-OVS-BRIDGE-STP-ENABLE:CAPS"/>
+    <keyword type="function" name="nm_setting_ovs_interface_new ()" link="libnm-nm-setting-ovs-interface.html#nm-setting-ovs-interface-new" since="1.10"/>
+    <keyword type="function" name="nm_setting_ovs_interface_get_interface_type ()" link="libnm-nm-setting-ovs-interface.html#nm-setting-ovs-interface-get-interface-type" since="1.10"/>
+    <keyword type="macro" name="NM_SETTING_OVS_INTERFACE_SETTING_NAME" link="libnm-nm-setting-ovs-interface.html#NM-SETTING-OVS-INTERFACE-SETTING-NAME:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_OVS_INTERFACE_TYPE" link="libnm-nm-setting-ovs-interface.html#NM-SETTING-OVS-INTERFACE-TYPE:CAPS"/>
+    <keyword type="function" name="nm_setting_ovs_patch_new ()" link="libnm-nm-setting-ovs-patch.html#nm-setting-ovs-patch-new" since="1.10"/>
+    <keyword type="function" name="nm_setting_ovs_patch_get_peer ()" link="libnm-nm-setting-ovs-patch.html#nm-setting-ovs-patch-get-peer" since="1.10"/>
+    <keyword type="macro" name="NM_SETTING_OVS_PATCH_SETTING_NAME" link="libnm-nm-setting-ovs-patch.html#NM-SETTING-OVS-PATCH-SETTING-NAME:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_OVS_PATCH_PEER" link="libnm-nm-setting-ovs-patch.html#NM-SETTING-OVS-PATCH-PEER:CAPS"/>
+    <keyword type="function" name="nm_setting_ovs_port_new ()" link="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-new" since="1.10"/>
+    <keyword type="function" name="nm_setting_ovs_port_get_vlan_mode ()" link="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-vlan-mode" since="1.10"/>
+    <keyword type="function" name="nm_setting_ovs_port_get_tag ()" link="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-tag" since="1.10"/>
+    <keyword type="function" name="nm_setting_ovs_port_get_lacp ()" link="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-lacp" since="1.10"/>
+    <keyword type="function" name="nm_setting_ovs_port_get_bond_mode ()" link="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-bond-mode" since="1.10"/>
+    <keyword type="function" name="nm_setting_ovs_port_get_bond_updelay ()" link="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-bond-updelay" since="1.10"/>
+    <keyword type="function" name="nm_setting_ovs_port_get_bond_downdelay ()" link="libnm-nm-setting-ovs-port.html#nm-setting-ovs-port-get-bond-downdelay" since="1.10"/>
+    <keyword type="macro" name="NM_SETTING_OVS_PORT_SETTING_NAME" link="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-SETTING-NAME:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_OVS_PORT_VLAN_MODE" link="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-VLAN-MODE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_OVS_PORT_TAG" link="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-TAG:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_OVS_PORT_LACP" link="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-LACP:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_OVS_PORT_BOND_MODE" link="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-BOND-MODE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_OVS_PORT_BOND_UPDELAY" link="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-BOND-UPDELAY:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_OVS_PORT_BOND_DOWNDELAY" link="libnm-nm-setting-ovs-port.html#NM-SETTING-OVS-PORT-BOND-DOWNDELAY:CAPS"/>
+    <keyword type="function" name="nm_setting_pppoe_new ()" link="NMSettingPppoe.html#nm-setting-pppoe-new"/>
+    <keyword type="function" name="nm_setting_pppoe_get_parent ()" link="NMSettingPppoe.html#nm-setting-pppoe-get-parent" since="1.10"/>
+    <keyword type="function" name="nm_setting_pppoe_get_service ()" link="NMSettingPppoe.html#nm-setting-pppoe-get-service"/>
+    <keyword type="function" name="nm_setting_pppoe_get_username ()" link="NMSettingPppoe.html#nm-setting-pppoe-get-username"/>
+    <keyword type="function" name="nm_setting_pppoe_get_password ()" link="NMSettingPppoe.html#nm-setting-pppoe-get-password"/>
+    <keyword type="function" name="nm_setting_pppoe_get_password_flags ()" link="NMSettingPppoe.html#nm-setting-pppoe-get-password-flags"/>
+    <keyword type="macro" name="NM_SETTING_PPPOE_SETTING_NAME" link="NMSettingPppoe.html#NM-SETTING-PPPOE-SETTING-NAME:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_PPPOE_PARENT" link="NMSettingPppoe.html#NM-SETTING-PPPOE-PARENT:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_PPPOE_SERVICE" link="NMSettingPppoe.html#NM-SETTING-PPPOE-SERVICE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_PPPOE_USERNAME" link="NMSettingPppoe.html#NM-SETTING-PPPOE-USERNAME:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_PPPOE_PASSWORD" link="NMSettingPppoe.html#NM-SETTING-PPPOE-PASSWORD:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_PPPOE_PASSWORD_FLAGS" link="NMSettingPppoe.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS"/>
+    <keyword type="struct" name="NMSettingPppoe" link="NMSettingPppoe.html#NMSettingPppoe-struct"/>
+    <keyword type="property" name="The “parent” property" link="NMSettingPppoe.html#NMSettingPppoe--parent"/>
+    <keyword type="property" name="The “password” property" link="NMSettingPppoe.html#NMSettingPppoe--password"/>
+    <keyword type="property" name="The “password-flags” property" link="NMSettingPppoe.html#NMSettingPppoe--password-flags"/>
+    <keyword type="property" name="The “service” property" link="NMSettingPppoe.html#NMSettingPppoe--service"/>
+    <keyword type="property" name="The “username” property" link="NMSettingPppoe.html#NMSettingPppoe--username"/>
     <keyword type="function" name="nm_setting_ppp_new ()" link="NMSettingPpp.html#nm-setting-ppp-new"/>
     <keyword type="function" name="nm_setting_ppp_get_noauth ()" link="NMSettingPpp.html#nm-setting-ppp-get-noauth"/>
     <keyword type="function" name="nm_setting_ppp_get_refuse_eap ()" link="NMSettingPpp.html#nm-setting-ppp-get-refuse-eap"/>
@@ -1379,24 +1473,22 @@
     <keyword type="property" name="The “refuse-pap” property" link="NMSettingPpp.html#NMSettingPpp--refuse-pap"/>
     <keyword type="property" name="The “require-mppe” property" link="NMSettingPpp.html#NMSettingPpp--require-mppe"/>
     <keyword type="property" name="The “require-mppe-128” property" link="NMSettingPpp.html#NMSettingPpp--require-mppe-128"/>
-    <keyword type="function" name="nm_setting_pppoe_new ()" link="NMSettingPppoe.html#nm-setting-pppoe-new"/>
-    <keyword type="function" name="nm_setting_pppoe_get_parent ()" link="NMSettingPppoe.html#nm-setting-pppoe-get-parent" since="1.10"/>
-    <keyword type="function" name="nm_setting_pppoe_get_service ()" link="NMSettingPppoe.html#nm-setting-pppoe-get-service"/>
-    <keyword type="function" name="nm_setting_pppoe_get_username ()" link="NMSettingPppoe.html#nm-setting-pppoe-get-username"/>
-    <keyword type="function" name="nm_setting_pppoe_get_password ()" link="NMSettingPppoe.html#nm-setting-pppoe-get-password"/>
-    <keyword type="function" name="nm_setting_pppoe_get_password_flags ()" link="NMSettingPppoe.html#nm-setting-pppoe-get-password-flags"/>
-    <keyword type="macro" name="NM_SETTING_PPPOE_SETTING_NAME" link="NMSettingPppoe.html#NM-SETTING-PPPOE-SETTING-NAME:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_PPPOE_PARENT" link="NMSettingPppoe.html#NM-SETTING-PPPOE-PARENT:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_PPPOE_SERVICE" link="NMSettingPppoe.html#NM-SETTING-PPPOE-SERVICE:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_PPPOE_USERNAME" link="NMSettingPppoe.html#NM-SETTING-PPPOE-USERNAME:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_PPPOE_PASSWORD" link="NMSettingPppoe.html#NM-SETTING-PPPOE-PASSWORD:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_PPPOE_PASSWORD_FLAGS" link="NMSettingPppoe.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS"/>
-    <keyword type="struct" name="NMSettingPppoe" link="NMSettingPppoe.html#NMSettingPppoe-struct"/>
-    <keyword type="property" name="The “parent” property" link="NMSettingPppoe.html#NMSettingPppoe--parent"/>
-    <keyword type="property" name="The “password” property" link="NMSettingPppoe.html#NMSettingPppoe--password"/>
-    <keyword type="property" name="The “password-flags” property" link="NMSettingPppoe.html#NMSettingPppoe--password-flags"/>
-    <keyword type="property" name="The “service” property" link="NMSettingPppoe.html#NMSettingPppoe--service"/>
-    <keyword type="property" name="The “username” property" link="NMSettingPppoe.html#NMSettingPppoe--username"/>
+    <keyword type="function" name="nm_setting_proxy_new ()" link="NMSettingProxy.html#nm-setting-proxy-new" since="1.6"/>
+    <keyword type="function" name="nm_setting_proxy_get_method ()" link="NMSettingProxy.html#nm-setting-proxy-get-method" since="1.6"/>
+    <keyword type="function" name="nm_setting_proxy_get_browser_only ()" link="NMSettingProxy.html#nm-setting-proxy-get-browser-only" since="1.6"/>
+    <keyword type="function" name="nm_setting_proxy_get_pac_url ()" link="NMSettingProxy.html#nm-setting-proxy-get-pac-url" since="1.6"/>
+    <keyword type="function" name="nm_setting_proxy_get_pac_script ()" link="NMSettingProxy.html#nm-setting-proxy-get-pac-script" since="1.6"/>
+    <keyword type="enum" name="enum NMSettingProxyMethod" link="NMSettingProxy.html#NMSettingProxyMethod" since="1.6"/>
+    <keyword type="macro" name="NM_SETTING_PROXY_SETTING_NAME" link="NMSettingProxy.html#NM-SETTING-PROXY-SETTING-NAME:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_PROXY_METHOD" link="NMSettingProxy.html#NM-SETTING-PROXY-METHOD:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_PROXY_BROWSER_ONLY" link="NMSettingProxy.html#NM-SETTING-PROXY-BROWSER-ONLY:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_PROXY_PAC_URL" link="NMSettingProxy.html#NM-SETTING-PROXY-PAC-URL:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_PROXY_PAC_SCRIPT" link="NMSettingProxy.html#NM-SETTING-PROXY-PAC-SCRIPT:CAPS"/>
+    <keyword type="struct" name="NMSettingProxy" link="NMSettingProxy.html#NMSettingProxy-struct"/>
+    <keyword type="property" name="The “browser-only” property" link="NMSettingProxy.html#NMSettingProxy--browser-only"/>
+    <keyword type="property" name="The “method” property" link="NMSettingProxy.html#NMSettingProxy--method"/>
+    <keyword type="property" name="The “pac-script” property" link="NMSettingProxy.html#NMSettingProxy--pac-script"/>
+    <keyword type="property" name="The “pac-url” property" link="NMSettingProxy.html#NMSettingProxy--pac-url"/>
     <keyword type="function" name="nm_setting_serial_new ()" link="NMSettingSerial.html#nm-setting-serial-new"/>
     <keyword type="function" name="nm_setting_serial_get_baud ()" link="NMSettingSerial.html#nm-setting-serial-get-baud"/>
     <keyword type="function" name="nm_setting_serial_get_bits ()" link="NMSettingSerial.html#nm-setting-serial-get-bits"/>
@@ -1416,6 +1508,82 @@
     <keyword type="property" name="The “parity” property" link="NMSettingSerial.html#NMSettingSerial--parity"/>
     <keyword type="property" name="The “send-delay” property" link="NMSettingSerial.html#NMSettingSerial--send-delay"/>
     <keyword type="property" name="The “stopbits” property" link="NMSettingSerial.html#NMSettingSerial--stopbits"/>
+    <keyword type="function" name="nm_tc_qdisc_new ()" link="libnm-nm-setting-tc-config.html#nm-tc-qdisc-new" since="1.12"/>
+    <keyword type="function" name="nm_tc_qdisc_ref ()" link="libnm-nm-setting-tc-config.html#nm-tc-qdisc-ref" since="1.12"/>
+    <keyword type="function" name="nm_tc_qdisc_unref ()" link="libnm-nm-setting-tc-config.html#nm-tc-qdisc-unref" since="1.12"/>
+    <keyword type="function" name="nm_tc_qdisc_equal ()" link="libnm-nm-setting-tc-config.html#nm-tc-qdisc-equal" since="1.12"/>
+    <keyword type="function" name="nm_tc_qdisc_dup ()" link="libnm-nm-setting-tc-config.html#nm-tc-qdisc-dup" since="1.12"/>
+    <keyword type="function" name="nm_tc_qdisc_get_kind ()" link="libnm-nm-setting-tc-config.html#nm-tc-qdisc-get-kind" since="1.12"/>
+    <keyword type="function" name="nm_tc_qdisc_get_handle ()" link="libnm-nm-setting-tc-config.html#nm-tc-qdisc-get-handle" since="1.12"/>
+    <keyword type="function" name="nm_tc_qdisc_set_handle ()" link="libnm-nm-setting-tc-config.html#nm-tc-qdisc-set-handle" since="1.12"/>
+    <keyword type="function" name="nm_tc_qdisc_get_parent ()" link="libnm-nm-setting-tc-config.html#nm-tc-qdisc-get-parent" since="1.12"/>
+    <keyword type="function" name="nm_tc_action_new ()" link="libnm-nm-setting-tc-config.html#nm-tc-action-new" since="1.12"/>
+    <keyword type="function" name="nm_tc_action_ref ()" link="libnm-nm-setting-tc-config.html#nm-tc-action-ref" since="1.12"/>
+    <keyword type="function" name="nm_tc_action_unref ()" link="libnm-nm-setting-tc-config.html#nm-tc-action-unref" since="1.12"/>
+    <keyword type="function" name="nm_tc_action_equal ()" link="libnm-nm-setting-tc-config.html#nm-tc-action-equal" since="1.12"/>
+    <keyword type="function" name="nm_tc_action_dup ()" link="libnm-nm-setting-tc-config.html#nm-tc-action-dup" since="1.12"/>
+    <keyword type="function" name="nm_tc_action_get_kind ()" link="libnm-nm-setting-tc-config.html#nm-tc-action-get-kind" since="1.12"/>
+    <keyword type="function" name="nm_tc_action_get_attribute_names ()" link="libnm-nm-setting-tc-config.html#nm-tc-action-get-attribute-names"/>
+    <keyword type="function" name="nm_tc_action_get_attribute ()" link="libnm-nm-setting-tc-config.html#nm-tc-action-get-attribute"/>
+    <keyword type="function" name="nm_tc_action_set_attribute ()" link="libnm-nm-setting-tc-config.html#nm-tc-action-set-attribute"/>
+    <keyword type="function" name="nm_tc_tfilter_new ()" link="libnm-nm-setting-tc-config.html#nm-tc-tfilter-new" since="1.12"/>
+    <keyword type="function" name="nm_tc_tfilter_ref ()" link="libnm-nm-setting-tc-config.html#nm-tc-tfilter-ref" since="1.12"/>
+    <keyword type="function" name="nm_tc_tfilter_unref ()" link="libnm-nm-setting-tc-config.html#nm-tc-tfilter-unref" since="1.12"/>
+    <keyword type="function" name="nm_tc_tfilter_equal ()" link="libnm-nm-setting-tc-config.html#nm-tc-tfilter-equal" since="1.12"/>
+    <keyword type="function" name="nm_tc_tfilter_dup ()" link="libnm-nm-setting-tc-config.html#nm-tc-tfilter-dup" since="1.12"/>
+    <keyword type="function" name="nm_tc_tfilter_get_kind ()" link="libnm-nm-setting-tc-config.html#nm-tc-tfilter-get-kind" since="1.12"/>
+    <keyword type="function" name="nm_tc_tfilter_get_handle ()" link="libnm-nm-setting-tc-config.html#nm-tc-tfilter-get-handle" since="1.12"/>
+    <keyword type="function" name="nm_tc_tfilter_set_handle ()" link="libnm-nm-setting-tc-config.html#nm-tc-tfilter-set-handle" since="1.12"/>
+    <keyword type="function" name="nm_tc_tfilter_get_parent ()" link="libnm-nm-setting-tc-config.html#nm-tc-tfilter-get-parent" since="1.12"/>
+    <keyword type="function" name="nm_tc_tfilter_get_action ()" link="libnm-nm-setting-tc-config.html#nm-tc-tfilter-get-action" since="1.12"/>
+    <keyword type="function" name="nm_tc_tfilter_set_action ()" link="libnm-nm-setting-tc-config.html#nm-tc-tfilter-set-action" since="1.12"/>
+    <keyword type="function" name="nm_setting_tc_config_new ()" link="libnm-nm-setting-tc-config.html#nm-setting-tc-config-new" since="1.12"/>
+    <keyword type="function" name="nm_setting_tc_config_get_num_qdiscs ()" link="libnm-nm-setting-tc-config.html#nm-setting-tc-config-get-num-qdiscs" since="1.12"/>
+    <keyword type="function" name="nm_setting_tc_config_get_qdisc ()" link="libnm-nm-setting-tc-config.html#nm-setting-tc-config-get-qdisc" since="1.12"/>
+    <keyword type="function" name="nm_setting_tc_config_add_qdisc ()" link="libnm-nm-setting-tc-config.html#nm-setting-tc-config-add-qdisc" since="1.12"/>
+    <keyword type="function" name="nm_setting_tc_config_remove_qdisc ()" link="libnm-nm-setting-tc-config.html#nm-setting-tc-config-remove-qdisc" since="1.12"/>
+    <keyword type="function" name="nm_setting_tc_config_remove_qdisc_by_value ()" link="libnm-nm-setting-tc-config.html#nm-setting-tc-config-remove-qdisc-by-value" since="1.12"/>
+    <keyword type="function" name="nm_setting_tc_config_clear_qdiscs ()" link="libnm-nm-setting-tc-config.html#nm-setting-tc-config-clear-qdiscs" since="1.12"/>
+    <keyword type="function" name="nm_setting_tc_config_get_num_tfilters ()" link="libnm-nm-setting-tc-config.html#nm-setting-tc-config-get-num-tfilters" since="1.12"/>
+    <keyword type="function" name="nm_setting_tc_config_get_tfilter ()" link="libnm-nm-setting-tc-config.html#nm-setting-tc-config-get-tfilter" since="1.12"/>
+    <keyword type="function" name="nm_setting_tc_config_add_tfilter ()" link="libnm-nm-setting-tc-config.html#nm-setting-tc-config-add-tfilter" since="1.12"/>
+    <keyword type="function" name="nm_setting_tc_config_remove_tfilter ()" link="libnm-nm-setting-tc-config.html#nm-setting-tc-config-remove-tfilter" since="1.12"/>
+    <keyword type="function" name="nm_setting_tc_config_remove_tfilter_by_value ()" link="libnm-nm-setting-tc-config.html#nm-setting-tc-config-remove-tfilter-by-value" since="1.12"/>
+    <keyword type="function" name="nm_setting_tc_config_clear_tfilters ()" link="libnm-nm-setting-tc-config.html#nm-setting-tc-config-clear-tfilters" since="1.12"/>
+    <keyword type="macro" name="NM_SETTING_TC_CONFIG_SETTING_NAME" link="libnm-nm-setting-tc-config.html#NM-SETTING-TC-CONFIG-SETTING-NAME:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_TC_CONFIG_QDISCS" link="libnm-nm-setting-tc-config.html#NM-SETTING-TC-CONFIG-QDISCS:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_TC_CONFIG_TFILTERS" link="libnm-nm-setting-tc-config.html#NM-SETTING-TC-CONFIG-TFILTERS:CAPS"/>
+    <keyword type="function" name="nm_setting_team_port_new ()" link="NMSettingTeamPort.html#nm-setting-team-port-new"/>
+    <keyword type="function" name="nm_setting_team_port_get_config ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-config"/>
+    <keyword type="function" name="nm_setting_team_port_get_queue_id ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-queue-id" since="1.12"/>
+    <keyword type="function" name="nm_setting_team_port_get_prio ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-prio" since="1.12"/>
+    <keyword type="function" name="nm_setting_team_port_get_sticky ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-sticky" since="1.12"/>
+    <keyword type="function" name="nm_setting_team_port_get_lacp_prio ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-lacp-prio" since="1.12"/>
+    <keyword type="function" name="nm_setting_team_port_get_lacp_key ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-lacp-key" since="1.12"/>
+    <keyword type="function" name="nm_setting_team_port_get_num_link_watchers ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-num-link-watchers" since="1.12"/>
+    <keyword type="function" name="nm_setting_team_port_get_link_watcher ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-link-watcher" since="1.12"/>
+    <keyword type="function" name="nm_setting_team_port_add_link_watcher ()" link="NMSettingTeamPort.html#nm-setting-team-port-add-link-watcher" since="1.12"/>
+    <keyword type="function" name="nm_setting_team_port_remove_link_watcher ()" link="NMSettingTeamPort.html#nm-setting-team-port-remove-link-watcher" since="1.12"/>
+    <keyword type="function" name="nm_setting_team_port_remove_link_watcher_by_value ()" link="NMSettingTeamPort.html#nm-setting-team-port-remove-link-watcher-by-value" since="1.12"/>
+    <keyword type="function" name="nm_setting_team_port_clear_link_watchers ()" link="NMSettingTeamPort.html#nm-setting-team-port-clear-link-watchers" since="1.12"/>
+    <keyword type="macro" name="NM_SETTING_TEAM_PORT_SETTING_NAME" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-SETTING-NAME:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_TEAM_PORT_CONFIG" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-CONFIG:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_TEAM_PORT_QUEUE_ID" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-QUEUE-ID:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_TEAM_PORT_PRIO" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-PRIO:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_TEAM_PORT_STICKY" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-STICKY:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_TEAM_PORT_LACP_PRIO" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-LACP-PRIO:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_TEAM_PORT_LACP_KEY" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-LACP-KEY:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_TEAM_PORT_LINK_WATCHERS" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-LINK-WATCHERS:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-QUEUE-ID-DEFAULT:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-LACP-PRIO-DEFAULT:CAPS"/>
+    <keyword type="struct" name="NMSettingTeamPort" link="NMSettingTeamPort.html#NMSettingTeamPort-struct"/>
+    <keyword type="property" name="The “config” property" link="NMSettingTeamPort.html#NMSettingTeamPort--config"/>
+    <keyword type="property" name="The “lacp-key” property" link="NMSettingTeamPort.html#NMSettingTeamPort--lacp-key"/>
+    <keyword type="property" name="The “lacp-prio” property" link="NMSettingTeamPort.html#NMSettingTeamPort--lacp-prio"/>
+    <keyword type="property" name="The “link-watchers” property" link="NMSettingTeamPort.html#NMSettingTeamPort--link-watchers"/>
+    <keyword type="property" name="The “prio” property" link="NMSettingTeamPort.html#NMSettingTeamPort--prio"/>
+    <keyword type="property" name="The “queue-id” property" link="NMSettingTeamPort.html#NMSettingTeamPort--queue-id"/>
+    <keyword type="property" name="The “sticky” property" link="NMSettingTeamPort.html#NMSettingTeamPort--sticky"/>
     <keyword type="function" name="nm_team_link_watcher_new_ethtool ()" link="NMSettingTeam.html#nm-team-link-watcher-new-ethtool" since="1.12"/>
     <keyword type="function" name="nm_team_link_watcher_new_nsna_ping ()" link="NMSettingTeam.html#nm-team-link-watcher-new-nsna-ping" since="1.12"/>
     <keyword type="function" name="nm_team_link_watcher_new_arp_ping ()" link="NMSettingTeam.html#nm-team-link-watcher-new-arp-ping" since="1.12"/>
@@ -1517,37 +1685,6 @@
     <keyword type="property" name="The “runner-tx-balancer” property" link="NMSettingTeam.html#NMSettingTeam--runner-tx-balancer"/>
     <keyword type="property" name="The “runner-tx-balancer-interval” property" link="NMSettingTeam.html#NMSettingTeam--runner-tx-balancer-interval"/>
     <keyword type="property" name="The “runner-tx-hash” property" link="NMSettingTeam.html#NMSettingTeam--runner-tx-hash"/>
-    <keyword type="function" name="nm_setting_team_port_new ()" link="NMSettingTeamPort.html#nm-setting-team-port-new"/>
-    <keyword type="function" name="nm_setting_team_port_get_config ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-config"/>
-    <keyword type="function" name="nm_setting_team_port_get_queue_id ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-queue-id" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_get_prio ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-prio" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_get_sticky ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-sticky" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_get_lacp_prio ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-lacp-prio" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_get_lacp_key ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-lacp-key" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_get_num_link_watchers ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-num-link-watchers" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_get_link_watcher ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-link-watcher" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_add_link_watcher ()" link="NMSettingTeamPort.html#nm-setting-team-port-add-link-watcher" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_remove_link_watcher ()" link="NMSettingTeamPort.html#nm-setting-team-port-remove-link-watcher" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_remove_link_watcher_by_value ()" link="NMSettingTeamPort.html#nm-setting-team-port-remove-link-watcher-by-value" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_clear_link_watchers ()" link="NMSettingTeamPort.html#nm-setting-team-port-clear-link-watchers" since="1.12"/>
-    <keyword type="macro" name="NM_SETTING_TEAM_PORT_SETTING_NAME" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-SETTING-NAME:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_TEAM_PORT_CONFIG" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-CONFIG:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_TEAM_PORT_QUEUE_ID" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-QUEUE-ID:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_TEAM_PORT_PRIO" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-PRIO:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_TEAM_PORT_STICKY" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-STICKY:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_TEAM_PORT_LACP_PRIO" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-LACP-PRIO:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_TEAM_PORT_LACP_KEY" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-LACP-KEY:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_TEAM_PORT_LINK_WATCHERS" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-LINK-WATCHERS:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-QUEUE-ID-DEFAULT:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-LACP-PRIO-DEFAULT:CAPS"/>
-    <keyword type="struct" name="NMSettingTeamPort" link="NMSettingTeamPort.html#NMSettingTeamPort-struct"/>
-    <keyword type="property" name="The “config” property" link="NMSettingTeamPort.html#NMSettingTeamPort--config"/>
-    <keyword type="property" name="The “lacp-key” property" link="NMSettingTeamPort.html#NMSettingTeamPort--lacp-key"/>
-    <keyword type="property" name="The “lacp-prio” property" link="NMSettingTeamPort.html#NMSettingTeamPort--lacp-prio"/>
-    <keyword type="property" name="The “link-watchers” property" link="NMSettingTeamPort.html#NMSettingTeamPort--link-watchers"/>
-    <keyword type="property" name="The “prio” property" link="NMSettingTeamPort.html#NMSettingTeamPort--prio"/>
-    <keyword type="property" name="The “queue-id” property" link="NMSettingTeamPort.html#NMSettingTeamPort--queue-id"/>
-    <keyword type="property" name="The “sticky” property" link="NMSettingTeamPort.html#NMSettingTeamPort--sticky"/>
     <keyword type="function" name="nm_setting_tun_new ()" link="NMSettingTun.html#nm-setting-tun-new" since="1.2"/>
     <keyword type="function" name="nm_setting_tun_get_mode ()" link="NMSettingTun.html#nm-setting-tun-get-mode" since="1.2"/>
     <keyword type="function" name="nm_setting_tun_get_owner ()" link="NMSettingTun.html#nm-setting-tun-get-owner" since="1.2"/>
@@ -1570,6 +1707,14 @@
     <keyword type="property" name="The “owner” property" link="NMSettingTun.html#NMSettingTun--owner"/>
     <keyword type="property" name="The “pi” property" link="NMSettingTun.html#NMSettingTun--pi"/>
     <keyword type="property" name="The “vnet-hdr” property" link="NMSettingTun.html#NMSettingTun--vnet-hdr"/>
+    <keyword type="function" name="nm_setting_user_new ()" link="libnm-nm-setting-user.html#nm-setting-user-new"/>
+    <keyword type="function" name="nm_setting_user_get_keys ()" link="libnm-nm-setting-user.html#nm-setting-user-get-keys"/>
+    <keyword type="function" name="nm_setting_user_get_data ()" link="libnm-nm-setting-user.html#nm-setting-user-get-data" since="1.8"/>
+    <keyword type="function" name="nm_setting_user_set_data ()" link="libnm-nm-setting-user.html#nm-setting-user-set-data" since="1.8"/>
+    <keyword type="function" name="nm_setting_user_check_key ()" link="libnm-nm-setting-user.html#nm-setting-user-check-key" since="1.8"/>
+    <keyword type="function" name="nm_setting_user_check_val ()" link="libnm-nm-setting-user.html#nm-setting-user-check-val" since="1.8"/>
+    <keyword type="macro" name="NM_SETTING_USER_SETTING_NAME" link="libnm-nm-setting-user.html#NM-SETTING-USER-SETTING-NAME:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_USER_DATA" link="libnm-nm-setting-user.html#NM-SETTING-USER-DATA:CAPS"/>
     <keyword type="function" name="nm_setting_vlan_new ()" link="NMSettingVlan.html#nm-setting-vlan-new"/>
     <keyword type="function" name="nm_setting_vlan_get_parent ()" link="NMSettingVlan.html#nm-setting-vlan-get-parent"/>
     <keyword type="function" name="nm_setting_vlan_get_id ()" link="NMSettingVlan.html#nm-setting-vlan-get-id"/>
@@ -1746,74 +1891,6 @@
     <keyword type="property" name="The “speed” property" link="NMSettingWired.html#NMSettingWired--speed"/>
     <keyword type="property" name="The “wake-on-lan” property" link="NMSettingWired.html#NMSettingWired--wake-on-lan"/>
     <keyword type="property" name="The “wake-on-lan-password” property" link="NMSettingWired.html#NMSettingWired--wake-on-lan-password"/>
-    <keyword type="function" name="nm_setting_wireless_new ()" link="NMSettingWireless.html#nm-setting-wireless-new"/>
-    <keyword type="function" name="nm_setting_wireless_get_ssid ()" link="NMSettingWireless.html#nm-setting-wireless-get-ssid"/>
-    <keyword type="function" name="nm_setting_wireless_get_mode ()" link="NMSettingWireless.html#nm-setting-wireless-get-mode"/>
-    <keyword type="function" name="nm_setting_wireless_get_band ()" link="NMSettingWireless.html#nm-setting-wireless-get-band"/>
-    <keyword type="function" name="nm_setting_wireless_get_channel ()" link="NMSettingWireless.html#nm-setting-wireless-get-channel"/>
-    <keyword type="function" name="nm_setting_wireless_get_bssid ()" link="NMSettingWireless.html#nm-setting-wireless-get-bssid"/>
-    <keyword type="function" name="nm_setting_wireless_get_rate ()" link="NMSettingWireless.html#nm-setting-wireless-get-rate"/>
-    <keyword type="function" name="nm_setting_wireless_get_tx_power ()" link="NMSettingWireless.html#nm-setting-wireless-get-tx-power"/>
-    <keyword type="function" name="nm_setting_wireless_get_mac_address ()" link="NMSettingWireless.html#nm-setting-wireless-get-mac-address"/>
-    <keyword type="function" name="nm_setting_wireless_get_cloned_mac_address ()" link="NMSettingWireless.html#nm-setting-wireless-get-cloned-mac-address"/>
-    <keyword type="function" name="nm_setting_wireless_get_generate_mac_address_mask ()" link="NMSettingWireless.html#nm-setting-wireless-get-generate-mac-address-mask" since="1.4"/>
-    <keyword type="function" name="nm_setting_wireless_get_mac_address_blacklist ()" link="NMSettingWireless.html#nm-setting-wireless-get-mac-address-blacklist"/>
-    <keyword type="function" name="nm_setting_wireless_get_num_mac_blacklist_items ()" link="NMSettingWireless.html#nm-setting-wireless-get-num-mac-blacklist-items"/>
-    <keyword type="function" name="nm_setting_wireless_get_mac_blacklist_item ()" link="NMSettingWireless.html#nm-setting-wireless-get-mac-blacklist-item"/>
-    <keyword type="function" name="nm_setting_wireless_add_mac_blacklist_item ()" link="NMSettingWireless.html#nm-setting-wireless-add-mac-blacklist-item"/>
-    <keyword type="function" name="nm_setting_wireless_remove_mac_blacklist_item ()" link="NMSettingWireless.html#nm-setting-wireless-remove-mac-blacklist-item"/>
-    <keyword type="function" name="nm_setting_wireless_remove_mac_blacklist_item_by_value ()" link="NMSettingWireless.html#nm-setting-wireless-remove-mac-blacklist-item-by-value"/>
-    <keyword type="function" name="nm_setting_wireless_clear_mac_blacklist_items ()" link="NMSettingWireless.html#nm-setting-wireless-clear-mac-blacklist-items"/>
-    <keyword type="function" name="nm_setting_wireless_get_mtu ()" link="NMSettingWireless.html#nm-setting-wireless-get-mtu"/>
-    <keyword type="function" name="nm_setting_wireless_get_hidden ()" link="NMSettingWireless.html#nm-setting-wireless-get-hidden"/>
-    <keyword type="function" name="nm_setting_wireless_get_powersave ()" link="NMSettingWireless.html#nm-setting-wireless-get-powersave" since="1.2"/>
-    <keyword type="function" name="nm_setting_wireless_get_mac_address_randomization ()" link="NMSettingWireless.html#nm-setting-wireless-get-mac-address-randomization" since="1.2"/>
-    <keyword type="function" name="nm_setting_wireless_add_seen_bssid ()" link="NMSettingWireless.html#nm-setting-wireless-add-seen-bssid"/>
-    <keyword type="function" name="nm_setting_wireless_get_num_seen_bssids ()" link="NMSettingWireless.html#nm-setting-wireless-get-num-seen-bssids"/>
-    <keyword type="function" name="nm_setting_wireless_get_seen_bssid ()" link="NMSettingWireless.html#nm-setting-wireless-get-seen-bssid"/>
-    <keyword type="function" name="nm_setting_wireless_ap_security_compatible ()" link="NMSettingWireless.html#nm-setting-wireless-ap-security-compatible"/>
-    <keyword type="function" name="nm_setting_wireless_get_wake_on_wlan ()" link="NMSettingWireless.html#nm-setting-wireless-get-wake-on-wlan" since="1.12"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_SETTING_NAME" link="NMSettingWireless.html#NM-SETTING-WIRELESS-SETTING-NAME:CAPS"/>
-    <keyword type="enum" name="enum NMSettingWirelessWakeOnWLan" link="NMSettingWireless.html#NMSettingWirelessWakeOnWLan" since="1.12"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_SSID" link="NMSettingWireless.html#NM-SETTING-WIRELESS-SSID:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_MODE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_BAND" link="NMSettingWireless.html#NM-SETTING-WIRELESS-BAND:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_CHANNEL" link="NMSettingWireless.html#NM-SETTING-WIRELESS-CHANNEL:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_BSSID" link="NMSettingWireless.html#NM-SETTING-WIRELESS-BSSID:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_RATE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-RATE:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_TX_POWER" link="NMSettingWireless.html#NM-SETTING-WIRELESS-TX-POWER:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_MAC_ADDRESS" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MAC-ADDRESS:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS" link="NMSettingWireless.html#NM-SETTING-WIRELESS-CLONED-MAC-ADDRESS:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK" link="NMSettingWireless.html#NM-SETTING-WIRELESS-GENERATE-MAC-ADDRESS-MASK:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MAC-ADDRESS-BLACKLIST:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_MTU" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_SEEN_BSSIDS" link="NMSettingWireless.html#NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_HIDDEN" link="NMSettingWireless.html#NM-SETTING-WIRELESS-HIDDEN:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_POWERSAVE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MAC-ADDRESS-RANDOMIZATION:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_ADHOC" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_AP" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-AP:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_INFRA" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS"/>
-    <keyword type="enum" name="enum NMSettingWirelessPowersave" link="NMSettingWireless.html#NMSettingWirelessPowersave"/>
-    <keyword type="struct" name="NMSettingWireless" link="NMSettingWireless.html#NMSettingWireless-struct"/>
-    <keyword type="property" name="The “band” property" link="NMSettingWireless.html#NMSettingWireless--band"/>
-    <keyword type="property" name="The “bssid” property" link="NMSettingWireless.html#NMSettingWireless--bssid"/>
-    <keyword type="property" name="The “channel” property" link="NMSettingWireless.html#NMSettingWireless--channel"/>
-    <keyword type="property" name="The “cloned-mac-address” property" link="NMSettingWireless.html#NMSettingWireless--cloned-mac-address"/>
-    <keyword type="property" name="The “generate-mac-address-mask” property" link="NMSettingWireless.html#NMSettingWireless--generate-mac-address-mask"/>
-    <keyword type="property" name="The “hidden” property" link="NMSettingWireless.html#NMSettingWireless--hidden"/>
-    <keyword type="property" name="The “mac-address” property" link="NMSettingWireless.html#NMSettingWireless--mac-address"/>
-    <keyword type="property" name="The “mac-address-blacklist” property" link="NMSettingWireless.html#NMSettingWireless--mac-address-blacklist"/>
-    <keyword type="property" name="The “mac-address-randomization” property" link="NMSettingWireless.html#NMSettingWireless--mac-address-randomization"/>
-    <keyword type="property" name="The “mode” property" link="NMSettingWireless.html#NMSettingWireless--mode"/>
-    <keyword type="property" name="The “mtu” property" link="NMSettingWireless.html#NMSettingWireless--mtu"/>
-    <keyword type="property" name="The “powersave” property" link="NMSettingWireless.html#NMSettingWireless--powersave"/>
-    <keyword type="property" name="The “rate” property" link="NMSettingWireless.html#NMSettingWireless--rate"/>
-    <keyword type="property" name="The “seen-bssids” property" link="NMSettingWireless.html#NMSettingWireless--seen-bssids"/>
-    <keyword type="property" name="The “ssid” property" link="NMSettingWireless.html#NMSettingWireless--ssid"/>
-    <keyword type="property" name="The “tx-power” property" link="NMSettingWireless.html#NMSettingWireless--tx-power"/>
-    <keyword type="property" name="The “wake-on-wlan” property" link="NMSettingWireless.html#NMSettingWireless--wake-on-wlan"/>
     <keyword type="function" name="nm_setting_wireless_security_new ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-new"/>
     <keyword type="function" name="nm_setting_wireless_security_get_key_mgmt ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-key-mgmt"/>
     <keyword type="function" name="nm_setting_wireless_security_get_num_protos ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-num-protos"/>
@@ -1894,6 +1971,74 @@
     <keyword type="property" name="The “wep-key3” property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key3"/>
     <keyword type="property" name="The “wep-tx-keyidx” property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-tx-keyidx"/>
     <keyword type="property" name="The “wps-method” property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wps-method"/>
+    <keyword type="function" name="nm_setting_wireless_new ()" link="NMSettingWireless.html#nm-setting-wireless-new"/>
+    <keyword type="function" name="nm_setting_wireless_get_ssid ()" link="NMSettingWireless.html#nm-setting-wireless-get-ssid"/>
+    <keyword type="function" name="nm_setting_wireless_get_mode ()" link="NMSettingWireless.html#nm-setting-wireless-get-mode"/>
+    <keyword type="function" name="nm_setting_wireless_get_band ()" link="NMSettingWireless.html#nm-setting-wireless-get-band"/>
+    <keyword type="function" name="nm_setting_wireless_get_channel ()" link="NMSettingWireless.html#nm-setting-wireless-get-channel"/>
+    <keyword type="function" name="nm_setting_wireless_get_bssid ()" link="NMSettingWireless.html#nm-setting-wireless-get-bssid"/>
+    <keyword type="function" name="nm_setting_wireless_get_rate ()" link="NMSettingWireless.html#nm-setting-wireless-get-rate"/>
+    <keyword type="function" name="nm_setting_wireless_get_tx_power ()" link="NMSettingWireless.html#nm-setting-wireless-get-tx-power"/>
+    <keyword type="function" name="nm_setting_wireless_get_mac_address ()" link="NMSettingWireless.html#nm-setting-wireless-get-mac-address"/>
+    <keyword type="function" name="nm_setting_wireless_get_cloned_mac_address ()" link="NMSettingWireless.html#nm-setting-wireless-get-cloned-mac-address"/>
+    <keyword type="function" name="nm_setting_wireless_get_generate_mac_address_mask ()" link="NMSettingWireless.html#nm-setting-wireless-get-generate-mac-address-mask" since="1.4"/>
+    <keyword type="function" name="nm_setting_wireless_get_mac_address_blacklist ()" link="NMSettingWireless.html#nm-setting-wireless-get-mac-address-blacklist"/>
+    <keyword type="function" name="nm_setting_wireless_get_num_mac_blacklist_items ()" link="NMSettingWireless.html#nm-setting-wireless-get-num-mac-blacklist-items"/>
+    <keyword type="function" name="nm_setting_wireless_get_mac_blacklist_item ()" link="NMSettingWireless.html#nm-setting-wireless-get-mac-blacklist-item"/>
+    <keyword type="function" name="nm_setting_wireless_add_mac_blacklist_item ()" link="NMSettingWireless.html#nm-setting-wireless-add-mac-blacklist-item"/>
+    <keyword type="function" name="nm_setting_wireless_remove_mac_blacklist_item ()" link="NMSettingWireless.html#nm-setting-wireless-remove-mac-blacklist-item"/>
+    <keyword type="function" name="nm_setting_wireless_remove_mac_blacklist_item_by_value ()" link="NMSettingWireless.html#nm-setting-wireless-remove-mac-blacklist-item-by-value"/>
+    <keyword type="function" name="nm_setting_wireless_clear_mac_blacklist_items ()" link="NMSettingWireless.html#nm-setting-wireless-clear-mac-blacklist-items"/>
+    <keyword type="function" name="nm_setting_wireless_get_mtu ()" link="NMSettingWireless.html#nm-setting-wireless-get-mtu"/>
+    <keyword type="function" name="nm_setting_wireless_get_hidden ()" link="NMSettingWireless.html#nm-setting-wireless-get-hidden"/>
+    <keyword type="function" name="nm_setting_wireless_get_powersave ()" link="NMSettingWireless.html#nm-setting-wireless-get-powersave" since="1.2"/>
+    <keyword type="function" name="nm_setting_wireless_get_mac_address_randomization ()" link="NMSettingWireless.html#nm-setting-wireless-get-mac-address-randomization" since="1.2"/>
+    <keyword type="function" name="nm_setting_wireless_add_seen_bssid ()" link="NMSettingWireless.html#nm-setting-wireless-add-seen-bssid"/>
+    <keyword type="function" name="nm_setting_wireless_get_num_seen_bssids ()" link="NMSettingWireless.html#nm-setting-wireless-get-num-seen-bssids"/>
+    <keyword type="function" name="nm_setting_wireless_get_seen_bssid ()" link="NMSettingWireless.html#nm-setting-wireless-get-seen-bssid"/>
+    <keyword type="function" name="nm_setting_wireless_ap_security_compatible ()" link="NMSettingWireless.html#nm-setting-wireless-ap-security-compatible"/>
+    <keyword type="function" name="nm_setting_wireless_get_wake_on_wlan ()" link="NMSettingWireless.html#nm-setting-wireless-get-wake-on-wlan" since="1.12"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_SETTING_NAME" link="NMSettingWireless.html#NM-SETTING-WIRELESS-SETTING-NAME:CAPS"/>
+    <keyword type="enum" name="enum NMSettingWirelessWakeOnWLan" link="NMSettingWireless.html#NMSettingWirelessWakeOnWLan" since="1.12"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_SSID" link="NMSettingWireless.html#NM-SETTING-WIRELESS-SSID:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_MODE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_BAND" link="NMSettingWireless.html#NM-SETTING-WIRELESS-BAND:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_CHANNEL" link="NMSettingWireless.html#NM-SETTING-WIRELESS-CHANNEL:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_BSSID" link="NMSettingWireless.html#NM-SETTING-WIRELESS-BSSID:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_RATE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-RATE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_TX_POWER" link="NMSettingWireless.html#NM-SETTING-WIRELESS-TX-POWER:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_MAC_ADDRESS" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MAC-ADDRESS:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS" link="NMSettingWireless.html#NM-SETTING-WIRELESS-CLONED-MAC-ADDRESS:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK" link="NMSettingWireless.html#NM-SETTING-WIRELESS-GENERATE-MAC-ADDRESS-MASK:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MAC-ADDRESS-BLACKLIST:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_MTU" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_SEEN_BSSIDS" link="NMSettingWireless.html#NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_HIDDEN" link="NMSettingWireless.html#NM-SETTING-WIRELESS-HIDDEN:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_POWERSAVE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MAC-ADDRESS-RANDOMIZATION:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_ADHOC" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_AP" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-AP:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_INFRA" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS"/>
+    <keyword type="enum" name="enum NMSettingWirelessPowersave" link="NMSettingWireless.html#NMSettingWirelessPowersave"/>
+    <keyword type="struct" name="NMSettingWireless" link="NMSettingWireless.html#NMSettingWireless-struct"/>
+    <keyword type="property" name="The “band” property" link="NMSettingWireless.html#NMSettingWireless--band"/>
+    <keyword type="property" name="The “bssid” property" link="NMSettingWireless.html#NMSettingWireless--bssid"/>
+    <keyword type="property" name="The “channel” property" link="NMSettingWireless.html#NMSettingWireless--channel"/>
+    <keyword type="property" name="The “cloned-mac-address” property" link="NMSettingWireless.html#NMSettingWireless--cloned-mac-address"/>
+    <keyword type="property" name="The “generate-mac-address-mask” property" link="NMSettingWireless.html#NMSettingWireless--generate-mac-address-mask"/>
+    <keyword type="property" name="The “hidden” property" link="NMSettingWireless.html#NMSettingWireless--hidden"/>
+    <keyword type="property" name="The “mac-address” property" link="NMSettingWireless.html#NMSettingWireless--mac-address"/>
+    <keyword type="property" name="The “mac-address-blacklist” property" link="NMSettingWireless.html#NMSettingWireless--mac-address-blacklist"/>
+    <keyword type="property" name="The “mac-address-randomization” property" link="NMSettingWireless.html#NMSettingWireless--mac-address-randomization"/>
+    <keyword type="property" name="The “mode” property" link="NMSettingWireless.html#NMSettingWireless--mode"/>
+    <keyword type="property" name="The “mtu” property" link="NMSettingWireless.html#NMSettingWireless--mtu"/>
+    <keyword type="property" name="The “powersave” property" link="NMSettingWireless.html#NMSettingWireless--powersave"/>
+    <keyword type="property" name="The “rate” property" link="NMSettingWireless.html#NMSettingWireless--rate"/>
+    <keyword type="property" name="The “seen-bssids” property" link="NMSettingWireless.html#NMSettingWireless--seen-bssids"/>
+    <keyword type="property" name="The “ssid” property" link="NMSettingWireless.html#NMSettingWireless--ssid"/>
+    <keyword type="property" name="The “tx-power” property" link="NMSettingWireless.html#NMSettingWireless--tx-power"/>
+    <keyword type="property" name="The “wake-on-wlan” property" link="NMSettingWireless.html#NMSettingWireless--wake-on-wlan"/>
     <keyword type="function" name="nm_device_get_iface ()" link="NMDevice.html#nm-device-get-iface"/>
     <keyword type="function" name="nm_device_get_ip_iface ()" link="NMDevice.html#nm-device-get-ip-iface"/>
     <keyword type="function" name="nm_device_get_device_type ()" link="NMDevice.html#nm-device-get-device-type"/>
@@ -2410,35 +2555,6 @@
     <keyword type="property" name="The “banner” property" link="NMVpnConnection.html#NMVpnConnection--banner"/>
     <keyword type="property" name="The “vpn-state” property" link="NMVpnConnection.html#NMVpnConnection--vpn-state"/>
     <keyword type="signal" name="The “vpn-state-changed” signal" link="NMVpnConnection.html#NMVpnConnection-vpn-state-changed"/>
-    <keyword type="function" name="nm_remote_connection_update2 ()" link="NMRemoteConnection.html#nm-remote-connection-update2" since="1.12"/>
-    <keyword type="function" name="nm_remote_connection_update2_finish ()" link="NMRemoteConnection.html#nm-remote-connection-update2-finish"/>
-    <keyword type="function" name="nm_remote_connection_commit_changes ()" link="NMRemoteConnection.html#nm-remote-connection-commit-changes"/>
-    <keyword type="function" name="nm_remote_connection_commit_changes_async ()" link="NMRemoteConnection.html#nm-remote-connection-commit-changes-async"/>
-    <keyword type="function" name="nm_remote_connection_commit_changes_finish ()" link="NMRemoteConnection.html#nm-remote-connection-commit-changes-finish"/>
-    <keyword type="function" name="nm_remote_connection_save ()" link="NMRemoteConnection.html#nm-remote-connection-save"/>
-    <keyword type="function" name="nm_remote_connection_save_async ()" link="NMRemoteConnection.html#nm-remote-connection-save-async"/>
-    <keyword type="function" name="nm_remote_connection_save_finish ()" link="NMRemoteConnection.html#nm-remote-connection-save-finish"/>
-    <keyword type="function" name="nm_remote_connection_delete ()" link="NMRemoteConnection.html#nm-remote-connection-delete"/>
-    <keyword type="function" name="nm_remote_connection_delete_async ()" link="NMRemoteConnection.html#nm-remote-connection-delete-async"/>
-    <keyword type="function" name="nm_remote_connection_delete_finish ()" link="NMRemoteConnection.html#nm-remote-connection-delete-finish"/>
-    <keyword type="function" name="nm_remote_connection_get_secrets ()" link="NMRemoteConnection.html#nm-remote-connection-get-secrets"/>
-    <keyword type="function" name="nm_remote_connection_get_secrets_async ()" link="NMRemoteConnection.html#nm-remote-connection-get-secrets-async"/>
-    <keyword type="function" name="nm_remote_connection_get_secrets_finish ()" link="NMRemoteConnection.html#nm-remote-connection-get-secrets-finish"/>
-    <keyword type="function" name="nm_remote_connection_get_unsaved ()" link="NMRemoteConnection.html#nm-remote-connection-get-unsaved"/>
-    <keyword type="function" name="nm_remote_connection_get_flags ()" link="NMRemoteConnection.html#nm-remote-connection-get-flags" since="1.12"/>
-    <keyword type="function" name="nm_remote_connection_get_filename ()" link="NMRemoteConnection.html#nm-remote-connection-get-filename" since="1.12"/>
-    <keyword type="function" name="nm_remote_connection_get_visible ()" link="NMRemoteConnection.html#nm-remote-connection-get-visible"/>
-    <keyword type="macro" name="NM_REMOTE_CONNECTION_DBUS_CONNECTION" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-DBUS-CONNECTION:CAPS"/>
-    <keyword type="macro" name="NM_REMOTE_CONNECTION_PATH" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-PATH:CAPS"/>
-    <keyword type="macro" name="NM_REMOTE_CONNECTION_UNSAVED" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-UNSAVED:CAPS"/>
-    <keyword type="macro" name="NM_REMOTE_CONNECTION_FLAGS" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-FLAGS:CAPS"/>
-    <keyword type="macro" name="NM_REMOTE_CONNECTION_FILENAME" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-FILENAME:CAPS"/>
-    <keyword type="macro" name="NM_REMOTE_CONNECTION_VISIBLE" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-VISIBLE:CAPS"/>
-    <keyword type="struct" name="NMRemoteConnection" link="NMRemoteConnection.html#NMRemoteConnection-struct"/>
-    <keyword type="property" name="The “filename” property" link="NMRemoteConnection.html#NMRemoteConnection--filename"/>
-    <keyword type="property" name="The “flags” property" link="NMRemoteConnection.html#NMRemoteConnection--flags"/>
-    <keyword type="property" name="The “unsaved” property" link="NMRemoteConnection.html#NMRemoteConnection--unsaved"/>
-    <keyword type="property" name="The “visible” property" link="NMRemoteConnection.html#NMRemoteConnection--visible"/>
     <keyword type="function" name="nm_access_point_get_flags ()" link="NMAccessPoint.html#nm-access-point-get-flags"/>
     <keyword type="function" name="nm_access_point_get_wpa_flags ()" link="NMAccessPoint.html#nm-access-point-get-wpa-flags"/>
     <keyword type="function" name="nm_access_point_get_rsn_flags ()" link="NMAccessPoint.html#nm-access-point-get-rsn-flags"/>
@@ -2519,6 +2635,12 @@
     <keyword type="macro" name="NM_DHCP_CONFIG_OPTIONS" link="NMDhcpConfig.html#NM-DHCP-CONFIG-OPTIONS:CAPS"/>
     <keyword type="property" name="The “family” property" link="NMDhcpConfig.html#NMDhcpConfig--family"/>
     <keyword type="property" name="The “options” property" link="NMDhcpConfig.html#NMDhcpConfig--options"/>
+    <keyword type="function" name="nm_checkpoint_get_devices ()" link="libnm-nm-checkpoint.html#nm-checkpoint-get-devices" since="1.12"/>
+    <keyword type="function" name="nm_checkpoint_get_created ()" link="libnm-nm-checkpoint.html#nm-checkpoint-get-created" since="1.12"/>
+    <keyword type="function" name="nm_checkpoint_get_rollback_timeout ()" link="libnm-nm-checkpoint.html#nm-checkpoint-get-rollback-timeout" since="1.12"/>
+    <keyword type="macro" name="NM_CHECKPOINT_DEVICES" link="libnm-nm-checkpoint.html#NM-CHECKPOINT-DEVICES:CAPS"/>
+    <keyword type="macro" name="NM_CHECKPOINT_CREATED" link="libnm-nm-checkpoint.html#NM-CHECKPOINT-CREATED:CAPS"/>
+    <keyword type="macro" name="NM_CHECKPOINT_ROLLBACK_TIMEOUT" link="libnm-nm-checkpoint.html#NM-CHECKPOINT-ROLLBACK-TIMEOUT:CAPS"/>
     <keyword type="function" name="nm_utils_is_empty_ssid ()" link="libnm-nm-utils.html#nm-utils-is-empty-ssid"/>
     <keyword type="function" name="nm_utils_escape_ssid ()" link="libnm-nm-utils.html#nm-utils-escape-ssid"/>
     <keyword type="function" name="nm_utils_same_ssid ()" link="libnm-nm-utils.html#nm-utils-same-ssid"/>
@@ -2623,72 +2745,19 @@
     <keyword type="macro" name="NM_AVAILABLE_IN_1_10" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-10:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_1_12" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-12:CAPS"/>
     <keyword type="macro" name="NM_AVAILABLE_IN_1_12" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-12:CAPS"/>
-    <keyword type="macro" name="NM_DEPRECATED_IN_1_8_FOR()" link="libnm-nm-vpn-dbus-interface.html#NM-DEPRECATED-IN-1-8-FOR:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_PATH_VPN" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-PATH-VPN:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_INTERFACE_VPN" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-INTERFACE-VPN:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_PATH_VPN_CONNECTION" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-PATH-VPN-CONNECTION:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_INTERFACE_VPN_CONNECTION" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-INTERFACE-VPN-CONNECTION:CAPS"/>
-    <keyword type="macro" name="NM_VPN_DBUS_PLUGIN_PATH" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-DBUS-PLUGIN-PATH:CAPS"/>
-    <keyword type="macro" name="NM_VPN_DBUS_PLUGIN_INTERFACE" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-DBUS-PLUGIN-INTERFACE:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_NO_ACTIVE_VPN_CONNECTION" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-NO-ACTIVE-VPN-CONNECTION:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_NO_VPN_CONNECTIONS" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-NO-VPN-CONNECTIONS:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_INVALID_VPN_CONNECTION" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-INVALID-VPN-CONNECTION:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_ERROR_PREFIX" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-ERROR-PREFIX:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_STARTING_IN_PROGRESS" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-STARTING-IN-PROGRESS:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_ALREADY_STARTED" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-ALREADY-STARTED:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_STOPPING_IN_PROGRESS" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-STOPPING-IN-PROGRESS:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_ALREADY_STOPPED" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-ALREADY-STOPPED:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_WRONG_STATE" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-WRONG-STATE:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_BAD_ARGUMENTS" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-BAD-ARGUMENTS:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-INTERACTIVE-NOT-SUPPORTED:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_SIGNAL_LOGIN_BANNER" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-LOGIN-BANNER:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_SIGNAL_LOGIN_FAILED" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-LOGIN-FAILED:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-LAUNCH-FAILED:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_SIGNAL_CONNECT_FAILED" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-CONNECT-FAILED:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-VPN-CONFIG-BAD:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-IP-CONFIG-BAD:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_SIGNAL_STATE_CHANGE" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_VPN_SIGNAL_IP4_CONFIG" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS"/>
-    <keyword type="enum" name="enum NMVpnServiceState" link="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState"/>
-    <keyword type="enum" name="enum NMVpnConnectionState" link="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState"/>
-    <keyword type="enum" name="enum NMVpnConnectionStateReason" link="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionStateReason" deprecated=""/>
-    <keyword type="enum" name="enum NMVpnPluginFailure" link="libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_CONFIG_TUNDEV" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS" deprecated=""/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_CONFIG_PROXY_PAC" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-PROXY-PAC:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_CONFIG_BANNER" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-BANNER:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_CONFIG_MTU" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-MTU:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_CONFIG_HAS_IP4" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-HAS-IP4:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_CONFIG_HAS_IP6" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-HAS-IP6:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_CAN_PERSIST" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CAN-PERSIST:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-INT-GATEWAY:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-ADDRESS:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_PTP" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-PTP:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_PREFIX" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-PREFIX:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_DNS" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-DNS:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_NBNS" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-NBNS:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_MSS" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-MSS:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAIN:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAINS:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_ROUTES" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-ROUTES:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-PRESERVE-ROUTES:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-NEVER-DEFAULT:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-GATEWAY:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_BANNER" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-BANNER:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-EXT-GATEWAY:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_MTU" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-MTU:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP4-CONFIG-TUNDEV:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-INT-GATEWAY:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-ADDRESS:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_PTP" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-PTP:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_PREFIX" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-PREFIX:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_DNS" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-DNS:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_MSS" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-MSS:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAIN:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAINS:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_ROUTES" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-ROUTES:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-PRESERVE-ROUTES:CAPS"/>
-    <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-NEVER-DEFAULT:CAPS"/>
+    <keyword type="macro" name="NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME" link="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-DBUS-SERVICE-NAME:CAPS"/>
+    <keyword type="macro" name="NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER" link="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-DBUS-WATCH-PEER:CAPS"/>
+    <keyword type="macro" name="NM_VPN_SERVICE_PLUGIN_STATE" link="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-STATE:CAPS"/>
+    <keyword type="macro" name="NM_VPN_PLUGIN_INFO_NAME" link="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-NAME:CAPS"/>
+    <keyword type="macro" name="NM_VPN_PLUGIN_INFO_FILENAME" link="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-FILENAME:CAPS"/>
+    <keyword type="macro" name="NM_VPN_PLUGIN_INFO_KEYFILE" link="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-KEYFILE:CAPS"/>
+    <keyword type="macro" name="NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION" link="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-KF-GROUP-CONNECTION:CAPS"/>
+    <keyword type="macro" name="NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM" link="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-KF-GROUP-LIBNM:CAPS"/>
+    <keyword type="macro" name="NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME" link="libnm-nm-vpn-plugin-info.html#NM-VPN-PLUGIN-INFO-KF-GROUP-GNOME:CAPS"/>
+    <keyword type="struct" name="NMVpnPluginInfo" link="libnm-nm-vpn-plugin-info.html#NMVpnPluginInfo"/>
+    <keyword type="function" name="nm_vpn_editor_get_widget ()" link="NMVpnEditor.html#nm-vpn-editor-get-widget"/>
+    <keyword type="function" name="nm_vpn_editor_update_connection ()" link="NMVpnEditor.html#nm-vpn-editor-update-connection"/>
+    <keyword type="struct" name="NMVpnEditorInterface" link="NMVpnEditor.html#NMVpnEditorInterface"/>
     <keyword type="function" name="NMVpnEditorPluginFactory ()" link="NMVpnEditorPlugin.html#NMVpnEditorPluginFactory"/>
     <keyword type="function" name="nm_vpn_editor_plugin_factory ()" link="NMVpnEditorPlugin.html#nm-vpn-editor-plugin-factory"/>
     <keyword type="function" name="nm_vpn_editor_plugin_get_editor ()" link="NMVpnEditorPlugin.html#nm-vpn-editor-plugin-get-editor"/>
@@ -2713,6 +2782,8 @@
     <keyword type="property" name="The “name” property" link="NMVpnEditorPlugin.html#NMVpnEditorPlugin--name"/>
     <keyword type="property" name="The “service” property" link="NMVpnEditorPlugin.html#NMVpnEditorPlugin--service"/>
     <keyword type="signal" name="The “changed” signal" link="NMVpnEditorPlugin.html#NMVpnEditor-changed"/>
+    <keyword type="macro" name="NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME" link="libnm-nm-vpn-plugin-old.html#NM-VPN-PLUGIN-OLD-DBUS-SERVICE-NAME:CAPS"/>
+    <keyword type="macro" name="NM_VPN_PLUGIN_OLD_STATE" link="libnm-nm-vpn-plugin-old.html#NM-VPN-PLUGIN-OLD-STATE:CAPS"/>
     <keyword type="constant" name="NM_CLIENT_PERMISSION_NONE" link="NMClient.html#NM-CLIENT-PERMISSION-NONE:CAPS"/>
     <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-NETWORK:CAPS"/>
     <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIFI:CAPS"/>
@@ -3125,6 +3196,8 @@
     <keyword type="constant" name="NM_SETTING_MACVLAN_MODE_SOURCE" link="NMSettingMacvlan.html#NM-SETTING-MACVLAN-MODE-SOURCE:CAPS"/>
     <keyword type="constant" name="_NM_SETTING_MACVLAN_MODE_NUM" link="NMSettingMacvlan.html#NM-SETTING-MACVLAN-MODE-NUM:CAPS"/>
     <keyword type="constant" name="NM_SETTING_MACVLAN_MODE_LAST" link="NMSettingMacvlan.html#NM-SETTING-MACVLAN-MODE-LAST:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_PROXY_METHOD_NONE" link="NMSettingProxy.html#NM-SETTING-PROXY-METHOD-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_PROXY_METHOD_AUTO" link="NMSettingProxy.html#NM-SETTING-PROXY-METHOD-AUTO:CAPS"/>
     <keyword type="constant" name="NM_SETTING_SERIAL_PARITY_NONE" link="NMSettingSerial.html#NM-SETTING-SERIAL-PARITY-NONE:CAPS"/>
     <keyword type="constant" name="NM_SETTING_SERIAL_PARITY_EVEN" link="NMSettingSerial.html#NM-SETTING-SERIAL-PARITY-EVEN:CAPS"/>
     <keyword type="constant" name="NM_SETTING_SERIAL_PARITY_ODD" link="NMSettingSerial.html#NM-SETTING-SERIAL-PARITY-ODD:CAPS"/>
@@ -3153,27 +3226,6 @@
     <keyword type="constant" name="NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT" link="NMSettingWired.html#NM-SETTING-WIRED-WAKE-ON-LAN-DEFAULT:CAPS"/>
     <keyword type="constant" name="NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE" link="NMSettingWired.html#NM-SETTING-WIRED-WAKE-ON-LAN-IGNORE:CAPS"/>
     <keyword type="constant" name="NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS" link="NMSettingWired.html#NM-SETTING-WIRED-WAKE-ON-LAN-EXCLUSIVE-FLAGS:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-NONE:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-ANY:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-DISCONNECT:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-MAGIC:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-GTK-REKEY-FAILURE:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-EAP-IDENTITY-REQUEST:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-4WAY-HANDSHAKE:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-RFKILL-RELEASE:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-TCP:CAPS"/>
-    <keyword type="constant" name="_NM_SETTING_WIRELESS_WAKE_ON_WLAN_NUM" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-NUM:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_LAST" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-LAST:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_ALL" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-ALL:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-DEFAULT:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-IGNORE:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_EXCLUSIVE_FLAGS" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-EXCLUSIVE-FLAGS:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_POWERSAVE_DEFAULT" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-DEFAULT:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_POWERSAVE_IGNORE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-IGNORE:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_POWERSAVE_DISABLE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-DISABLE:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_POWERSAVE_ENABLE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-ENABLE:CAPS"/>
-    <keyword type="constant" name="_NM_SETTING_WIRELESS_POWERSAVE_NUM" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-NUM:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_POWERSAVE_LAST" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-LAST:CAPS"/>
     <keyword type="constant" name="NM_WEP_KEY_TYPE_UNKNOWN" link="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-UNKNOWN:CAPS"/>
     <keyword type="constant" name="NM_WEP_KEY_TYPE_KEY" link="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-KEY:CAPS"/>
     <keyword type="constant" name="NM_WEP_KEY_TYPE_PASSPHRASE" link="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-PASSPHRASE:CAPS"/>
@@ -3195,6 +3247,27 @@
     <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-REQUIRED:CAPS"/>
     <keyword type="constant" name="_NM_SETTING_WIRELESS_SECURITY_FILS_NUM" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-NUM:CAPS"/>
     <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_FILS_LAST" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-LAST:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-ANY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-DISCONNECT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-MAGIC:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-GTK-REKEY-FAILURE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-EAP-IDENTITY-REQUEST:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-4WAY-HANDSHAKE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-RFKILL-RELEASE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-TCP:CAPS"/>
+    <keyword type="constant" name="_NM_SETTING_WIRELESS_WAKE_ON_WLAN_NUM" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-NUM:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_LAST" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-LAST:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_ALL" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-ALL:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-DEFAULT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-IGNORE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_WAKE_ON_WLAN_EXCLUSIVE_FLAGS" link="NMSettingWireless.html#NM-SETTING-WIRELESS-WAKE-ON-WLAN-EXCLUSIVE-FLAGS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_POWERSAVE_DEFAULT" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-DEFAULT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_POWERSAVE_IGNORE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-IGNORE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_POWERSAVE_DISABLE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-DISABLE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_POWERSAVE_ENABLE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-ENABLE:CAPS"/>
+    <keyword type="constant" name="_NM_SETTING_WIRELESS_POWERSAVE_NUM" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-NUM:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_POWERSAVE_LAST" link="NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-LAST:CAPS"/>
     <keyword type="constant" name="NMU_SEC_INVALID" link="libnm-nm-utils.html#NMU-SEC-INVALID:CAPS"/>
     <keyword type="constant" name="NMU_SEC_NONE" link="libnm-nm-utils.html#NMU-SEC-NONE:CAPS"/>
     <keyword type="constant" name="NMU_SEC_STATIC_WEP" link="libnm-nm-utils.html#NMU-SEC-STATIC-WEP:CAPS"/>
@@ -3204,36 +3277,6 @@
     <keyword type="constant" name="NMU_SEC_WPA_ENTERPRISE" link="libnm-nm-utils.html#NMU-SEC-WPA-ENTERPRISE:CAPS"/>
     <keyword type="constant" name="NMU_SEC_WPA2_PSK" link="libnm-nm-utils.html#NMU-SEC-WPA2-PSK:CAPS"/>
     <keyword type="constant" name="NMU_SEC_WPA2_ENTERPRISE" link="libnm-nm-utils.html#NMU-SEC-WPA2-ENTERPRISE:CAPS"/>
-    <keyword type="constant" name="NM_VPN_SERVICE_STATE_UNKNOWN" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-UNKNOWN:CAPS"/>
-    <keyword type="constant" name="NM_VPN_SERVICE_STATE_INIT" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-INIT:CAPS"/>
-    <keyword type="constant" name="NM_VPN_SERVICE_STATE_SHUTDOWN" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-SHUTDOWN:CAPS"/>
-    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STARTING" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-STARTING:CAPS"/>
-    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STARTED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-STARTED:CAPS"/>
-    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STOPPING" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-STOPPING:CAPS"/>
-    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STOPPED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-STOPPED:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_UNKNOWN" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-UNKNOWN:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_PREPARE" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-PREPARE:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_NEED_AUTH" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-NEED-AUTH:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_CONNECT" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-CONNECT:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_IP_CONFIG_GET" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-IP-CONFIG-GET:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_ACTIVATED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-ACTIVATED:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_FAILED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-FAILED:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_DISCONNECTED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-DISCONNECTED:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_UNKNOWN" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-UNKNOWN:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_NONE" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-NONE:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-USER-DISCONNECTED:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-DEVICE-DISCONNECTED:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-STOPPED:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-IP-CONFIG-INVALID:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-CONNECT-TIMEOUT:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-TIMEOUT:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-FAILED:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-NO-SECRETS:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-LOGIN-FAILED:CAPS"/>
-    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-CONNECTION-REMOVED:CAPS"/>
-    <keyword type="constant" name="NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-FAILURE-LOGIN-FAILED:CAPS"/>
-    <keyword type="constant" name="NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-FAILURE-CONNECT-FAILED:CAPS"/>
-    <keyword type="constant" name="NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-FAILURE-BAD-IP-CONFIG:CAPS"/>
     <keyword type="constant" name="NM_VPN_EDITOR_PLUGIN_CAPABILITY_NONE" link="NMVpnEditorPlugin.html#NM-VPN-EDITOR-PLUGIN-CAPABILITY-NONE:CAPS"/>
     <keyword type="constant" name="NM_VPN_EDITOR_PLUGIN_CAPABILITY_IMPORT" link="NMVpnEditorPlugin.html#NM-VPN-EDITOR-PLUGIN-CAPABILITY-IMPORT:CAPS"/>
     <keyword type="constant" name="NM_VPN_EDITOR_PLUGIN_CAPABILITY_EXPORT" link="NMVpnEditorPlugin.html#NM-VPN-EDITOR-PLUGIN-CAPABILITY-EXPORT:CAPS"/>
@@ -3242,6 +3285,10 @@
     <keyword type="member" name="NMConnectionInterface.secrets-updated" link="NMConnection.html#NMConnectionInterface.secrets-updated"/>
     <keyword type="member" name="NMConnectionInterface.secrets-cleared" link="NMConnection.html#NMConnectionInterface.secrets-cleared"/>
     <keyword type="member" name="NMConnectionInterface.changed" link="NMConnection.html#NMConnectionInterface.changed"/>
+    <keyword type="member" name="NMVpnEditorInterface.get-widget" link="NMVpnEditor.html#NMVpnEditorInterface.get-widget"/>
+    <keyword type="member" name="NMVpnEditorInterface.placeholder" link="NMVpnEditor.html#NMVpnEditorInterface.placeholder"/>
+    <keyword type="member" name="NMVpnEditorInterface.update-connection" link="NMVpnEditor.html#NMVpnEditorInterface.update-connection"/>
+    <keyword type="member" name="NMVpnEditorInterface.changed" link="NMVpnEditor.html#NMVpnEditorInterface.changed"/>
     <keyword type="member" name="NMVpnEditorPluginInterface.get-editor" link="NMVpnEditorPlugin.html#NMVpnEditorPluginInterface.get-editor"/>
     <keyword type="member" name="NMVpnEditorPluginInterface.get-capabilities" link="NMVpnEditorPlugin.html#NMVpnEditorPluginInterface.get-capabilities"/>
     <keyword type="member" name="NMVpnEditorPluginInterface.import-from-file" link="NMVpnEditorPlugin.html#NMVpnEditorPluginInterface.import-from-file"/>
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index 7d807d47..4cee32c8 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
-<link rel="prev" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin">
+<link rel="prev" href="libnm-nm-vpn-plugin-old.html" title="nm-vpn-plugin-old">
 <link rel="next" href="api-index-full.html" title="API Index">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -16,7 +16,7 @@
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
-<td><a accesskey="p" href="NMVpnEditorPlugin.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="libnm-nm-vpn-plugin-old.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="api-index-full.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
@@ -51,7 +51,7 @@
     <span class="lineart">│</span>   <span class="lineart">├──</span> NMSettingOvsPort
     <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMSettingPpp.html" title="NMSettingPpp">NMSettingPpp</a>
     <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMSettingPppoe.html" title="NMSettingPppoe">NMSettingPppoe</a>
-    <span class="lineart">│</span>   <span class="lineart">├──</span> NMSettingProxy
+    <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMSettingProxy.html" title="NMSettingProxy">NMSettingProxy</a>
     <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
     <span class="lineart">│</span>   <span class="lineart">├──</span> NMSettingTCConfig
     <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMSettingTeamPort.html" title="NMSettingTeamPort">NMSettingTeamPort</a>
@@ -103,7 +103,7 @@
     <span class="lineart">╰──</span> <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection">NMSimpleConnection</a>
     <a href="/usr/share/gtk-doc/html/gobject/GTypeModule.html">GInterface</a>
     <span class="lineart">├──</span> <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
-    <span class="lineart">├──</span> <a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor">NMVpnEditor</a>
+    <span class="lineart">├──</span> <a class="link" href="NMVpnEditor.html" title="NMVpnEditor">NMVpnEditor</a>
     <span class="lineart">╰──</span> <a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin">NMVpnEditorPlugin</a>
     <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NM80211ApFlags" title="enum NM80211ApFlags">NM80211ApFlags</a>
@@ -163,7 +163,7 @@
     <span class="lineart">├──</span> <a class="link" href="NMSettingMacsec.html#NMSettingMacsecMode" title="enum NMSettingMacsecMode">NMSettingMacsecMode</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingMacsec.html#NMSettingMacsecValidation" title="enum NMSettingMacsecValidation">NMSettingMacsecValidation</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingMacvlan.html#NMSettingMacvlanMode" title="enum NMSettingMacvlanMode">NMSettingMacvlanMode</a>
-    <span class="lineart">├──</span> NMSettingProxyMethod
+    <span class="lineart">├──</span> <a class="link" href="NMSettingProxy.html#NMSettingProxyMethod" title="enum NMSettingProxyMethod">NMSettingProxyMethod</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingSerial.html#NMSettingSerialParity" title="enum NMSettingSerialParity">NMSettingSerialParity</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingTun.html#NMSettingTunMode" title="enum NMSettingTunMode">NMSettingTunMode</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingWireless.html#NMSettingWirelessPowersave" title="enum NMSettingWirelessPowersave">NMSettingWirelessPowersave</a>
@@ -173,10 +173,10 @@
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMState" title="enum NMState">NMState</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-utils.html#NMUtilsSecurityType" title="enum NMUtilsSecurityType">NMUtilsSecurityType</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingVlan.html#NMVlanPriorityMap" title="enum NMVlanPriorityMap">NMVlanPriorityMap</a>
-    <span class="lineart">├──</span> <a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState" title="enum NMVpnConnectionState">NMVpnConnectionState</a>
-    <span class="lineart">├──</span> <a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionStateReason" title="enum NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>
-    <span class="lineart">├──</span> <a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure" title="enum NMVpnPluginFailure">NMVpnPluginFailure</a>
-    <span class="lineart">├──</span> <a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState" title="enum NMVpnServiceState">NMVpnServiceState</a>
+    <span class="lineart">├──</span> <a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState">NMVpnConnectionState</a>
+    <span class="lineart">├──</span> <a href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>
+    <span class="lineart">├──</span> <a href="libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure">NMVpnPluginFailure</a>
+    <span class="lineart">├──</span> <a href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState">NMVpnServiceState</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType">NMWepKeyType</a>
     <span class="lineart">╰──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType">NMWimaxNspNetworkType</a>
     <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
@@ -184,9 +184,9 @@
     <span class="lineart">├──</span> <a class="link" href="NMSettingIPConfig.html#NMIPAddress">NMIPAddress</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingIPConfig.html#NMIPRoute">NMIPRoute</a>
     <span class="lineart">├──</span> <a class="link" href="NMDevice.html#NMLldpNeighbor">NMLldpNeighbor</a>
-    <span class="lineart">├──</span> NMTCAction
-    <span class="lineart">├──</span> NMTCQdisc
-    <span class="lineart">├──</span> NMTCTfilter
+    <span class="lineart">├──</span> <a class="link" href="libnm-nm-setting-tc-config.html#NMTCAction">NMTCAction</a>
+    <span class="lineart">├──</span> <a class="link" href="libnm-nm-setting-tc-config.html#NMTCQdisc">NMTCQdisc</a>
+    <span class="lineart">├──</span> <a class="link" href="libnm-nm-setting-tc-config.html#NMTCTfilter">NMTCTfilter</a>
     <span class="lineart">╰──</span> <a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher">NMTeamLinkWatcher</a>
 </pre>
 </div>
diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
index 55786691..b9e10bde 100644
--- a/docs/libnm/html/usage.html
+++ b/docs/libnm/html/usage.html
@@ -96,7 +96,7 @@
         </p>
 <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c</code></strong>
   <code class="prompt">$ </code><strong class="userinput"><code>./hello-nm</code></strong>
-  NetworkManager version: 1.11.90
+  NetworkManager version: 1.12.0
 
   <code class="prompt">$ </code></pre>
 <p>
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index b03efc33..3105f514 100644
--- a/docs/libnm/libnm-docs.xml
+++ b/docs/libnm/libnm-docs.xml
@@ -187,6 +187,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <title>Connection and Setting API Reference</title>
     <xi:include href="xml/nm-connection.xml"/>
     <xi:include href="xml/nm-simple-connection.xml"/>
+    <xi:include href="xml/nm-remote-connection.xml"/>
     <xi:include href="xml/nm-setting.xml"/>
     <xi:include href="xml/nm-setting-connection.xml"/>
     <!-- begin alphabetical -->
@@ -194,8 +195,8 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <xi:include href="xml/nm-setting-adsl.xml"/>
     <xi:include href="xml/nm-setting-bluetooth.xml"/>
     <xi:include href="xml/nm-setting-bond.xml"/>
-    <xi:include href="xml/nm-setting-bridge.xml"/>
     <xi:include href="xml/nm-setting-bridge-port.xml"/>
+    <xi:include href="xml/nm-setting-bridge.xml"/>
     <xi:include href="xml/nm-setting-cdma.xml"/>
     <xi:include href="xml/nm-setting-dcb.xml"/>
     <xi:include href="xml/nm-setting-dummy.xml"/>
@@ -209,19 +210,26 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <xi:include href="xml/nm-setting-macsec.xml"/>
     <xi:include href="xml/nm-setting-macvlan.xml"/>
     <xi:include href="xml/nm-setting-olpc-mesh.xml"/>
-    <xi:include href="xml/nm-setting-ppp.xml"/>
+    <xi:include href="xml/nm-setting-ovs-bridge.xml"/>
+    <xi:include href="xml/nm-setting-ovs-interface.xml"/>
+    <xi:include href="xml/nm-setting-ovs-patch.xml"/>
+    <xi:include href="xml/nm-setting-ovs-port.xml"/>
     <xi:include href="xml/nm-setting-pppoe.xml"/>
+    <xi:include href="xml/nm-setting-ppp.xml"/>
+    <xi:include href="xml/nm-setting-proxy.xml"/>
     <xi:include href="xml/nm-setting-serial.xml"/>
-    <xi:include href="xml/nm-setting-team.xml"/>
+    <xi:include href="xml/nm-setting-tc-config.xml"/>
     <xi:include href="xml/nm-setting-team-port.xml"/>
+    <xi:include href="xml/nm-setting-team.xml"/>
     <xi:include href="xml/nm-setting-tun.xml"/>
+    <xi:include href="xml/nm-setting-user.xml"/>
     <xi:include href="xml/nm-setting-vlan.xml"/>
     <xi:include href="xml/nm-setting-vpn.xml"/>
     <xi:include href="xml/nm-setting-vxlan.xml"/>
     <xi:include href="xml/nm-setting-wimax.xml"/>
     <xi:include href="xml/nm-setting-wired.xml"/>
-    <xi:include href="xml/nm-setting-wireless.xml"/>
     <xi:include href="xml/nm-setting-wireless-security.xml"/>
+    <xi:include href="xml/nm-setting-wireless.xml"/>
     <!-- end alphabetical -->
   </chapter>
 
@@ -242,6 +250,10 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <xi:include href="xml/nm-device-macvlan.xml"/>
     <xi:include href="xml/nm-device-modem.xml"/>
     <xi:include href="xml/nm-device-olpc-mesh.xml"/>
+    <xi:include href="xml/nm-device-ovs-bridge.xml"/>
+    <xi:include href="xml/nm-device-ovs-interface.xml"/>
+    <xi:include href="xml/nm-device-ovs-port.xml"/>
+    <xi:include href="xml/nm-device-ppp.xml"/>
     <xi:include href="xml/nm-device-team.xml"/>
     <xi:include href="xml/nm-device-tun.xml"/>
     <xi:include href="xml/nm-device-vlan.xml"/>
@@ -251,11 +263,11 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <!-- end alphabetical -->
     <xi:include href="xml/nm-active-connection.xml"/>
     <xi:include href="xml/nm-vpn-connection.xml"/>
-    <xi:include href="xml/nm-remote-connection.xml"/>
     <xi:include href="xml/nm-access-point.xml"/>
     <xi:include href="xml/nm-wimax-nsp.xml"/>
     <xi:include href="xml/nm-ip-config.xml"/>
     <xi:include href="xml/nm-dhcp-config.xml"/>
+    <xi:include href="xml/nm-checkpoint.xml"/>
   </chapter>
 
   <chapter>
@@ -266,10 +278,20 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
 
   <chapter>
     <title>VPN Plugin API Reference</title>
-    <xi:include href="xml/nm-vpn-dbus-interface.xml"/>
+    <xi:include href="xml/nm-vpn-service-plugin.xml"/>
+    <xi:include href="xml/nm-vpn-plugin-info.xml"/>
+    <xi:include href="xml/nm-vpn-editor.xml"/>
     <xi:include href="xml/nm-vpn-editor-plugin.xml"/>
+    <xi:include href="xml/nm-vpn-plugin-old.xml"/>
   </chapter>
 
+  <!--
+    These don't contain any useful documentaiton. Keep them here,
+    so that tools/check-docs.sh knows that we did omit them intentionally.
+    <xi:include href="xml/nm-core-enum-types.xml"/>
+    <xi:include href="xml/nm-enum-types.xml"/>
+  -->
+
   <chapter id="object-tree">
     <title>Object Hierarchy</title>
      <xi:include href="xml/tree_index.sgml"/>
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index 2d784e44..0eed1a29 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.11.90
+1.12.0