summary refs log tree commit diff
path: root/docs/libnm/html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/libnm/html')
-rw-r--r--docs/libnm/html/NMSettingBond.html150
-rw-r--r--docs/libnm/html/NMSettingIPConfig.html10
-rw-r--r--docs/libnm/html/NMWimaxNsp.html61
-rw-r--r--docs/libnm/html/api-index-full.html66
-rw-r--r--docs/libnm/html/index.html2
-rw-r--r--docs/libnm/html/index.sgml26
-rw-r--r--docs/libnm/html/libnm-nm-dbus-interface.html102
-rw-r--r--docs/libnm/html/libnm-nm-version.html32
-rw-r--r--docs/libnm/html/libnm-nm-vpn-dbus-interface.html12
-rw-r--r--docs/libnm/html/libnm.devhelp226
-rw-r--r--docs/libnm/html/object-tree.html2
11 files changed, 363 insertions, 126 deletions
diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html
index edf00c34..94a98924 100644
--- a/docs/libnm/html/NMSettingBond.html
+++ b/docs/libnm/html/NMSettingBond.html
@@ -205,6 +205,54 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-LACP-RATE:CAPS" title="NM_SETTING_BOND_OPTION_LACP_RATE">NM_SETTING_BOND_OPTION_LACP_RATE</a></td>
 </tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-ACTIVE-SLAVE:CAPS" title="NM_SETTING_BOND_OPTION_ACTIVE_SLAVE">NM_SETTING_BOND_OPTION_ACTIVE_SLAVE</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-AD-ACTOR-SYS-PRIO:CAPS" title="NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO">NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-AD-ACTOR-SYSTEM:CAPS" title="NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM">NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-AD-USER-PORT-KEY:CAPS" title="NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY">NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-ALL-SLAVES-ACTIVE:CAPS" title="NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE">NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-ARP-ALL-TARGETS:CAPS" title="NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS">NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-MIN-LINKS:CAPS" title="NM_SETTING_BOND_OPTION_MIN_LINKS">NM_SETTING_BOND_OPTION_MIN_LINKS</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-NUM-GRAT-ARP:CAPS" title="NM_SETTING_BOND_OPTION_NUM_GRAT_ARP">NM_SETTING_BOND_OPTION_NUM_GRAT_ARP</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-NUM-UNSOL-NA:CAPS" title="NM_SETTING_BOND_OPTION_NUM_UNSOL_NA">NM_SETTING_BOND_OPTION_NUM_UNSOL_NA</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-PACKETS-PER-SLAVE:CAPS" title="NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE">NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-TLB-DYNAMIC-LB:CAPS" title="NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB">NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-LP-INTERVAL:CAPS" title="NM_SETTING_BOND_OPTION_LP_INTERVAL">NM_SETTING_BOND_OPTION_LP_INTERVAL</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -557,91 +605,163 @@ the <a class="link" href="NMSettingBond.html#NMSettingBond--options" title="The
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-MODE:CAPS"></a><h3>NM_SETTING_BOND_OPTION_MODE</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_MODE             "mode"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_MODE              "mode"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-MIIMON:CAPS"></a><h3>NM_SETTING_BOND_OPTION_MIIMON</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_MIIMON           "miimon"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_MIIMON            "miimon"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-DOWNDELAY:CAPS"></a><h3>NM_SETTING_BOND_OPTION_DOWNDELAY</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_DOWNDELAY        "downdelay"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_DOWNDELAY         "downdelay"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-UPDELAY:CAPS"></a><h3>NM_SETTING_BOND_OPTION_UPDELAY</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_UPDELAY          "updelay"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_UPDELAY           "updelay"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-ARP-INTERVAL:CAPS"></a><h3>NM_SETTING_BOND_OPTION_ARP_INTERVAL</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_ARP_INTERVAL     "arp_interval"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_ARP_INTERVAL      "arp_interval"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-ARP-IP-TARGET:CAPS"></a><h3>NM_SETTING_BOND_OPTION_ARP_IP_TARGET</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET    "arp_ip_target"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET     "arp_ip_target"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-ARP-VALIDATE:CAPS"></a><h3>NM_SETTING_BOND_OPTION_ARP_VALIDATE</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_ARP_VALIDATE     "arp_validate"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_ARP_VALIDATE      "arp_validate"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-PRIMARY:CAPS"></a><h3>NM_SETTING_BOND_OPTION_PRIMARY</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_PRIMARY          "primary"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_PRIMARY           "primary"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-PRIMARY-RESELECT:CAPS"></a><h3>NM_SETTING_BOND_OPTION_PRIMARY_RESELECT</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_PRIMARY_RESELECT "primary_reselect"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_PRIMARY_RESELECT  "primary_reselect"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-FAIL-OVER-MAC:CAPS"></a><h3>NM_SETTING_BOND_OPTION_FAIL_OVER_MAC</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_FAIL_OVER_MAC    "fail_over_mac"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_FAIL_OVER_MAC     "fail_over_mac"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-USE-CARRIER:CAPS"></a><h3>NM_SETTING_BOND_OPTION_USE_CARRIER</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_USE_CARRIER      "use_carrier"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_USE_CARRIER       "use_carrier"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-AD-SELECT:CAPS"></a><h3>NM_SETTING_BOND_OPTION_AD_SELECT</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_AD_SELECT        "ad_select"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_AD_SELECT         "ad_select"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-XMIT-HASH-POLICY:CAPS"></a><h3>NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY "xmit_hash_policy"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY  "xmit_hash_policy"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-RESEND-IGMP:CAPS"></a><h3>NM_SETTING_BOND_OPTION_RESEND_IGMP</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_RESEND_IGMP      "resend_igmp"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_RESEND_IGMP       "resend_igmp"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-LACP-RATE:CAPS"></a><h3>NM_SETTING_BOND_OPTION_LACP_RATE</h3>
-<pre class="programlisting">#define NM_SETTING_BOND_OPTION_LACP_RATE        "lacp_rate"
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_LACP_RATE         "lacp_rate"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BOND-OPTION-ACTIVE-SLAVE:CAPS"></a><h3>NM_SETTING_BOND_OPTION_ACTIVE_SLAVE</h3>
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_ACTIVE_SLAVE      "active_slave"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BOND-OPTION-AD-ACTOR-SYS-PRIO:CAPS"></a><h3>NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO</h3>
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO "ad_actor_sys_prio"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BOND-OPTION-AD-ACTOR-SYSTEM:CAPS"></a><h3>NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM</h3>
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM   "ad_actor_system"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BOND-OPTION-AD-USER-PORT-KEY:CAPS"></a><h3>NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY</h3>
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY  "ad_user_port_key"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BOND-OPTION-ALL-SLAVES-ACTIVE:CAPS"></a><h3>NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE</h3>
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE "all_slaves_active"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BOND-OPTION-ARP-ALL-TARGETS:CAPS"></a><h3>NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS</h3>
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS   "arp_all_targets"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BOND-OPTION-MIN-LINKS:CAPS"></a><h3>NM_SETTING_BOND_OPTION_MIN_LINKS</h3>
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_MIN_LINKS         "min_links"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BOND-OPTION-NUM-GRAT-ARP:CAPS"></a><h3>NM_SETTING_BOND_OPTION_NUM_GRAT_ARP</h3>
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_NUM_GRAT_ARP      "num_grat_arp"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BOND-OPTION-NUM-UNSOL-NA:CAPS"></a><h3>NM_SETTING_BOND_OPTION_NUM_UNSOL_NA</h3>
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_NUM_UNSOL_NA      "num_unsol_na"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BOND-OPTION-PACKETS-PER-SLAVE:CAPS"></a><h3>NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE</h3>
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE "packets_per_slave"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BOND-OPTION-TLB-DYNAMIC-LB:CAPS"></a><h3>NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB</h3>
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB    "tlb_dynamic_lb"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BOND-OPTION-LP-INTERVAL:CAPS"></a><h3>NM_SETTING_BOND_OPTION_LP_INTERVAL</h3>
+<pre class="programlisting">#define NM_SETTING_BOND_OPTION_LP_INTERVAL       "lp_interval"
 </pre>
 </div>
 </div>
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index cfa53456..f2a9fafc 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -913,6 +913,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-NO-TLD-QUERY:CAPS" title="NM_SETTING_DNS_OPTION_NO_TLD_QUERY">NM_SETTING_DNS_OPTION_NO_TLD_QUERY</a></td>
 </tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-USE-VC:CAPS" title="NM_SETTING_DNS_OPTION_USE_VC">NM_SETTING_DNS_OPTION_USE_VC</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -3718,6 +3722,12 @@ the particular kind of device.</p>
 <pre class="programlisting">#define NM_SETTING_DNS_OPTION_NO_TLD_QUERY              "no-tld-query"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-DNS-OPTION-USE-VC:CAPS"></a><h3>NM_SETTING_DNS_OPTION_USE_VC</h3>
+<pre class="programlisting">#define NM_SETTING_DNS_OPTION_USE_VC                    "use-vc"
+</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingIPConfig.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html
index 8a73c9b9..ecaae0aa 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -58,7 +58,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a class="link" href="NMWimaxNsp.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType"><span class="returnvalue">NMWimaxNspNetworkType</span></a>
+<a class="link" href="libnm-nm-dbus-interface.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType"><span class="returnvalue">NMWimaxNspNetworkType</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMWimaxNsp.html#nm-wimax-nsp-get-network-type" title="nm_wimax_nsp_get_network_type ()">nm_wimax_nsp_get_network_type</a> <span class="c_punctuation">()</span>
@@ -99,7 +99,7 @@
 <td class="property_flags">Read</td>
 </tr>
 <tr>
-<td class="property_type"><a class="link" href="NMWimaxNsp.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType"><span class="type">NMWimaxNspNetworkType</span></a></td>
+<td class="property_type"><a class="link" href="libnm-nm-dbus-interface.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType"><span class="type">NMWimaxNspNetworkType</span></a></td>
 <td class="property_name"><a class="link" href="NMWimaxNsp.html#NMWimaxNsp--network-type" title="The “network-type” property">network-type</a></td>
 <td class="property_flags">Read</td>
 </tr>
@@ -131,18 +131,12 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE:CAPS" title="NM_WIMAX_NSP_NETWORK_TYPE">NM_WIMAX_NSP_NETWORK_TYPE</a></td>
 </tr>
-<tr>
-<td class="datatype_keyword">enum</td>
-<td class="function_name"><a class="link" href="NMWimaxNsp.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType">NMWimaxNspNetworkType</a></td>
-</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMWimaxNsp.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> NMWimaxNspNetworkType
-    GObject
+<pre class="screen">    GObject
     <span class="lineart">╰──</span> <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
         <span class="lineart">╰──</span> NMWimaxNsp
 </pre>
@@ -206,7 +200,7 @@ nm_wimax_nsp_get_signal_quality (<em class="parameter"><code><a class="link" hre
 <hr>
 <div class="refsect2">
 <a name="nm-wimax-nsp-get-network-type"></a><h3>nm_wimax_nsp_get_network_type ()</h3>
-<pre class="programlisting"><a class="link" href="NMWimaxNsp.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType"><span class="returnvalue">NMWimaxNspNetworkType</span></a>
+<pre class="programlisting"><a class="link" href="libnm-nm-dbus-interface.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType"><span class="returnvalue">NMWimaxNspNetworkType</span></a>
 nm_wimax_nsp_get_network_type (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>);</pre>
 <p>Gets the network type of the wimax NSP.</p>
 <div class="refsect3">
@@ -331,51 +325,6 @@ against</p></td>
 <pre class="programlisting">#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 </pre>
 </div>
-<hr>
-<div class="refsect2">
-<a name="NMWimaxNspNetworkType"></a><h3>enum NMWimaxNspNetworkType</h3>
-<p>WiMAX network type.</p>
-<div class="refsect3">
-<a name="id-1.5.24.9.5.4"></a><h4>Members</h4>
-<div class="informaltable"><table 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-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS"></a>NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN</p></td>
-<td class="enum_member_description">
-<p>unknown network type</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS"></a>NM_WIMAX_NSP_NETWORK_TYPE_HOME</p></td>
-<td class="enum_member_description">
-<p>home network</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS"></a>NM_WIMAX_NSP_NETWORK_TYPE_PARTNER</p></td>
-<td class="enum_member_description">
-<p>partner network</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS"></a>NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER</p></td>
-<td class="enum_member_description">
-<p>roaming partner network</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
 </div>
 <div class="refsect1">
 <a name="NMWimaxNsp.property-details"></a><h2>Property Details</h2>
@@ -389,7 +338,7 @@ against</p></td>
 <hr>
 <div class="refsect2">
 <a name="NMWimaxNsp--network-type"></a><h3>The <code class="literal">“network-type”</code> property</h3>
-<pre class="programlisting">  “network-type”             <a class="link" href="NMWimaxNsp.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType"><span class="type">NMWimaxNspNetworkType</span></a></pre>
+<pre class="programlisting">  “network-type”             <a class="link" href="libnm-nm-dbus-interface.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType"><span class="type">NMWimaxNspNetworkType</span></a></pre>
 <p>The network type of the WiMAX NSP.</p>
 <p>Flags: Read</p>
 <p>Default value: NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN</p>
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index e4606198..fe6ccbeb 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -406,6 +406,10 @@
 <a class="link" href="libnm-nm-dbus-interface.html#NM-AVAILABLE-IN-1-2:CAPS" title="NM_AVAILABLE_IN_1_2">NM_AVAILABLE_IN_1_2</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
 </dt>
 <dd></dd>
+<dt>
+<a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-4:CAPS" title="NM_AVAILABLE_IN_1_4">NM_AVAILABLE_IN_1_4</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
+</dt>
+<dd></dd>
 <a name="idxB"></a><h3 class="title">B</h3>
 <dt>
 <a class="link" href="libnm-nm-dbus-interface.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities">NMBluetoothCapabilities</a>, enum in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
@@ -1438,6 +1442,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-4:CAPS" title="NM_DEPRECATED_IN_1_4">NM_DEPRECATED_IN_1_4</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-4-FOR:CAPS" title="NM_DEPRECATED_IN_1_4_FOR()">NM_DEPRECATED_IN_1_4_FOR</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMDevice.html#NMDevice-state-changed" title="The “state-changed” signal">NMDevice::state-changed</a>, object signal in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
 </dt>
 <dd></dd>
@@ -5280,10 +5292,34 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-ACTIVE-SLAVE:CAPS" title="NM_SETTING_BOND_OPTION_ACTIVE_SLAVE">NM_SETTING_BOND_OPTION_ACTIVE_SLAVE</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-AD-ACTOR-SYSTEM:CAPS" title="NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM">NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-AD-ACTOR-SYS-PRIO:CAPS" title="NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO">NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-AD-SELECT:CAPS" title="NM_SETTING_BOND_OPTION_AD_SELECT">NM_SETTING_BOND_OPTION_AD_SELECT</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-AD-USER-PORT-KEY:CAPS" title="NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY">NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-ALL-SLAVES-ACTIVE:CAPS" title="NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE">NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-ARP-ALL-TARGETS:CAPS" title="NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS">NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-ARP-INTERVAL:CAPS" title="NM_SETTING_BOND_OPTION_ARP_INTERVAL">NM_SETTING_BOND_OPTION_ARP_INTERVAL</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
 </dt>
 <dd></dd>
@@ -5308,14 +5344,34 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-LP-INTERVAL:CAPS" title="NM_SETTING_BOND_OPTION_LP_INTERVAL">NM_SETTING_BOND_OPTION_LP_INTERVAL</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-MIIMON:CAPS" title="NM_SETTING_BOND_OPTION_MIIMON">NM_SETTING_BOND_OPTION_MIIMON</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-MIN-LINKS:CAPS" title="NM_SETTING_BOND_OPTION_MIN_LINKS">NM_SETTING_BOND_OPTION_MIN_LINKS</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-MODE:CAPS" title="NM_SETTING_BOND_OPTION_MODE">NM_SETTING_BOND_OPTION_MODE</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-NUM-GRAT-ARP:CAPS" title="NM_SETTING_BOND_OPTION_NUM_GRAT_ARP">NM_SETTING_BOND_OPTION_NUM_GRAT_ARP</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-NUM-UNSOL-NA:CAPS" title="NM_SETTING_BOND_OPTION_NUM_UNSOL_NA">NM_SETTING_BOND_OPTION_NUM_UNSOL_NA</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-PACKETS-PER-SLAVE:CAPS" title="NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE">NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-PRIMARY:CAPS" title="NM_SETTING_BOND_OPTION_PRIMARY">NM_SETTING_BOND_OPTION_PRIMARY</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
 </dt>
 <dd></dd>
@@ -5328,6 +5384,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-TLB-DYNAMIC-LB:CAPS" title="NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB">NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-UPDELAY:CAPS" title="NM_SETTING_BOND_OPTION_UPDELAY">NM_SETTING_BOND_OPTION_UPDELAY</a>, macro in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
 </dt>
 <dd></dd>
@@ -5916,6 +5976,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-USE-VC:CAPS" title="NM_SETTING_DNS_OPTION_USE_VC">NM_SETTING_DNS_OPTION_USE_VC</a>, macro in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting.html#nm-setting-duplicate" title="nm_setting_duplicate ()">nm_setting_duplicate</a>, function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
@@ -8467,7 +8531,7 @@ NM_VPN_SERVICE_PLUGIN_STATE, macro in nm-vpn-service-plugin
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMWimaxNsp.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType">NMWimaxNspNetworkType</a>, enum in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+<a class="link" href="libnm-nm-dbus-interface.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType">NMWimaxNspNetworkType</a>, enum in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
 </dt>
 <dd></dd>
 <dt>
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index 891025a0..e004f345 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.1.92
+      for libnm 1.1.93
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm/1.0/" target="_top">https://developer.gnome.org/libnm/1.0/</a>.
diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml
index b817d5b5..f0c50d66 100644
--- a/docs/libnm/html/index.sgml
+++ b/docs/libnm/html/index.sgml
@@ -418,6 +418,11 @@
 <ANCHOR id="NM-DEVICE-MODEM-CAPABILITY-CDMA-EVDO:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-CDMA-EVDO:CAPS">
 <ANCHOR id="NM-DEVICE-MODEM-CAPABILITY-GSM-UMTS:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-GSM-UMTS:CAPS">
 <ANCHOR id="NM-DEVICE-MODEM-CAPABILITY-LTE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-LTE:CAPS">
+<ANCHOR id="NMWimaxNspNetworkType" href="libnm/libnm-nm-dbus-interface.html#NMWimaxNspNetworkType">
+<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS">
+<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS">
+<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS">
+<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS">
 <ANCHOR id="NMDeviceState" href="libnm/libnm-nm-dbus-interface.html#NMDeviceState">
 <ANCHOR id="NM-DEVICE-STATE-UNKNOWN:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-UNKNOWN:CAPS">
 <ANCHOR id="NM-DEVICE-STATE-UNMANAGED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-UNMANAGED:CAPS">
@@ -1018,6 +1023,18 @@
 <ANCHOR id="NM-SETTING-BOND-OPTION-XMIT-HASH-POLICY:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-XMIT-HASH-POLICY:CAPS">
 <ANCHOR id="NM-SETTING-BOND-OPTION-RESEND-IGMP:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-RESEND-IGMP:CAPS">
 <ANCHOR id="NM-SETTING-BOND-OPTION-LACP-RATE:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-LACP-RATE:CAPS">
+<ANCHOR id="NM-SETTING-BOND-OPTION-ACTIVE-SLAVE:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-ACTIVE-SLAVE:CAPS">
+<ANCHOR id="NM-SETTING-BOND-OPTION-AD-ACTOR-SYS-PRIO:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-AD-ACTOR-SYS-PRIO:CAPS">
+<ANCHOR id="NM-SETTING-BOND-OPTION-AD-ACTOR-SYSTEM:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-AD-ACTOR-SYSTEM:CAPS">
+<ANCHOR id="NM-SETTING-BOND-OPTION-AD-USER-PORT-KEY:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-AD-USER-PORT-KEY:CAPS">
+<ANCHOR id="NM-SETTING-BOND-OPTION-ALL-SLAVES-ACTIVE:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-ALL-SLAVES-ACTIVE:CAPS">
+<ANCHOR id="NM-SETTING-BOND-OPTION-ARP-ALL-TARGETS:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-ARP-ALL-TARGETS:CAPS">
+<ANCHOR id="NM-SETTING-BOND-OPTION-MIN-LINKS:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-MIN-LINKS:CAPS">
+<ANCHOR id="NM-SETTING-BOND-OPTION-NUM-GRAT-ARP:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-NUM-GRAT-ARP:CAPS">
+<ANCHOR id="NM-SETTING-BOND-OPTION-NUM-UNSOL-NA:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-NUM-UNSOL-NA:CAPS">
+<ANCHOR id="NM-SETTING-BOND-OPTION-PACKETS-PER-SLAVE:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-PACKETS-PER-SLAVE:CAPS">
+<ANCHOR id="NM-SETTING-BOND-OPTION-TLB-DYNAMIC-LB:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-TLB-DYNAMIC-LB:CAPS">
+<ANCHOR id="NM-SETTING-BOND-OPTION-LP-INTERVAL:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-LP-INTERVAL:CAPS">
 <ANCHOR id="NMSettingBond.property-details" href="libnm/NMSettingBond.html#NMSettingBond.property-details">
 <ANCHOR id="NMSettingBond--options" href="libnm/NMSettingBond.html#NMSettingBond--options">
 <ANCHOR id="NMSettingBridge" href="libnm/NMSettingBridge.html">
@@ -1426,6 +1443,7 @@
 <ANCHOR id="NM-SETTING-DNS-OPTION-SINGLE-REQUEST:CAPS" href="libnm/NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-SINGLE-REQUEST:CAPS">
 <ANCHOR id="NM-SETTING-DNS-OPTION-SINGLE-REQUEST-REOPEN:CAPS" href="libnm/NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-SINGLE-REQUEST-REOPEN:CAPS">
 <ANCHOR id="NM-SETTING-DNS-OPTION-NO-TLD-QUERY:CAPS" href="libnm/NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-NO-TLD-QUERY:CAPS">
+<ANCHOR id="NM-SETTING-DNS-OPTION-USE-VC:CAPS" href="libnm/NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-USE-VC:CAPS">
 <ANCHOR id="NMSettingIPConfig.property-details" href="libnm/NMSettingIPConfig.html#NMSettingIPConfig.property-details">
 <ANCHOR id="NMSettingIPConfig--addresses" href="libnm/NMSettingIPConfig.html#NMSettingIPConfig--addresses">
 <ANCHOR id="NMSettingIPConfig--dad-timeout" href="libnm/NMSettingIPConfig.html#NMSettingIPConfig--dad-timeout">
@@ -2818,11 +2836,6 @@
 <ANCHOR id="NM-WIMAX-NSP-NAME:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-NAME:CAPS">
 <ANCHOR id="NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS">
 <ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE:CAPS">
-<ANCHOR id="NMWimaxNspNetworkType" href="libnm/NMWimaxNsp.html#NMWimaxNspNetworkType">
-<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS">
-<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS">
-<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS">
-<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS">
 <ANCHOR id="NMWimaxNsp.property-details" href="libnm/NMWimaxNsp.html#NMWimaxNsp.property-details">
 <ANCHOR id="NMWimaxNsp--name" href="libnm/NMWimaxNsp.html#NMWimaxNsp--name">
 <ANCHOR id="NMWimaxNsp--network-type" href="libnm/NMWimaxNsp.html#NMWimaxNsp--network-type">
@@ -2967,6 +2980,7 @@
 <ANCHOR id="NM-DEPRECATED-IN-0-9-10-FOR:CAPS" href="libnm/libnm-nm-version.html#NM-DEPRECATED-IN-0-9-10-FOR:CAPS">
 <ANCHOR id="NM-DEPRECATED-IN-1-0-FOR:CAPS" href="libnm/libnm-nm-version.html#NM-DEPRECATED-IN-1-0-FOR:CAPS">
 <ANCHOR id="NM-DEPRECATED-IN-1-2-FOR:CAPS" href="libnm/libnm-nm-version.html#NM-DEPRECATED-IN-1-2-FOR:CAPS">
+<ANCHOR id="NM-DEPRECATED-IN-1-4-FOR:CAPS" href="libnm/libnm-nm-version.html#NM-DEPRECATED-IN-1-4-FOR:CAPS">
 <ANCHOR id="libnm-nm-version.other_details" href="libnm/libnm-nm-version.html#libnm-nm-version.other_details">
 <ANCHOR id="NM-DEPRECATED-IN-0-9-10:CAPS" href="libnm/libnm-nm-version.html#NM-DEPRECATED-IN-0-9-10:CAPS">
 <ANCHOR id="NM-AVAILABLE-IN-0-9-10:CAPS" href="libnm/libnm-nm-version.html#NM-AVAILABLE-IN-0-9-10:CAPS">
@@ -2974,6 +2988,8 @@
 <ANCHOR id="NM-AVAILABLE-IN-1-0:CAPS" href="libnm/libnm-nm-version.html#NM-AVAILABLE-IN-1-0:CAPS">
 <ANCHOR id="NM-DEPRECATED-IN-1-2:CAPS" href="libnm/libnm-nm-version.html#NM-DEPRECATED-IN-1-2:CAPS">
 <ANCHOR id="NM-AVAILABLE-IN-1-2:CAPS" href="libnm/libnm-nm-version.html#NM-AVAILABLE-IN-1-2:CAPS">
+<ANCHOR id="NM-DEPRECATED-IN-1-4:CAPS" href="libnm/libnm-nm-version.html#NM-DEPRECATED-IN-1-4:CAPS">
+<ANCHOR id="NM-AVAILABLE-IN-1-4:CAPS" href="libnm/libnm-nm-version.html#NM-AVAILABLE-IN-1-4:CAPS">
 <ANCHOR id="libnm-nm-vpn-dbus-interface" href="libnm/libnm-nm-vpn-dbus-interface.html">
 <ANCHOR id="libnm-nm-vpn-dbus-interface.other" href="libnm/libnm-nm-vpn-dbus-interface.html#libnm-nm-vpn-dbus-interface.other">
 <ANCHOR id="libnm-nm-vpn-dbus-interface.object-hierarchy" href="libnm/libnm-nm-vpn-dbus-interface.html#libnm-nm-vpn-dbus-interface.object-hierarchy">
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 4322caee..0dae564f 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -250,6 +250,10 @@
 </tr>
 <tr>
 <td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType">NMWimaxNspNetworkType</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
 <td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NMDeviceState" title="enum NMDeviceState">NMDeviceState</a></td>
 </tr>
 <tr>
@@ -358,7 +362,8 @@
     <span class="lineart">├──</span> NMDeviceType
     <span class="lineart">├──</span> NMIPTunnelMode
     <span class="lineart">├──</span> NMMetered
-    <span class="lineart">╰──</span> NMState
+    <span class="lineart">├──</span> NMState
+    <span class="lineart">╰──</span> NMWimaxNspNetworkType
     <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
     <span class="lineart">├──</span> NM80211ApFlags
     <span class="lineart">├──</span> NM80211ApSecurityFlags
@@ -633,9 +638,8 @@
 <div class="refsect2">
 <a name="NMState"></a><h3>enum NMState</h3>
 <p><a class="link" href="libnm-nm-dbus-interface.html#NMState" title="enum NMState"><span class="type">NMState</span></a> values indicate the current overall networking state.</p>
-<p>(Corresponds to the NM_STATE type in nm-manager.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.44.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.44.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -706,9 +710,8 @@
 <hr>
 <div class="refsect2">
 <a name="NMConnectivityState"></a><h3>enum NMConnectivityState</h3>
-<p>(Corresponds to the NM_CONNECTIVITY type in nm-manager.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.45.4"></a><h4>Members</h4>
+<a name="id-1.3.6.7.45.3"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -763,9 +766,8 @@
 <a name="NMDeviceType"></a><h3>enum NMDeviceType</h3>
 <p><a class="link" href="libnm-nm-dbus-interface.html#NMDeviceType" title="enum NMDeviceType"><span class="type">NMDeviceType</span></a> values indicate the type of hardware represented by
 an <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
-<p>(Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.46.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.46.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -929,9 +931,8 @@ GSM/UMTS, or LTE network access protocols</p>
 <div class="refsect2">
 <a name="NMDeviceCapabilities"></a><h3>enum NMDeviceCapabilities</h3>
 <p>General device capability flags.</p>
-<p>(Corresponds to the NM_DEVICE_CAP type in nm-device-wifi.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.47.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.47.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -975,9 +976,8 @@ GSM/UMTS, or LTE network access protocols</p>
 <div class="refsect2">
 <a name="NMDeviceWifiCapabilities"></a><h3>enum NMDeviceWifiCapabilities</h3>
 <p>802.11 specific device encryption and authentication capabilities.</p>
-<p>(Corresponds to the NM_802_11_DEVICE_CAP type in nm-device-wifi.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.48.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.48.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1077,9 +1077,8 @@ GSM/UMTS, or LTE network access protocols</p>
 <div class="refsect2">
 <a name="NM80211ApFlags"></a><h3>enum NM80211ApFlags</h3>
 <p>802.11 access point flags.</p>
-<p>(Corresponds to the NM_802_11_AP_FLAGS type in nm-access-point.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.49.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.49.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1112,9 +1111,8 @@ encryption (usually means WEP)</p>
 <p>802.11 access point security and authentication flags.  These flags describe
 the current security requirements of an access point as determined from the
 access point's beacon.</p>
-<p>(Corresponds to the NM_802_11_AP_SEC type in nm-access-point.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.50.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.50.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1214,9 +1212,8 @@ is supported</p>
 <div class="refsect2">
 <a name="NM80211Mode"></a><h3>enum NM80211Mode</h3>
 <p>Indicates the 802.11 mode an access point or device is currently in.</p>
-<p>(Corresponds to the NM_802_11_MODE type in generic-types.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.51.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.51.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1267,9 +1264,8 @@ is supported</p>
 <a name="NMBluetoothCapabilities"></a><h3>enum NMBluetoothCapabilities</h3>
 <p><a class="link" href="libnm-nm-dbus-interface.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a> values indicate the usable capabilities of a
 Bluetooth device.</p>
-<p>(Corresponds to the NM_BT_CAPABILITY type in nm-device-bt.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.52.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.52.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1309,9 +1305,8 @@ Bluetooth device.</p>
 technology families a modem device supports.  For more information on the
 specific access technologies the device supports use the ModemManager D-Bus
 API.</p>
-<p>(Corresponds to the NM_DEVICE_MODEM_CAPABILITY type in nm-device-modem.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.53.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.53.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1363,8 +1358,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NMDeviceState"></a><h3>enum NMDeviceState</h3>
-<p>(Corresponds to the NM_DEVICE_STATE type in nm-device.xml.)</p>
+<a name="NMWimaxNspNetworkType"></a><h3>enum NMWimaxNspNetworkType</h3>
+<p>WiMAX network type.</p>
 <div class="refsect3">
 <a name="id-1.3.6.7.54.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -1375,6 +1370,50 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 </colgroup>
 <tbody>
 <tr>
+<td class="enum_member_name"><p><a name="NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS"></a>NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN</p></td>
+<td class="enum_member_description">
+<p>unknown network type</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS"></a>NM_WIMAX_NSP_NETWORK_TYPE_HOME</p></td>
+<td class="enum_member_description">
+<p>home network</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS"></a>NM_WIMAX_NSP_NETWORK_TYPE_PARTNER</p></td>
+<td class="enum_member_description">
+<p>partner network</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS"></a>NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER</p></td>
+<td class="enum_member_description">
+<p>roaming partner network</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceState"></a><h3>enum NMDeviceState</h3>
+<div class="refsect3">
+<a name="id-1.3.6.7.55.3"></a><h4>Members</h4>
+<div class="informaltable"><table 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-DEVICE-STATE-UNKNOWN:CAPS"></a>NM_DEVICE_STATE_UNKNOWN</p></td>
 <td class="enum_member_description">
 <p>the device's state is unknown</p>
@@ -1495,9 +1534,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 <div class="refsect2">
 <a name="NMDeviceStateReason"></a><h3>enum NMDeviceStateReason</h3>
 <p>Device state change reason codes</p>
-<p>(Corresponds to the NM_DEVICE_STATE_REASON type in nm-device.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.55.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.56.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1953,9 +1991,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 <hr>
 <div class="refsect2">
 <a name="NMMetered"></a><h3>enum NMMetered</h3>
-<p>(Corresponds to the NM_METERED type in nm-device.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.56.4"></a><h4>Members</h4>
+<a name="id-1.3.6.7.57.3"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -2009,9 +2046,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 <p><a class="link" href="libnm-nm-dbus-interface.html#NMActiveConnectionState" title="enum NMActiveConnectionState"><span class="type">NMActiveConnectionState</span></a> values indicate the state of a connection to a
 specific network while it is starting, connected, or disconnecting from that
 network.</p>
-<p>(Corresponds to the NM_ACTIVE_CONNECTION_STATE type in nm-active-connection.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.57.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.58.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -2064,9 +2100,8 @@ network.</p>
 <div class="refsect2">
 <a name="NMSecretAgentGetSecretsFlags"></a><h3>enum NMSecretAgentGetSecretsFlags</h3>
 <p><a class="link" href="libnm-nm-dbus-interface.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags"><span class="type">NMSecretAgentGetSecretsFlags</span></a> values modify the behavior of a GetSecrets request.</p>
-<p>(Corresponds to the NM_SECRET_AGENT_GET_SECRETS_FLAGS type in nm-secret-agent.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.58.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.59.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -2136,9 +2171,8 @@ network.</p>
 <div class="refsect2">
 <a name="NMSecretAgentCapabilities"></a><h3>enum NMSecretAgentCapabilities</h3>
 <p><a class="link" href="libnm-nm-dbus-interface.html#NMSecretAgentCapabilities" title="enum NMSecretAgentCapabilities"><span class="type">NMSecretAgentCapabilities</span></a> indicate various capabilities of the agent.</p>
-<p>(Corresponds to the NM_SECRET_AGENT_CAPABILITIES type in nm-secret-agent.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.59.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.60.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -2279,7 +2313,7 @@ VPN plugin authentication dialogs.</p>
 <a name="NMIPTunnelMode"></a><h3>enum NMIPTunnelMode</h3>
 <p>The tunneling mode.</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.77.4"></a><h4>Members</h4>
+<a name="id-1.3.6.7.78.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html
index 2cf12f47..5e1c3977 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -65,6 +65,12 @@
 <a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-2-FOR:CAPS" title="NM_DEPRECATED_IN_1_2_FOR()">NM_DEPRECATED_IN_1_2_FOR</a><span class="c_punctuation">()</span>
 </td>
 </tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-4-FOR:CAPS" title="NM_DEPRECATED_IN_1_4_FOR()">NM_DEPRECATED_IN_1_4_FOR</a><span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -100,6 +106,14 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-AVAILABLE-IN-1-2:CAPS" title="NM_AVAILABLE_IN_1_2">NM_AVAILABLE_IN_1_2</a></td>
 </tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-4:CAPS" title="NM_DEPRECATED_IN_1_4">NM_DEPRECATED_IN_1_4</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-4:CAPS" title="NM_AVAILABLE_IN_1_4">NM_AVAILABLE_IN_1_4</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -137,6 +151,12 @@
 <pre class="programlisting"># define NM_DEPRECATED_IN_1_2_FOR(f)    G_DEPRECATED_FOR(f)
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEPRECATED-IN-1-4-FOR:CAPS"></a><h3>NM_DEPRECATED_IN_1_4_FOR()</h3>
+<pre class="programlisting"># define NM_DEPRECATED_IN_1_4_FOR(f)    G_DEPRECATED_FOR(f)
+</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="libnm-nm-version.other_details"></a><h2>Types and Values</h2>
@@ -174,6 +194,18 @@
 <a name="NM-AVAILABLE-IN-1-2:CAPS"></a><h3>NM_AVAILABLE_IN_1_2</h3>
 <pre class="programlisting">#define             NM_AVAILABLE_IN_1_2</pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEPRECATED-IN-1-4:CAPS"></a><h3>NM_DEPRECATED_IN_1_4</h3>
+<pre class="programlisting"># define NM_DEPRECATED_IN_1_4           G_DEPRECATED
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-AVAILABLE-IN-1-4:CAPS"></a><h3>NM_AVAILABLE_IN_1_4</h3>
+<pre class="programlisting"># define NM_AVAILABLE_IN_1_4            G_UNAVAILABLE(1,4)
+</pre>
+</div>
 </div>
 </div>
 <div class="footer">
diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
index b88d6dfc..299f1d09 100644
--- a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
@@ -462,9 +462,8 @@
 <div class="refsect2">
 <a name="NMVpnServiceState"></a><h3>enum NMVpnServiceState</h3>
 <p>VPN daemon states</p>
-<p>(Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.)</p>
 <div class="refsect3">
-<a name="id-1.7.2.7.27.5"></a><h4>Members</h4>
+<a name="id-1.7.2.7.27.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -529,9 +528,8 @@
 <div class="refsect2">
 <a name="NMVpnConnectionState"></a><h3>enum NMVpnConnectionState</h3>
 <p>VPN connection states</p>
-<p>(Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.)</p>
 <div class="refsect3">
-<a name="id-1.7.2.7.28.5"></a><h4>Members</h4>
+<a name="id-1.7.2.7.28.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -607,9 +605,8 @@
 <div class="refsect2">
 <a name="NMVpnConnectionStateReason"></a><h3>enum NMVpnConnectionStateReason</h3>
 <p>VPN connection state reasons</p>
-<p>(Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.)</p>
 <div class="refsect3">
-<a name="id-1.7.2.7.29.5"></a><h4>Members</h4>
+<a name="id-1.7.2.7.29.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -721,9 +718,8 @@
 <div class="refsect2">
 <a name="NMVpnPluginFailure"></a><h3>enum NMVpnPluginFailure</h3>
 <p>VPN plugin failure reasons</p>
-<p>(Corresponds to the NM_VPN_PLUGIN_FAILURE type in nm-vpn-plugin.xml.)</p>
 <div class="refsect3">
-<a name="id-1.7.2.7.30.5"></a><h4>Members</h4>
+<a name="id-1.7.2.7.30.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index dd719805..6dd470c9 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -303,6 +303,7 @@
     <keyword type="enum" name="enum NM80211Mode" link="libnm-nm-dbus-interface.html#NM80211Mode"/>
     <keyword type="enum" name="enum NMBluetoothCapabilities" link="libnm-nm-dbus-interface.html#NMBluetoothCapabilities"/>
     <keyword type="enum" name="enum NMDeviceModemCapabilities" link="libnm-nm-dbus-interface.html#NMDeviceModemCapabilities"/>
+    <keyword type="enum" name="enum NMWimaxNspNetworkType" link="libnm-nm-dbus-interface.html#NMWimaxNspNetworkType"/>
     <keyword type="enum" name="enum NMDeviceState" link="libnm-nm-dbus-interface.html#NMDeviceState"/>
     <keyword type="enum" name="enum NMDeviceStateReason" link="libnm-nm-dbus-interface.html#NMDeviceStateReason"/>
     <keyword type="enum" name="enum NMMetered" link="libnm-nm-dbus-interface.html#NMMetered" since="1.2"/>
@@ -695,6 +696,18 @@
     <keyword type="macro" name="NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-XMIT-HASH-POLICY:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BOND_OPTION_RESEND_IGMP" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-RESEND-IGMP:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BOND_OPTION_LACP_RATE" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-LACP-RATE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BOND_OPTION_ACTIVE_SLAVE" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-ACTIVE-SLAVE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-AD-ACTOR-SYS-PRIO:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-AD-ACTOR-SYSTEM:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-AD-USER-PORT-KEY:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-ALL-SLAVES-ACTIVE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-ARP-ALL-TARGETS:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BOND_OPTION_MIN_LINKS" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-MIN-LINKS:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BOND_OPTION_NUM_GRAT_ARP" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-NUM-GRAT-ARP:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BOND_OPTION_NUM_UNSOL_NA" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-NUM-UNSOL-NA:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-PACKETS-PER-SLAVE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-TLB-DYNAMIC-LB:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BOND_OPTION_LP_INTERVAL" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-LP-INTERVAL:CAPS"/>
     <keyword type="property" name="The “options” property" link="NMSettingBond.html#NMSettingBond--options"/>
     <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"/>
@@ -1002,6 +1015,7 @@
     <keyword type="macro" name="NM_SETTING_DNS_OPTION_SINGLE_REQUEST" link="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-SINGLE-REQUEST:CAPS"/>
     <keyword type="macro" name="NM_SETTING_DNS_OPTION_SINGLE_REQUEST_REOPEN" link="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-SINGLE-REQUEST-REOPEN:CAPS"/>
     <keyword type="macro" name="NM_SETTING_DNS_OPTION_NO_TLD_QUERY" link="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-NO-TLD-QUERY:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_DNS_OPTION_USE_VC" link="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-USE-VC:CAPS"/>
     <keyword type="property" name="The “addresses” property" link="NMSettingIPConfig.html#NMSettingIPConfig--addresses"/>
     <keyword type="property" name="The “dad-timeout” property" link="NMSettingIPConfig.html#NMSettingIPConfig--dad-timeout"/>
     <keyword type="property" name="The “dhcp-hostname” property" link="NMSettingIPConfig.html#NMSettingIPConfig--dhcp-hostname"/>
@@ -1991,7 +2005,6 @@
     <keyword type="macro" name="NM_WIMAX_NSP_NAME" link="NMWimaxNsp.html#NM-WIMAX-NSP-NAME:CAPS"/>
     <keyword type="macro" name="NM_WIMAX_NSP_SIGNAL_QUALITY" link="NMWimaxNsp.html#NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS"/>
     <keyword type="macro" name="NM_WIMAX_NSP_NETWORK_TYPE" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE:CAPS"/>
-    <keyword type="enum" name="enum NMWimaxNspNetworkType" link="NMWimaxNsp.html#NMWimaxNspNetworkType"/>
     <keyword type="property" name="The “name” property" link="NMWimaxNsp.html#NMWimaxNsp--name"/>
     <keyword type="property" name="The “network-type” property" link="NMWimaxNsp.html#NMWimaxNsp--network-type"/>
     <keyword type="property" name="The “signal-quality” property" link="NMWimaxNsp.html#NMWimaxNsp--signal-quality"/>
@@ -2096,12 +2109,15 @@
     <keyword type="macro" name="NM_DEPRECATED_IN_0_9_10_FOR()" link="libnm-nm-version.html#NM-DEPRECATED-IN-0-9-10-FOR:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_1_0_FOR()" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-0-FOR:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_1_2_FOR()" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-2-FOR:CAPS"/>
+    <keyword type="macro" name="NM_DEPRECATED_IN_1_4_FOR()" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-4-FOR:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_0_9_10" link="libnm-nm-version.html#NM-DEPRECATED-IN-0-9-10:CAPS"/>
     <keyword type="macro" name="NM_AVAILABLE_IN_0_9_10" link="libnm-nm-version.html#NM-AVAILABLE-IN-0-9-10:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_1_0" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-0:CAPS"/>
     <keyword type="macro" name="NM_AVAILABLE_IN_1_0" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-0:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_1_2" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-2:CAPS"/>
     <keyword type="macro" name="NM_AVAILABLE_IN_1_2" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-2:CAPS"/>
+    <keyword type="macro" name="NM_DEPRECATED_IN_1_4" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-4:CAPS"/>
+    <keyword type="macro" name="NM_AVAILABLE_IN_1_4" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-4: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"/>
@@ -2341,6 +2357,10 @@
     <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO" link="libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-CDMA-EVDO:CAPS"/>
     <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS" link="libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-GSM-UMTS:CAPS"/>
     <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_LTE" link="libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-LTE:CAPS"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN" link="libnm-nm-dbus-interface.html#NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_HOME" link="libnm-nm-dbus-interface.html#NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_PARTNER" link="libnm-nm-dbus-interface.html#NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER" link="libnm-nm-dbus-interface.html#NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS"/>
     <keyword type="constant" name="NM_DEVICE_STATE_UNKNOWN" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-UNKNOWN:CAPS"/>
     <keyword type="constant" name="NM_DEVICE_STATE_UNMANAGED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-UNMANAGED:CAPS"/>
     <keyword type="constant" name="NM_DEVICE_STATE_UNAVAILABLE" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-UNAVAILABLE:CAPS"/>
@@ -2535,10 +2555,6 @@
     <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"/>
     <keyword type="constant" name="NM_WEP_KEY_TYPE_LAST" link="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-LAST:CAPS"/>
-    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS"/>
-    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_HOME" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS"/>
-    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_PARTNER" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS"/>
-    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER: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"/>
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index e08e9893..66f19502 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -144,7 +144,7 @@
     <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 class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType">NMWepKeyType</a>
-    <span class="lineart">╰──</span> <a class="link" href="NMWimaxNsp.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType">NMWimaxNspNetworkType</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>
     <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>