Imported Upstream version 0.8.999 upstream/0.8.999

author: Michael Biebl <biebl@debian.org> 2011-05-04 21:35:41 +0200
committer: Michael Biebl <biebl@debian.org> 2011-05-04 21:35:41 +0200
commit: 9f806e97a24bba61417ae312fcc0da40914266fb (patch)
tree: 4a25723414ceac11b4cba0558aa16f6f4b459f4b /docs/libnm-util/html
parent: 8baa1aca8dfd35e3190d7d5655eb83b5b901e263 (diff)
27 files changed, 3003 insertions, 7378 deletions
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
deleted file mode 100644
index 3ff24b7e..00000000
--- a/docs/libnm-util/html/NMConnection.html
+++ /dev/null
@@ -1,1062 +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>NMConnection</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
-<link rel="home" href="index.html" title="libnm-util Reference Manual">
-<link rel="up" href="ch01.html" title="libnm-util API Reference">
-<link rel="prev" href="ch01.html" title="libnm-util API Reference">
-<link rel="next" href="NMSetting.html" title="NMSetting">
-<meta name="generator" content="GTK-Doc V1.15 (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="2">
-<tr valign="middle">
-<td><a accesskey="p" href="ch01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libnm-util Reference Manual</th>
-<td><a accesskey="n" href="NMSetting.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#NMConnection.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#NMConnection.description" class="shortcut">Description</a>
-                   | 
-                  <a href="#NMConnection.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                   | 
-                  <a href="#NMConnection.properties" class="shortcut">Properties</a>
-                   | 
-                  <a href="#NMConnection.signals" class="shortcut">Signals</a>
-</td></tr>
-</table>
-<div class="refentry" title="NMConnection">
-<a name="NMConnection"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="NMConnection.top_of_page"></a>NMConnection</span></h2>
-<p>NMConnection — Describes a connection to specific network or provider</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="NMConnection.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;nm-connection.h&gt;
-
-enum                <a class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope">NMConnectionScope</a>;
-enum                <a class="link" href="NMConnection.html#NMConnectionError" title="enum NMConnectionError">NMConnectionError</a>;
-#define             <a class="link" href="NMConnection.html#NM-TYPE-CONNECTION-ERROR:CAPS" title="NM_TYPE_CONNECTION_ERROR">NM_TYPE_CONNECTION_ERROR</a>
-#define             <a class="link" href="NMConnection.html#NM-CONNECTION-ERROR:CAPS" title="NM_CONNECTION_ERROR">NM_CONNECTION_ERROR</a>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMConnection.html#nm-connection-error-quark" title="nm_connection_error_quark ()">nm_connection_error_quark</a>           (<em class="parameter"><code><span class="type">void</span></code></em>);
-#define             <a class="link" href="NMConnection.html#NM-CONNECTION-SCOPE:CAPS" title="NM_CONNECTION_SCOPE">NM_CONNECTION_SCOPE</a>
-#define             <a class="link" href="NMConnection.html#NM-CONNECTION-PATH:CAPS" title="NM_CONNECTION_PATH">NM_CONNECTION_PATH</a>
-                    <a class="link" href="NMConnection.html#NMConnection-struct" title="NMConnection">NMConnection</a>;
-                    <a class="link" href="NMConnection.html#NMConnectionClass" title="NMConnectionClass">NMConnectionClass</a>;
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMConnection.html#nm-connection-get-type" title="nm_connection_get_type ()">nm_connection_get_type</a>              (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *      <a class="link" href="NMConnection.html#nm-connection-new" title="nm_connection_new ()">nm_connection_new</a>                   (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *      <a class="link" href="NMConnection.html#nm-connection-new-from-hash" title="nm_connection_new_from_hash ()">nm_connection_new_from_hash</a>         (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *      <a class="link" href="NMConnection.html#nm-connection-duplicate" title="nm_connection_duplicate ()">nm_connection_duplicate</a>             (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-add-setting" title="nm_connection_add_setting ()">nm_connection_add_setting</a>           (<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 class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-remove-setting" title="nm_connection_remove_setting ()">nm_connection_remove_setting</a>        (<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="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> setting_type</code></em>);
-<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         <a class="link" href="NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()">nm_connection_get_setting</a>           (<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="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> setting_type</code></em>);
-<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         <a class="link" href="NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()">nm_connection_get_setting_by_name</a>   (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMConnection.html#nm-connection-replace-settings" title="nm_connection_replace_settings ()">nm_connection_replace_settings</a>      (<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="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *new_settings</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMConnection.html#nm-connection-compare" title="nm_connection_compare ()">nm_connection_compare</a>               (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *b</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags"><span class="type">NMSettingCompareFlags</span></a> flags</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMConnection.html#nm-connection-diff" title="nm_connection_diff ()">nm_connection_diff</a>                  (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *b</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags"><span class="type">NMSettingCompareFlags</span></a> flags</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> **out_settings</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMConnection.html#nm-connection-verify" title="nm_connection_verify ()">nm_connection_verify</a>                (<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="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMConnection.html#nm-connection-need-secrets" title="nm_connection_need_secrets ()">nm_connection_need_secrets</a>          (<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="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> **hints</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-clear-secrets" title="nm_connection_clear_secrets ()">nm_connection_clear_secrets</a>         (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMConnection.html#nm-connection-update-secrets" title="nm_connection_update_secrets ()">nm_connection_update_secrets</a>        (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *setting_secrets</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-set-scope" title="nm_connection_set_scope ()">nm_connection_set_scope</a>             (<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 class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope"><span class="type">NMConnectionScope</span></a> scope</code></em>);
-<a class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope"><span class="returnvalue">NMConnectionScope</span></a>   <a class="link" href="NMConnection.html#nm-connection-get-scope" title="nm_connection_get_scope ()">nm_connection_get_scope</a>             (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()">nm_connection_set_path</a>              (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMConnection.html#nm-connection-get-path" title="nm_connection_get_path ()">nm_connection_get_path</a>              (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-for-each-setting-value" title="nm_connection_for_each_setting_value ()">nm_connection_for_each_setting_value</a>
-                                                        (<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 class="link" href="NMSetting.html#NMSettingValueIterFn" title="NMSettingValueIterFn ()"><span class="type">NMSettingValueIterFn</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="NMConnection.html#nm-connection-to-hash" title="nm_connection_to_hash ()">nm_connection_to_hash</a>               (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-dump" title="nm_connection_dump ()">nm_connection_dump</a>                  (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
-<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         <a class="link" href="NMConnection.html#nm-connection-create-setting" title="nm_connection_create_setting ()">nm_connection_create_setting</a>        (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMConnection.html#nm-connection-lookup-setting-type" title="nm_connection_lookup_setting_type ()">nm_connection_lookup_setting_type</a>   (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMConnection.html#nm-connection-lookup-setting-type-by-quark" title="nm_connection_lookup_setting_type_by_quark ()">nm_connection_lookup_setting_type_by_quark</a>
-                                                        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> error_quark</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="NMConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
-   +----NMConnection
-</pre>
-</div>
-<div class="refsect1" title="Properties">
-<a name="NMConnection.properties"></a><h2>Properties</h2>
-<pre class="synopsis">
-  "<a class="link" href="NMConnection.html#NMConnection--path" title='The "path" property'>path</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct
-  "<a class="link" href="NMConnection.html#NMConnection--scope" title='The "scope" property'>scope</a>"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
-</pre>
-</div>
-<div class="refsect1" title="Signals">
-<a name="NMConnection.signals"></a><h2>Signals</h2>
-<pre class="synopsis">
-  "<a class="link" href="NMConnection.html#NMConnection-secrets-updated" title='The "secrets-updated" signal'>secrets-updated</a>"                                : Run First
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="NMConnection.description"></a><h2>Description</h2>
-<p>
-An <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> describes all the settings and configuration values that
-are necessary to configure network devices for operation on a specific
-network.  Connections are the fundamental operating object for
-NetworkManager; no device is connected without a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>, or
-disconnected without having been connected with a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.
-</p>
-<p>
-Each <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> contains a list of <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> objects usually referenced
-by name (using <a class="link" href="NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()"><code class="function">nm_connection_get_setting_by_name()</code></a>) or by type (with
-<a class="link" href="NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()"><code class="function">nm_connection_get_setting()</code></a>).  The settings describe the actual parameters
-with which the network devices are configured, including device-specific
-parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
-(addresses, routes, addressing methods, etc).
-</p>
-<p>
-Most connections also have a <a class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope"><code class="literal">NMConnectionScope</code></a>; a connection will be
-provided over D-Bus either by the user settings service
-(org.freedesktop.NetworkManagerUserSettings) running in an active user
-session, or by the system-wide system settings service
-(org.freedesktop.NetworkManagerSystemSettings) which provides  connections
-for all users.
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="NMConnection.details"></a><h2>Details</h2>
-<div class="refsect2" title="enum NMConnectionScope">
-<a name="NMConnectionScope"></a><h3>enum NMConnectionScope</h3>
-<pre class="programlisting">typedef enum {
-	NM_CONNECTION_SCOPE_UNKNOWN = 0,
-	NM_CONNECTION_SCOPE_SYSTEM,
-	NM_CONNECTION_SCOPE_USER
-} NMConnectionScope;
-</pre>
-<p>
-Connection scope indicated what settings service, if any, provides the
-connection.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><a name="NM-CONNECTION-SCOPE-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_CONNECTION_SCOPE_UNKNOWN</code></span></p></td>
-<td>scope not known or not yet set
-</td>
-</tr>
-<tr>
-<td><p><a name="NM-CONNECTION-SCOPE-SYSTEM:CAPS"></a><span class="term"><code class="literal">NM_CONNECTION_SCOPE_SYSTEM</code></span></p></td>
-<td>connection is provided by the system settings
-  service
-</td>
-</tr>
-<tr>
-<td><p><a name="NM-CONNECTION-SCOPE-USER:CAPS"></a><span class="term"><code class="literal">NM_CONNECTION_SCOPE_USER</code></span></p></td>
-<td>connection is provided by a user settings service
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="enum NMConnectionError">
-<a name="NMConnectionError"></a><h3>enum NMConnectionError</h3>
-<pre class="programlisting">typedef enum
-{
-	NM_CONNECTION_ERROR_UNKNOWN = 0,
-	NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND
-} NMConnectionError;
-</pre>
-<p>
-Describes errors that may result from operations involving a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><a name="NM-CONNECTION-ERROR-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_CONNECTION_ERROR_UNKNOWN</code></span></p></td>
-<td>unknown or unclassified error
-</td>
-</tr>
-<tr>
-<td><p><a name="NM-CONNECTION-ERROR-CONNECTION-SETTING-NOT-FOUND:CAPS"></a><span class="term"><code class="literal">NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND</code></span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object
-  did not contain the required <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> object, which must be
-  present for all connections
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="NM_TYPE_CONNECTION_ERROR">
-<a name="NM-TYPE-CONNECTION-ERROR:CAPS"></a><h3>NM_TYPE_CONNECTION_ERROR</h3>
-<pre class="programlisting">#define NM_TYPE_CONNECTION_ERROR (nm_connection_error_get_type ()) 
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_CONNECTION_ERROR">
-<a name="NM-CONNECTION-ERROR:CAPS"></a><h3>NM_CONNECTION_ERROR</h3>
-<pre class="programlisting">#define NM_CONNECTION_ERROR nm_connection_error_quark ()
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_error_quark ()">
-<a name="nm-connection-error-quark"></a><h3>nm_connection_error_quark ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_connection_error_quark           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Registers an error quark for <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> if necessary.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the error quark used for <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> errors.
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="NM_CONNECTION_SCOPE">
-<a name="NM-CONNECTION-SCOPE:CAPS"></a><h3>NM_CONNECTION_SCOPE</h3>
-<pre class="programlisting">#define NM_CONNECTION_SCOPE "scope"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_CONNECTION_PATH">
-<a name="NM-CONNECTION-PATH:CAPS"></a><h3>NM_CONNECTION_PATH</h3>
-<pre class="programlisting">#define NM_CONNECTION_PATH "path"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMConnection">
-<a name="NMConnection-struct"></a><h3>NMConnection</h3>
-<pre class="programlisting">typedef struct _NMConnection NMConnection;</pre>
-<p>
-The NMConnection struct contains only private data.
-It should only be accessed through the functions described below.
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NMConnectionClass">
-<a name="NMConnectionClass"></a><h3>NMConnectionClass</h3>
-<pre class="programlisting">typedef struct {
-	GObjectClass parent;
-
-	/* Signals */
-	void (*secrets_updated) (NMConnection *connection, const char * setting);
-} NMConnectionClass;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_get_type ()">
-<a name="nm-connection-get-type"></a><h3>nm_connection_get_type ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_connection_get_type              (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_new ()">
-<a name="nm-connection-new"></a><h3>nm_connection_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *      nm_connection_new                   (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Creates a new <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object with no <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> objects.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new empty <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_new_from_hash ()">
-<a name="nm-connection-new-from-hash"></a><h3>nm_connection_new_from_hash ()</h3>
-<pre class="programlisting"><a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *      nm_connection_new_from_hash         (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/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="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> from a hash table describing the connection.  See
-<a class="link" href="NMConnection.html#nm-connection-to-hash" title="nm_connection_to_hash ()"><code class="function">nm_connection_to_hash()</code></a> for a description of the expected hash table.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>hash</code></em> :</span></p></td>
-<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> describing the connection
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object, populated with settings created
-from the values in the hash table, or NULL if the connection failed to
-validate
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_duplicate ()">
-<a name="nm-connection-duplicate"></a><h3>nm_connection_duplicate ()</h3>
-<pre class="programlisting"><a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *      nm_connection_duplicate             (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-Duplicates a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to duplicate
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> containing the same settings and properties
-as the source <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_add_setting ()">
-<a name="nm-connection-add-setting"></a><h3>nm_connection_add_setting ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_add_setting           (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
-<p>
-Adds a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to the connection, replacing any previous <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> of the
-same name which has previously been added to the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.  The
-connection takes ownership of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object and does not increase
-the setting object's reference count.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to add to the connection object
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_remove_setting ()">
-<a name="nm-connection-remove-setting"></a><h3>nm_connection_remove_setting ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_remove_setting        (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> setting_type</code></em>);</pre>
-<p>
-Removes the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> from the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.  This
-operation dereferences the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting_type</code></em> :</span></p></td>
-<td>the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the setting object to remove
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_get_setting ()">
-<a name="nm-connection-get-setting"></a><h3>nm_connection_get_setting ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_connection_get_setting           (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> setting_type</code></em>);</pre>
-<p>
-Gets the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>, if one has been previously added
-to the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting_type</code></em> :</span></p></td>
-<td>the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the setting object to return
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>, or NULL if no setting of that type was previously
-added to the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_get_setting_by_name ()">
-<a name="nm-connection-get-setting-by-name"></a><h3>nm_connection_get_setting_by_name ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_connection_get_setting_by_name   (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
-<p>
-Gets the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given name, if one has been previously added
-the the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>a setting name
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>, or NULL if no setting with that name was previously
-added to the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_replace_settings ()">
-<a name="nm-connection-replace-settings"></a><h3>nm_connection_replace_settings ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_connection_replace_settings      (<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="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *new_settings</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>new_settings</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> of settings
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store error, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the settings were valid and added to the connection, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>
-if they were not
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_compare ()">
-<a name="nm-connection-compare"></a><h3>nm_connection_compare ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_connection_compare               (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *b</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags"><span class="type">NMSettingCompareFlags</span></a> flags</code></em>);</pre>
-<p>
-Compares two <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> objects for similarity, with comparison behavior
-modified by a set of flags.  See <a class="link" href="NMSetting.html#nm-setting-compare" title="nm_setting_compare ()"><code class="function">nm_setting_compare()</code></a> for a description of
-each flag's behavior.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>a</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td>
-<td>a second <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to compare with the first
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td>compare flags, e.g. <a class="link" href="NMSetting.html#NM-SETTING-COMPARE-FLAG-EXACT:CAPS"><code class="literal">NM_SETTING_COMPARE_FLAG_EXACT</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the comparison succeeds, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it does not
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_diff ()">
-<a name="nm-connection-diff"></a><h3>nm_connection_diff ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_connection_diff                  (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *b</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags"><span class="type">NMSettingCompareFlags</span></a> flags</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> **out_settings</code></em>);</pre>
-<p>
-Compares two <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> objects for similarity, with comparison behavior
-modified by a set of flags.  See <a class="link" href="NMSetting.html#nm-setting-compare" title="nm_setting_compare ()"><code class="function">nm_setting_compare()</code></a> for a description of
-each flag's behavior.  If the connections differ, settings and keys within
-each setting that differ are added to the returned <em class="parameter"><code>out_settings</code></em> hash table.
-No values are returned, only key names.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>a</code></em> :</span></p></td>
-<td>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td>
-<td>a second <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to compare with the first
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td>compare flags, e.g. <a class="link" href="NMSetting.html#NM-SETTING-COMPARE-FLAG-EXACT:CAPS"><code class="literal">NM_SETTING_COMPARE_FLAG_EXACT</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_settings</code></em> :</span></p></td>
-<td>if the connections differ, on return a hash table mapping
-setting names to second-level GHashTable, which contains key names that differ
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the connections contain the same values, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do
-not
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_verify ()">
-<a name="nm-connection-verify"></a><h3>nm_connection_verify ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_connection_verify                (<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="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>
-Validates the connection and all its settings.  Each setting's properties
-have allowed values, and some values are dependent on other values.  For
-example, if a WiFi connection is security enabled, the <a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a>
-setting object's 'security' property must contain the setting name of the
-<a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> object, which must also be present in the 
-connection for the connection to be valid.  As another example, the
-<a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> object's 'mac-address' property must be a validly formatted
-MAC address.  The returned <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> contains information about which
-setting and which property failed validation, and how it failed validation.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to verify
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store error, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the connection is valid, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_need_secrets ()">
-<a name="nm-connection-need-secrets"></a><h3>nm_connection_need_secrets ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_connection_need_secrets          (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> **hints</code></em>);</pre>
-<p>
-Returns the name of the first setting object in the connection which would
-need secrets to make a successful connection.  The returned hints are only
-intended as a guide to what secrets may be required, because in some
-circumstances, there is no way to conclusively determine exactly which
-secrets are needed.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>hints</code></em> :</span></p></td>
-<td>the address of a pointer to a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a>, initialized to NULL, which
-on return points to an allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the property names of
-secrets of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> which may be required; the caller owns the array
-and must free the each array element with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>, as well as the array
-itself with <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-free"><code class="function">g_ptr_array_free()</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the setting name of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object which has invalid or
-missing secrets
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_clear_secrets ()">
-<a name="nm-connection-clear-secrets"></a><h3>nm_connection_clear_secrets ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_clear_secrets         (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-Clears and frees any secrets that may be stored in the connection, to avoid
-keeping secret data in memory when not needed.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_update_secrets ()">
-<a name="nm-connection-update-secrets"></a><h3>nm_connection_update_secrets ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_connection_update_secrets        (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *setting_secrets</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>
-Update the specified setting's secrets, given a hash table of secrets
-intended for that setting (deserialized from D-Bus for example).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting_name</code></em> :</span></p></td>
-<td>the setting object name to which the secrets apply
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting_secrets</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping string:<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> of setting property names and
-secrets
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store error, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the secrets were successfully updated and the connection
-is valid, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure or if the setting was never added to the connection
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_set_scope ()">
-<a name="nm-connection-set-scope"></a><h3>nm_connection_set_scope ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_set_scope             (<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 class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope"><span class="type">NMConnectionScope</span></a> scope</code></em>);</pre>
-<p>
-Sets the scope of the connection.  This property is not serialized, and is
-only for the reference of the caller.  A connection may have no scope
-(internal, temporary connections), "system" scope (provided by the system
-settings service), or "user" scope, provided by a user settings service.  The
-creator of the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object is responsible for setting the
-connection's scope if needed.  Sets the <a class="link" href="NMConnection.html#NMConnection--scope" title='The "scope" property'><span class="type">"scope"</span></a> property.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>scope</code></em> :</span></p></td>
-<td>the scope of the connection
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_get_scope ()">
-<a name="nm-connection-get-scope"></a><h3>nm_connection_get_scope ()</h3>
-<pre class="programlisting"><a class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope"><span class="returnvalue">NMConnectionScope</span></a>   nm_connection_get_scope             (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-Returns the connection scope.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the scope of the connection, previously set by a call to
-<a class="link" href="NMConnection.html#nm-connection-set-scope" title="nm_connection_set_scope ()"><code class="function">nm_connection_set_scope()</code></a>.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_set_path ()">
-<a name="nm-connection-set-path"></a><h3>nm_connection_set_path ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_set_path              (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
-<p>
-Sets the D-Bus path of the connection.  This property is not serialized, and
-is only for the reference of the caller.  Sets the <a class="link" href="NMConnection.html#NMConnection--path" title='The "path" property'><span class="type">"path"</span></a>
-property.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>the D-Bus path of the connection as given by the settings service
-which provides the connection
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_get_path ()">
-<a name="nm-connection-get-path"></a><h3>nm_connection_get_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_connection_get_path              (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-Returns the connection's D-Bus path.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the D-Bus path of the connection, previously set by a call to
-<a class="link" href="NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()"><code class="function">nm_connection_set_path()</code></a>.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_for_each_setting_value ()">
-<a name="nm-connection-for-each-setting-value"></a><h3>nm_connection_for_each_setting_value ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_for_each_setting_value
-                                                        (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingValueIterFn" title="NMSettingValueIterFn ()"><span class="type">NMSettingValueIterFn</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-Iterates over the properties of each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object in the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>,
-calling the supplied user function for each property.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>func</code></em> :</span></p></td>
-<td>user-supplied function called for each setting's property
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data passed to <em class="parameter"><code>func</code></em> at each invocation
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_to_hash ()">
-<a name="nm-connection-to-hash"></a><h3>nm_connection_to_hash ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        nm_connection_to_hash               (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-Converts the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> into a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> describing the connection,
-suitable for marshalling over D-Bus or serializing.  The hash table mapping
-is string:<a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> with each element in the returned hash representing
-a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object.  The keys are setting object names, and the values
-are <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTables</span></a> mapping string:GValue, each of which represents the
-properties of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> describing the connection, its settings, and
-each setting's properties.  The caller owns the hash table and must unref
-the hash table with <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-unref"><code class="function">g_hash_table_unref()</code></a> when it is no longer needed.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_dump ()">
-<a name="nm-connection-dump"></a><h3>nm_connection_dump ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_dump                  (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-Print the connection to stdout.  For debugging purposes ONLY, should NOT
-be used for serialization of the connection or machine-parsed in any way. The
-output format is not guaranteed to be stable and may change at any time.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_create_setting ()">
-<a name="nm-connection-create-setting"></a><h3>nm_connection_create_setting ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_connection_create_setting        (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
-<p>
-Create a new <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object of the desired type, given a setting name.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>a setting name
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new setting object, or NULL if the setting name was unknown
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_lookup_setting_type ()">
-<a name="nm-connection-lookup-setting-type"></a><h3>nm_connection_lookup_setting_type ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_connection_lookup_setting_type   (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
-<p>
-Returns the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the setting's class for a given setting name.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>a setting name
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the setting's class
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_connection_lookup_setting_type_by_quark ()">
-<a name="nm-connection-lookup-setting-type-by-quark"></a><h3>nm_connection_lookup_setting_type_by_quark ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_connection_lookup_setting_type_by_quark
-                                                        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> error_quark</code></em>);</pre>
-<p>
-Returns the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the setting's class for a given setting error quark.
-Useful for figuring out which setting a returned error is for.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error_quark</code></em> :</span></p></td>
-<td>a setting error quark
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the setting's class
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<div class="refsect1" title="Property Details">
-<a name="NMConnection.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "path" property'>
-<a name="NMConnection--path"></a><h3>The <code class="literal">"path"</code> property</h3>
-<pre class="programlisting">  "path"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct</pre>
-<p>
-The connection's D-Bus path, used only by the calling process as a record
-of the D-Bus path of the connection as provided by a settings service.
-</p>
-<p>Default value: NULL</p>
-</div>
-<hr>
-<div class="refsect2" title='The "scope" property'>
-<a name="NMConnection--scope"></a><h3>The <code class="literal">"scope"</code> property</h3>
-<pre class="programlisting">  "scope"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
-<p>
-The connection's scope, used only by the calling process as a record
-of which settings service the connection is provided by.  One of the
-NM_CONNECTION_SCOPE_* defines.
-</p>
-<p>Allowed values: &lt;= 2</p>
-<p>Default value: 0</p>
-</div>
-</div>
-<div class="refsect1" title="Signal Details">
-<a name="NMConnection.signal-details"></a><h2>Signal Details</h2>
-<div class="refsect2" title='The "secrets-updated" signal'>
-<a name="NMConnection-secrets-updated"></a><h3>The <code class="literal">"secrets-updated"</code> signal</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>        *setting_name,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>      user_data)         : Run First</pre>
-<p>
-The ::secrets-updated signal is emitted when the secrets of a setting
-have been changed.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the object on which the signal is emitted
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting_name</code></em> :</span></p></td>
-<td>the setting name of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> for which secrets were
-updated
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data set when the signal handler was connected.</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 77129d21..c77c5985 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -6,15 +6,15 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
-<link rel="prev" href="NMConnection.html" title="NMConnection">
+<link rel="prev" href="ch01.html" title="libnm-util API Reference">
 <link rel="next" href="NMSettingConnection.html" title="NMSettingConnection">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (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="2">
 <tr valign="middle">
-<td><a accesskey="p" href="NMConnection.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="ch01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-util Reference Manual</th>
@@ -30,7 +30,7 @@
                   <a href="#NMSetting.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSetting">
+<div class="refentry">
 <a name="NMSetting"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,12 +39,12 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSetting.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
+<a name="NMSettingError"></a><pre class="synopsis">
 #include &lt;nm-setting.h&gt;
 
-enum                <a class="link" href="NMSetting.html#NMSettingError" title="enum NMSettingError">NMSettingError</a>;
+enum                <a class="link" href="NMSetting.html#NMSettingError">NMSettingError</a>;
 #define             <a class="link" href="NMSetting.html#NM-TYPE-SETTING-ERROR:CAPS" title="NM_TYPE_SETTING_ERROR">NM_TYPE_SETTING_ERROR</a>
 #define             <a class="link" href="NMSetting.html#NM-SETTING-ERROR:CAPS" title="NM_SETTING_ERROR">NM_SETTING_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSetting.html#nm-setting-error-quark" title="nm_setting_error_quark ()">nm_setting_error_quark</a>              (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -53,6 +53,7 @@ enum                <a class="link" href="NMSetting.html#NMSettingError" title="
 #define             <a class="link" href="NMSetting.html#NM-SETTING-PARAM-SECRET:CAPS" title="NM_SETTING_PARAM_SECRET">NM_SETTING_PARAM_SECRET</a>
 #define             <a class="link" href="NMSetting.html#NM-SETTING-PARAM-FUZZY-IGNORE:CAPS" title="NM_SETTING_PARAM_FUZZY_IGNORE">NM_SETTING_PARAM_FUZZY_IGNORE</a>
 #define             <a class="link" href="NMSetting.html#NM-SETTING-NAME:CAPS" title="NM_SETTING_NAME">NM_SETTING_NAME</a>
+enum                <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags">NMSettingSecretFlags</a>;
                     <a class="link" href="NMSetting.html#NMSetting-struct" title="NMSetting">NMSetting</a>;
                     <a class="link" href="NMSetting.html#NMSettingClass" title="NMSettingClass">NMSettingClass</a>;
 <span class="returnvalue">void</span>                (<a class="link" href="NMSetting.html#NMSettingValueIterFn" title="NMSettingValueIterFn ()">*NMSettingValueIterFn</a>)             (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
@@ -61,7 +62,9 @@ enum                <a class="link" href="NMSetting.html#NMSettingError" title="
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-GParamSpec.html#GParamFlags"><span class="type">GParamFlags</span></a> flags</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSetting.html#nm-setting-get-type" title="nm_setting_get_type ()">nm_setting_get_type</a>                 (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="NMSetting.html#nm-setting-to-hash" title="nm_setting_to_hash ()">nm_setting_to_hash</a>                  (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);
+enum                <a class="link" href="NMSetting.html#NMSettingHashFlags" title="enum NMSettingHashFlags">NMSettingHashFlags</a>;
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="NMSetting.html#nm-setting-to-hash" title="nm_setting_to_hash ()">nm_setting_to_hash</a>                  (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingHashFlags" title="enum NMSettingHashFlags"><span class="type">NMSettingHashFlags</span></a> flags</code></em>);
 <a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         <a class="link" href="NMSetting.html#nm-setting-new-from-hash" title="nm_setting_new_from_hash ()">nm_setting_new_from_hash</a>            (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> setting_type</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);
 <a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         <a class="link" href="NMSetting.html#nm-setting-duplicate" title="nm_setting_duplicate ()">nm_setting_duplicate</a>                (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);
@@ -88,11 +91,23 @@ enum                <a class="link" href="NMSetting.html#NMSettingDiffResult" ti
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting.html#nm-setting-update-secrets" title="nm_setting_update_secrets ()">nm_setting_update_secrets</a>           (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *secrets</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting.html#nm-setting-get-secret-flags" title="nm_setting_get_secret_flags ()">nm_setting_get_secret_flags</a>         (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *secret_name</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> *out_flags</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting.html#nm-setting-set-secret-flags" title="nm_setting_set_secret_flags ()">nm_setting_set_secret_flags</a>         (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *secret_name</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSetting.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----NMSetting
          +----<a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
@@ -107,31 +122,32 @@ enum                <a class="link" href="NMSetting.html#NMSettingDiffResult" ti
          +----<a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
          +----<a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
          +----<a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
+         +----NMSettingWimax
          +----<a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
          +----<a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
          +----<a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSetting.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSetting.html#NMSetting--name" title='The "name" property'>name</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSetting.description"></a><h2>Description</h2>
 <p>
 Each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> contains properties that describe configuration that applies
 to a specific network layer (like IPv4 or IPv6 configuration) or device type
 (like Ethernet, or WiFi).  A collection of individual settings together
-make up an <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>. Each property is strongly typed and usually has
+make up an <span class="type">NMConnection</span>. Each property is strongly typed and usually has
 a number of allowed values.  See each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass for a description
 of properties and allowed values.
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSetting.details"></a><h2>Details</h2>
-<div class="refsect2" title="enum NMSettingError">
+<div class="refsect2">
 <a name="NMSettingError"></a><h3>enum NMSettingError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -175,7 +191,7 @@ Describes errors that may result from operations involving a <a class="link" hre
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_ERROR (nm_setting_error_get_type ()) 
 </pre>
@@ -183,7 +199,7 @@ Describes errors that may result from operations involving a <a class="link" hre
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-ERROR:CAPS"></a><h3>NM_SETTING_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_ERROR nm_setting_error_quark ()
 </pre>
@@ -191,7 +207,7 @@ Describes errors that may result from operations involving a <a class="link" hre
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-error-quark"></a><h3>nm_setting_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_error_quark              (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -201,13 +217,12 @@ Registers an error quark for <a class="link" href="NMSetting.html" title="NMSett
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the error quark used for NMSetting errors.
-</td>
+<td>the error quark used for NMSetting errors.</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PARAM_SERIALIZE">
+<div class="refsect2">
 <a name="NM-SETTING-PARAM-SERIALIZE:CAPS"></a><h3>NM_SETTING_PARAM_SERIALIZE</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_SERIALIZE    (1 &lt;&lt; (0 + G_PARAM_USER_SHIFT))
 </pre>
@@ -215,7 +230,7 @@ Registers an error quark for <a class="link" href="NMSetting.html" title="NMSett
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PARAM_REQUIRED">
+<div class="refsect2">
 <a name="NM-SETTING-PARAM-REQUIRED:CAPS"></a><h3>NM_SETTING_PARAM_REQUIRED</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_REQUIRED     (1 &lt;&lt; (1 + G_PARAM_USER_SHIFT))
 </pre>
@@ -223,7 +238,7 @@ Registers an error quark for <a class="link" href="NMSetting.html" title="NMSett
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PARAM_SECRET">
+<div class="refsect2">
 <a name="NM-SETTING-PARAM-SECRET:CAPS"></a><h3>NM_SETTING_PARAM_SECRET</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_SECRET       (1 &lt;&lt; (2 + G_PARAM_USER_SHIFT))
 </pre>
@@ -231,7 +246,7 @@ Registers an error quark for <a class="link" href="NMSetting.html" title="NMSett
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PARAM_FUZZY_IGNORE">
+<div class="refsect2">
 <a name="NM-SETTING-PARAM-FUZZY-IGNORE:CAPS"></a><h3>NM_SETTING_PARAM_FUZZY_IGNORE</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_FUZZY_IGNORE (1 &lt;&lt; (3 + G_PARAM_USER_SHIFT))
 </pre>
@@ -239,7 +254,7 @@ Registers an error quark for <a class="link" href="NMSetting.html" title="NMSett
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-NAME:CAPS"></a><h3>NM_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_NAME "name"
 </pre>
@@ -247,7 +262,57 @@ Registers an error quark for <a class="link" href="NMSetting.html" title="NMSett
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSetting">
+<div class="refsect2">
+<a name="NMSettingSecretFlags"></a><h3>enum NMSettingSecretFlags</h3>
+<pre class="programlisting">typedef enum {
+	NM_SETTING_SECRET_FLAG_NONE         = 0x00000000,
+	NM_SETTING_SECRET_FLAG_AGENT_OWNED  = 0x00000001,
+	NM_SETTING_SECRET_FLAG_NOT_SAVED    = 0x00000002,
+	NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 0x00000004
+
+	/* NOTE: if adding flags, update nm-setting-private.h as well */
+} NMSettingSecretFlags;
+</pre>
+<p>
+These flags indicate specific behavior related to handling of a secret.  Each
+secret has a corresponding set of these flags which indicate how the secret
+is to be stored and/or requested when it is needed.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><a name="NM-SETTING-SECRET-FLAG-NONE:CAPS"></a><span class="term"><code class="literal">NM_SETTING_SECRET_FLAG_NONE</code></span></p></td>
+<td>the system is responsible for providing and
+storing this secret (default)
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS"></a><span class="term"><code class="literal">NM_SETTING_SECRET_FLAG_AGENT_OWNED</code></span></p></td>
+<td>a user secret agent is responsible
+for providing and storing this secret; when it is required agents will be
+asked to retrieve it
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS"></a><span class="term"><code class="literal">NM_SETTING_SECRET_FLAG_NOT_SAVED</code></span></p></td>
+<td>this secret should not be saved, but
+should be requested from the user each time it is needed
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS"></a><span class="term"><code class="literal">NM_SETTING_SECRET_FLAG_NOT_REQUIRED</code></span></p></td>
+<td>in situations where it cannot be
+automatically determined that the secret is required (some VPNs and PPP
+providers dont require all secrets) this flag indicates that the specific
+secret is not required
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSetting-struct"></a><h3>NMSetting</h3>
 <pre class="programlisting">typedef struct _NMSetting NMSetting;</pre>
 <p>
@@ -256,7 +321,7 @@ It should only be accessed through the functions described below.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingClass">
+<div class="refsect2">
 <a name="NMSettingClass"></a><h3>NMSettingClass</h3>
 <pre class="programlisting">typedef struct {
 	GObjectClass parent;
@@ -273,6 +338,18 @@ It should only be accessed through the functions described below.
 	                                  GValue     *value,
 	                                  GError    **error);
 
+	gboolean    (*get_secret_flags)  (NMSetting  *setting,
+	                                  const char *secret_name,
+	                                  gboolean verify_secret,
+	                                  NMSettingSecretFlags *out_flags,
+	                                  GError **error);
+
+	gboolean    (*set_secret_flags)  (NMSetting  *setting,
+	                                  const char *secret_name,
+	                                  gboolean verify_secret,
+	                                  NMSettingSecretFlags flags,
+	                                  GError **error);
+
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
 	void (*_reserved2) (void);
@@ -284,7 +361,7 @@ It should only be accessed through the functions described below.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingValueIterFn ()">
+<div class="refsect2">
 <a name="NMSettingValueIterFn"></a><h3>NMSettingValueIterFn ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                (*NMSettingValueIterFn)             (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
@@ -293,56 +370,53 @@ It should only be accessed through the functions described below.
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
 </p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-get-type"></a><h3>nm_setting_get_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_get_type                 (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingHashFlags"></a><h3>enum NMSettingHashFlags</h3>
+<pre class="programlisting">typedef enum {
+	NM_SETTING_HASH_FLAG_ALL = 0x00000000,
+	NM_SETTING_HASH_FLAG_NO_SECRETS = 0x00000001,
+	NM_SETTING_HASH_FLAG_ONLY_SECRETS = 0x00000002,
+} NMSettingHashFlags;
+</pre>
+<p>
+These flags determine which properties are added to the resulting hash
+when calling <a class="link" href="NMSetting.html#nm-setting-to-hash" title="nm_setting_to_hash ()"><code class="function">nm_setting_to_hash()</code></a>.
+</p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td><p><a name="NM-SETTING-HASH-FLAG-ALL:CAPS"></a><span class="term"><code class="literal">NM_SETTING_HASH_FLAG_ALL</code></span></p></td>
+<td>hash all properties (including secrets)
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
+<td><p><a name="NM-SETTING-HASH-FLAG-NO-SECRETS:CAPS"></a><span class="term"><code class="literal">NM_SETTING_HASH_FLAG_NO_SECRETS</code></span></p></td>
+<td>do not include secrets
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
+<td><p><a name="NM-SETTING-HASH-FLAG-ONLY-SECRETS:CAPS"></a><span class="term"><code class="literal">NM_SETTING_HASH_FLAG_ONLY_SECRETS</code></span></p></td>
+<td>only hash secrets
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_get_type ()">
-<a name="nm-setting-get-type"></a><h3>nm_setting_get_type ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_get_type                 (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_to_hash ()">
+<div class="refsect2">
 <a name="nm-setting-to-hash"></a><h3>nm_setting_to_hash ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        nm_setting_to_hash                  (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        nm_setting_to_hash                  (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingHashFlags" title="enum NMSettingHashFlags"><span class="type">NMSettingHashFlags</span></a> flags</code></em>);</pre>
 <p>
 Converts the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> into a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping each setting property
 name to a GValue describing that property, suitable for marshalling over
@@ -357,15 +431,20 @@ D-Bus or serializing.  The mapping is string:GValue.
 </td>
 </tr>
 <tr>
+<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
+<td>hash flags, e.g. <a class="link" href="NMSetting.html#NM-SETTING-HASH-FLAG-ALL:CAPS"><code class="literal">NM_SETTING_HASH_FLAG_ALL</code></a>
+</td>
+</tr>
+<tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> describing the setting's properties
+<td>a new <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> describing the setting's properties. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8 GObject.Value]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_new_from_hash ()">
+<div class="refsect2">
 <a name="nm-setting-new-from-hash"></a><h3>nm_setting_new_from_hash ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_new_from_hash            (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> setting_type</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);</pre>
@@ -382,26 +461,23 @@ property names and value types.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting_type</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> type which the hash contains properties for
-</td>
+<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> type which the hash contains properties for</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>hash</code></em> :</span></p></td>
 <td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> containing a string:GValue mapping of properties
-that apply to the setting
-</td>
+that apply to the setting</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object populated with the properties from the
-hash table, or NULL on failure
-</td>
+<td>a new <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object populated with the properties from the
+hash table, or NULL on failure</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_duplicate ()">
+<div class="refsect2">
 <a name="nm-setting-duplicate"></a><h3>nm_setting_duplicate ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_duplicate                (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
 <p>
@@ -412,20 +488,19 @@ Duplicates a <a class="link" href="NMSetting.html" title="NMSetting"><span class
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to duplicate
-</td>
+<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to duplicate</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> containing the same properties and values as the
-source <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>
+<td>a new <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> containing the same properties and values as the
+source <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_get_name ()">
+<div class="refsect2">
 <a name="nm-setting-get-name"></a><h3>nm_setting_get_name ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_get_name                 (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
 <p>
@@ -441,15 +516,14 @@ Returns the type name of the <a class="link" href="NMSetting.html" title="NMSett
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a string containing the type name of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object,
-like 'ppp' or 'wireless' or 'wired'.
-</td>
+<td>a string containing the type name of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object,
+like 'ppp' or 'wireless' or 'wired'.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_verify ()">
+<div class="refsect2">
 <a name="nm-setting-verify"></a><h3>nm_setting_verify ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_verify                   (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *all_settings</code></em>,
@@ -465,14 +539,12 @@ failed validation, and in what way that property failed validation.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to verify
-</td>
+<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to verify</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>all_settings</code></em> :</span></p></td>
 <td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of all settings in the connection from which <em class="parameter"><code>setting</code></em>
-came
-</td>
+came</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
@@ -481,14 +553,14 @@ came
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the setting is valid, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the setting is valid, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingCompareFlags">
+<div class="refsect2">
 <a name="NMSettingCompareFlags"></a><h3>enum NMSettingCompareFlags</h3>
 <pre class="programlisting">typedef enum {
 	NM_SETTING_COMPARE_FLAG_EXACT = 0x00000000,
@@ -530,7 +602,7 @@ two connections.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_compare ()">
+<div class="refsect2">
 <a name="nm-setting-compare"></a><h3>nm_setting_compare ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_compare                  (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *a</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *b</code></em>,
@@ -550,8 +622,7 @@ for a description of each flag's behavior.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td>
-<td>a second <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to compare with the first
-</td>
+<td>a second <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to compare with the first</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
@@ -560,14 +631,14 @@ for a description of each flag's behavior.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the comparison succeeds, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it does not
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the comparison succeeds, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it does not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingDiffResult">
+<div class="refsect2">
 <a name="NMSettingDiffResult"></a><h3>enum NMSettingDiffResult</h3>
 <pre class="programlisting">typedef enum {
 	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
@@ -600,7 +671,7 @@ These values indicate the result of a setting difference operation.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_diff ()">
+<div class="refsect2">
 <a name="nm-setting-diff"></a><h3>nm_setting_diff ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_diff                     (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *a</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *b</code></em>,
@@ -624,8 +695,7 @@ one or more <a class="link" href="NMSetting.html#NMSettingDiffResult" title="enu
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td>
-<td>a second <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to compare with the first
-</td>
+<td>a second <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to compare with the first</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
@@ -635,12 +705,11 @@ one or more <a class="link" href="NMSetting.html#NMSettingDiffResult" title="enu
 <tr>
 <td><p><span class="term"><em class="parameter"><code>invert_results</code></em> :</span></p></td>
 <td>this parameter is used internally by libnm-util and should
-be set to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.  If <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> inverts the meaning of the <a class="link" href="NMSetting.html#NMSettingDiffResult" title="enum NMSettingDiffResult"><span class="type">NMSettingDiffResult</span></a>.
-</td>
+be set to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.  If <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> inverts the meaning of the <a class="link" href="NMSetting.html#NMSettingDiffResult" title="enum NMSettingDiffResult"><span class="type">NMSettingDiffResult</span></a>.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>results</code></em> :</span></p></td>
-<td> if the settings differ, on return a
+<td>if the settings differ, on return a
 hash table mapping the differing keys to one or more <a class="link" href="NMSetting.html#NMSettingDiffResult" title="enum NMSettingDiffResult"><span class="type">NMSettingDiffResult</span></a>
 values OR-ed together.  If the settings do not differ, any hash table passed
 in is unmodified.  If no hash table is passed in, a new one is created. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8 guint32]</span>
@@ -648,14 +717,14 @@ in is unmodified.  If no hash table is passed in, a new one is created. <span cl
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the settings contain the same values, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the settings contain the same values, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_enumerate_values ()">
+<div class="refsect2">
 <a name="nm-setting-enumerate-values"></a><h3>nm_setting_enumerate_values ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_enumerate_values         (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingValueIterFn" title="NMSettingValueIterFn ()"><span class="type">NMSettingValueIterFn</span></a> func</code></em>,
@@ -674,19 +743,18 @@ user function for each property.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>func</code></em> :</span></p></td>
-<td>user-supplied function called for each property of the setting
+<td>user-supplied function called for each property of the setting. <span class="annotation">[<acronym title="The callback is valid only during the call to the method."><span class="acronym">scope call</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data passed to <em class="parameter"><code>func</code></em> at each invocation
-</td>
+<td>user data passed to <em class="parameter"><code>func</code></em> at each invocation</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_to_string ()">
+<div class="refsect2">
 <a name="nm-setting-to-string"></a><h3>nm_setting_to_string ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *              nm_setting_to_string                (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
 <p>
@@ -704,7 +772,7 @@ output format is not guaranteed to be stable and may change at any time.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> an allocated string containing a textual representation of the
+<td>an allocated string containing a textual representation of the
 setting's properties and values (including secrets!), which the caller should
 free with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>
 </td>
@@ -713,7 +781,7 @@ free with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allo
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_clear_secrets ()">
+<div class="refsect2">
 <a name="nm-setting-clear-secrets"></a><h3>nm_setting_clear_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_clear_secrets            (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
 <p>
@@ -731,7 +799,7 @@ leakage of information.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_need_secrets ()">
+<div class="refsect2">
 <a name="nm-setting-need-secrets"></a><h3>nm_setting_need_secrets ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *         nm_setting_need_secrets             (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
 <p>
@@ -750,17 +818,17 @@ is no way to conclusively determine exactly which secrets are needed.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the property names of secrets of the
+<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the property names of secrets of the
 <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> which may be required; the caller owns the array
 and must free the each array element with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>, as well as the array
-itself with <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-free"><code class="function">g_ptr_array_free()</code></a>
+itself with <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-free"><code class="function">g_ptr_array_free()</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_update_secrets ()">
+<div class="refsect2">
 <a name="nm-setting-update-secrets"></a><h3>nm_setting_update_secrets ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_update_secrets           (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *secrets</code></em>,
@@ -780,27 +848,106 @@ setting (deserialized from D-Bus for example).
 <tr>
 <td><p><span class="term"><em class="parameter"><code>secrets</code></em> :</span></p></td>
 <td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping string:<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> of setting property names and
-secrets
+secrets</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>location to store error, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the secrets were successfully updated and the connection
+is valid, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure or if the setting was never added to the connection</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-get-secret-flags"></a><h3>nm_setting_get_secret_flags ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_get_secret_flags         (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *secret_name</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> *out_flags</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>
+For a given secret, retrieves the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> describing how to
+handle that secret.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>secret_name</code></em> :</span></p></td>
+<td>the secret key name to get flags for</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_flags</code></em> :</span></p></td>
+<td>on success, the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> for the secret</td>
+</tr>
+<tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
 <td>location to store error, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the secrets were successfully updated and the connection
-is valid, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure or if the setting was never added to the connection
+<td>TRUE on success (if the given secret name was a valid property of
+this setting, and if that property is secret), FALSE if not</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-set-secret-flags"></a><h3>nm_setting_set_secret_flags ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_set_secret_flags         (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *secret_name</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>
+For a given secret, retrieves the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> describing how to
+handle that secret.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>secret_name</code></em> :</span></p></td>
+<td>the secret key name to set flags for</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> for the secret</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>location to store error, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>TRUE on success (if the given secret name was a valid property of
+this setting, and if that property is secret), FALSE if not</td>
+</tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSetting.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "name" property'>
+<div class="refsect2">
 <a name="NMSetting--name"></a><h3>The <code class="literal">"name"</code> property</h3>
 <pre class="programlisting">  "name"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -814,6 +961,6 @@ example 'ppp' or 'wireless' or 'wired'.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index aec1b96e..8ef172c1 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
 <link rel="next" href="NMSettingIP4Config.html" title="NMSettingIP4Config">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSetting8021x.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSetting8021x">
+<div class="refentry">
 <a name="NMSetting8021x"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,15 +39,15 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSetting8021x.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
+<a name="NMSetting8021xError"></a><pre class="synopsis">
 #include &lt;nm-setting-8021x.h&gt;
 
 enum                <a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat">NMSetting8021xCKFormat</a>;
 enum                <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme">NMSetting8021xCKScheme</a>;
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-SETTING-NAME:CAPS" title="NM_SETTING_802_1X_SETTING_NAME">NM_SETTING_802_1X_SETTING_NAME</a>
-enum                <a class="link" href="NMSetting8021x.html#NMSetting8021xError" title="enum NMSetting8021xError">NMSetting8021xError</a>;
+enum                <a class="link" href="NMSetting8021x.html#NMSetting8021xError">NMSetting8021xError</a>;
 #define             <a class="link" href="NMSetting8021x.html#NM-TYPE-SETTING-802-1X-ERROR:CAPS" title="NM_TYPE_SETTING_802_1X_ERROR">NM_TYPE_SETTING_802_1X_ERROR</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-ERROR:CAPS" title="NM_SETTING_802_1X_ERROR">NM_SETTING_802_1X_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-error-quark" title="nm_setting_802_1x_error_quark ()">nm_setting_802_1x_error_quark</a>       (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -66,12 +66,15 @@ enum                <a class="link" href="NMSetting8021x.html#NMSetting8021xErro
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS" title="NM_SETTING_802_1X_PHASE2_CA_PATH">NM_SETTING_802_1X_PHASE2_CA_PATH</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS" title="NM_SETTING_802_1X_PHASE2_CLIENT_CERT">NM_SETTING_802_1X_PHASE2_CLIENT_CERT</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD:CAPS" title="NM_SETTING_802_1X_PASSWORD">NM_SETTING_802_1X_PASSWORD</a>
+#define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PASSWORD_FLAGS">NM_SETTING_802_1X_PASSWORD_FLAGS</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY:CAPS" title="NM_SETTING_802_1X_PRIVATE_KEY">NM_SETTING_802_1X_PRIVATE_KEY</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS" title="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD">NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD</a>
+#define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS">NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY">NM_SETTING_802_1X_PHASE2_PRIVATE_KEY</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD">NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD</a>
+#define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS">NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PIN:CAPS" title="NM_SETTING_802_1X_PIN">NM_SETTING_802_1X_PIN</a>
-#define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PSK:CAPS" title="NM_SETTING_802_1X_PSK">NM_SETTING_802_1X_PSK</a>
+#define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PIN-FLAGS:CAPS" title="NM_SETTING_802_1X_PIN_FLAGS">NM_SETTING_802_1X_PIN_FLAGS</a>
 #define             <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS" title="NM_SETTING_802_1X_SYSTEM_CA_CERTS">NM_SETTING_802_1X_SYSTEM_CA_CERTS</a>
                     <a class="link" href="NMSetting8021x.html#NMSetting8021x-struct" title="NMSetting8021x">NMSetting8021x</a>;
                     <a class="link" href="NMSetting8021x.html#NMSetting8021xClass" title="NMSetting8021xClass">NMSetting8021xClass</a>;
@@ -96,8 +99,10 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-scheme" title="nm_setting_802_1x_get_ca_cert_scheme ()">nm_setting_802_1x_get_ca_cert_scheme</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()">nm_setting_802_1x_get_ca_cert_blob</a>  (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()">nm_setting_802_1x_get_ca_cert_path</a>  (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()">nm_setting_802_1x_get_ca_cert_blob</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()">nm_setting_802_1x_get_ca_cert_path</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert" title="nm_setting_802_1x_set_ca_cert ()">nm_setting_802_1x_set_ca_cert</a>       (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
@@ -105,9 +110,9 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-scheme" title="nm_setting_802_1x_get_client_cert_scheme ()">nm_setting_802_1x_get_client_cert_scheme</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()">nm_setting_802_1x_get_client_cert_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()">nm_setting_802_1x_get_client_cert_blob</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()">nm_setting_802_1x_get_client_cert_path</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()">nm_setting_802_1x_get_client_cert_path</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert" title="nm_setting_802_1x_set_client_cert ()">nm_setting_802_1x_set_client_cert</a>   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
@@ -125,9 +130,9 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-scheme" title="nm_setting_802_1x_get_phase2_ca_cert_scheme ()">nm_setting_802_1x_get_phase2_ca_cert_scheme</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-blob" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()">nm_setting_802_1x_get_phase2_ca_cert_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-blob" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()">nm_setting_802_1x_get_phase2_ca_cert_blob</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-path" title="nm_setting_802_1x_get_phase2_ca_cert_path ()">nm_setting_802_1x_get_phase2_ca_cert_path</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-path" title="nm_setting_802_1x_get_phase2_ca_cert_path ()">nm_setting_802_1x_get_phase2_ca_cert_path</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert" title="nm_setting_802_1x_set_phase2_ca_cert ()">nm_setting_802_1x_set_phase2_ca_cert</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -137,9 +142,9 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-scheme" title="nm_setting_802_1x_get_phase2_client_cert_scheme ()">nm_setting_802_1x_get_phase2_client_cert_scheme</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-blob" title="nm_setting_802_1x_get_phase2_client_cert_blob ()">nm_setting_802_1x_get_phase2_client_cert_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-blob" title="nm_setting_802_1x_get_phase2_client_cert_blob ()">nm_setting_802_1x_get_phase2_client_cert_blob</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-path" title="nm_setting_802_1x_get_phase2_client_cert_path ()">nm_setting_802_1x_get_phase2_client_cert_path</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-path" title="nm_setting_802_1x_get_phase2_client_cert_path ()">nm_setting_802_1x_get_phase2_client_cert_path</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert" title="nm_setting_802_1x_set_phase2_client_cert ()">nm_setting_802_1x_set_phase2_client_cert</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -148,13 +153,15 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-password" title="nm_setting_802_1x_get_password ()">nm_setting_802_1x_get_password</a>      (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-password-flags" title="nm_setting_802_1x_get_password_flags ()">nm_setting_802_1x_get_password_flags</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-pin" title="nm_setting_802_1x_get_pin ()">nm_setting_802_1x_get_pin</a>           (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-psk" title="nm_setting_802_1x_get_psk ()">nm_setting_802_1x_get_psk</a>           (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-pin-flags" title="nm_setting_802_1x_get_pin_flags ()">nm_setting_802_1x_get_pin_flags</a>   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-scheme" title="nm_setting_802_1x_get_private_key_scheme ()">nm_setting_802_1x_get_private_key_scheme</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob" title="nm_setting_802_1x_get_private_key_blob ()">nm_setting_802_1x_get_private_key_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob" title="nm_setting_802_1x_get_private_key_blob ()">nm_setting_802_1x_get_private_key_blob</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path" title="nm_setting_802_1x_get_private_key_path ()">nm_setting_802_1x_get_private_key_path</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path" title="nm_setting_802_1x_get_private_key_path ()">nm_setting_802_1x_get_private_key_path</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()">nm_setting_802_1x_set_private_key</a>   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
@@ -162,15 +169,17 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password" title="nm_setting_802_1x_get_private_key_password ()">nm_setting_802_1x_get_private_key_password</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password" title="nm_setting_802_1x_get_private_key_password ()">nm_setting_802_1x_get_private_key_password</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password-flags" title="nm_setting_802_1x_get_private_key_password_flags ()">nm_setting_802_1x_get_private_key_password_flags</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-format" title="nm_setting_802_1x_get_private_key_format ()">nm_setting_802_1x_get_private_key_format</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-scheme" title="nm_setting_802_1x_get_phase2_private_key_scheme ()">nm_setting_802_1x_get_phase2_private_key_scheme</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob" title="nm_setting_802_1x_get_phase2_private_key_blob ()">nm_setting_802_1x_get_phase2_private_key_blob</a>
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob" title="nm_setting_802_1x_get_phase2_private_key_blob ()">nm_setting_802_1x_get_phase2_private_key_blob</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path" title="nm_setting_802_1x_get_phase2_private_key_path ()">nm_setting_802_1x_get_phase2_private_key_path</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path" title="nm_setting_802_1x_get_phase2_private_key_path ()">nm_setting_802_1x_get_phase2_private_key_path</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()">nm_setting_802_1x_set_phase2_private_key</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -179,67 +188,27 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password" title="nm_setting_802_1x_get_phase2_private_key_password ()">nm_setting_802_1x_get_phase2_private_key_password</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format" title="nm_setting_802_1x_get_phase2_private_key_format ()">nm_setting_802_1x_get_phase2_private_key_format</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-enum                <a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType">NMSetting8021xCKType</a>;
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert" title="nm_setting_802_1x_get_ca_cert ()">nm_setting_802_1x_get_ca_cert</a>       (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert-from-file" title="nm_setting_802_1x_set_ca_cert_from_file ()">nm_setting_802_1x_set_ca_cert_from_file</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert" title="nm_setting_802_1x_get_client_cert ()">nm_setting_802_1x_get_client_cert</a>   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert-from-file" title="nm_setting_802_1x_set_client_cert_from_file ()">nm_setting_802_1x_set_client_cert_from_file</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert" title="nm_setting_802_1x_get_phase2_ca_cert ()">nm_setting_802_1x_get_phase2_ca_cert</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert-from-file" title="nm_setting_802_1x_set_phase2_ca_cert_from_file ()">nm_setting_802_1x_set_phase2_ca_cert_from_file</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert" title="nm_setting_802_1x_get_phase2_client_cert ()">nm_setting_802_1x_get_phase2_client_cert</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert-from-file" title="nm_setting_802_1x_set_phase2_client_cert_from_file ()">nm_setting_802_1x_set_phase2_client_cert_from_file</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key" title="nm_setting_802_1x_get_private_key ()">nm_setting_802_1x_get_private_key</a>   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file" title="nm_setting_802_1x_set_private_key_from_file ()">nm_setting_802_1x_set_private_key_from_file</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="returnvalue">NMSetting8021xCKType</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-type" title="nm_setting_802_1x_get_private_key_type ()">nm_setting_802_1x_get_private_key_type</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password" title="nm_setting_802_1x_get_phase2_private_key_password ()">nm_setting_802_1x_get_phase2_private_key_password</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key" title="nm_setting_802_1x_get_phase2_private_key ()">nm_setting_802_1x_get_phase2_private_key</a>
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password-flags" title="nm_setting_802_1x_get_phase2_private_key_password_flags ()">nm_setting_802_1x_get_phase2_private_key_password_flags</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file" title="nm_setting_802_1x_set_phase2_private_key_from_file ()">nm_setting_802_1x_set_phase2_private_key_from_file</a>
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="returnvalue">NMSetting8021xCKType</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-type" title="nm_setting_802_1x_get_phase2_private_key_type ()">nm_setting_802_1x_get_phase2_private_key_type</a>
+<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format" title="nm_setting_802_1x_get_phase2_private_key_format ()">nm_setting_802_1x_get_phase2_private_key_format</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSetting8021x.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSetting8021xError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSetting8021x
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSetting8021x.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--anonymous-identity" title='The "anonymous-identity" property'>anonymous-identity</a>"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
@@ -249,6 +218,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title='The "eap" property'>eap</a>"                      <span class="type">GSList_gchararray_</span>*   : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--identity" title='The "identity" property'>identity</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'>password</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSetting8021x.html#NMSetting8021x--password-flags" title='The "password-flags" property'>password-flags</a>"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning" title='The "phase1-fast-provisioning" property'>phase1-fast-provisioning</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel" title='The "phase1-peaplabel" property'>phase1-peaplabel</a>"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peapver" title='The "phase1-peapver" property'>phase1-peapver</a>"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
@@ -259,12 +229,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-client-cert" title='The "phase2-client-cert" property'>phase2-client-cert</a>"       <span class="type">GArray_guchar_</span>*       : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'>phase2-private-key</a>"       <span class="type">GArray_guchar_</span>*       : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'>phase2-private-key-password</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password-flags" title='The "phase2-private-key-password-flags" property'>phase2-private-key-password-flags</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'>private-key</a>"              <span class="type">GArray_guchar_</span>*       : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'>private-key-password</a>"     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password-flags" title='The "private-key-password-flags" property'>private-key-password-flags</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSetting8021x.html#NMSetting8021x--system-ca-certs" title='The "system-ca-certs" property'>system-ca-certs</a>"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSetting8021x.description"></a><h2>Description</h2>
 <p>
 The <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes
@@ -295,9 +267,9 @@ following books.
       ISBN: 978-1587051548
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSetting8021x.details"></a><h2>Details</h2>
-<div class="refsect2" title="enum NMSetting8021xCKFormat">
+<div class="refsect2">
 <a name="NMSetting8021xCKFormat"></a><h3>enum NMSetting8021xCKFormat</h3>
 <pre class="programlisting">typedef enum {
 	NM_SETTING_802_1X_CK_FORMAT_UNKNOWN = 0,
@@ -307,10 +279,39 @@ following books.
 } NMSetting8021xCKFormat;
 </pre>
 <p>
+<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> values indicate the general type of a certificate
+or private key
 </p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_FORMAT_UNKNOWN</code></span></p></td>
+<td>unknown file format
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-FORMAT-X509:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_FORMAT_X509</code></span></p></td>
+<td>file contains an X.509 format certificate
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_FORMAT_RAW_KEY</code></span></p></td>
+<td>file contains an old-style OpenSSL PEM
+or DER private key
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_FORMAT_PKCS12</code></span></p></td>
+<td>file contains a PKCS<span class="type">12</span> certificate
+and private key
+</td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSetting8021xCKScheme">
+<div class="refsect2">
 <a name="NMSetting8021xCKScheme"></a><h3>enum NMSetting8021xCKScheme</h3>
 <pre class="programlisting">typedef enum {
 	NM_SETTING_802_1X_CK_SCHEME_UNKNOWN = 0,
@@ -319,10 +320,36 @@ following books.
 } NMSetting8021xCKScheme;
 </pre>
 <p>
+<a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> values indicate how a certificate or private key is
+stored in the setting properties, either as a blob of the item's data, or as
+a path to a certificate or private key file on the filesystem
 </p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_UNKNOWN</code></span></p></td>
+<td>unknown certificate or private key
+scheme
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></span></p></td>
+<td>certificate or key is stored as the raw
+item data
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"></a><span class="term"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></span></p></td>
+<td>certificate or key is stored as a path
+to a file containing the certificate or key data
+</td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-SETTING-NAME:CAPS"></a><h3>NM_SETTING_802_1X_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
 </pre>
@@ -330,7 +357,7 @@ following books.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSetting8021xError">
+<div class="refsect2">
 <a name="NMSetting8021xError"></a><h3>enum NMSetting8021xError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -343,7 +370,7 @@ following books.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_802_1X_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-802-1X-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_802_1X_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_802_1X_ERROR (nm_setting_802_1x_error_get_type ()) 
 </pre>
@@ -351,7 +378,7 @@ following books.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-ERROR:CAPS"></a><h3>NM_SETTING_802_1X_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
 </pre>
@@ -359,7 +386,7 @@ following books.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-error-quark"></a><h3>nm_setting_802_1x_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_802_1x_error_quark       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -369,13 +396,12 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the error quark used for <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> errors.
-</td>
+<td>the error quark used for <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> errors.</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_EAP">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-EAP:CAPS"></a><h3>NM_SETTING_802_1X_EAP</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_EAP "eap"
 </pre>
@@ -383,7 +409,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_IDENTITY">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-IDENTITY:CAPS"></a><h3>NM_SETTING_802_1X_IDENTITY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_IDENTITY "identity"
 </pre>
@@ -391,7 +417,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_ANONYMOUS_IDENTITY">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-ANONYMOUS-IDENTITY:CAPS"></a><h3>NM_SETTING_802_1X_ANONYMOUS_IDENTITY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
 </pre>
@@ -399,7 +425,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_CA_CERT">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-CA-CERT:CAPS"></a><h3>NM_SETTING_802_1X_CA_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_CA_CERT "ca-cert"
 </pre>
@@ -407,7 +433,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_CA_PATH">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-CA-PATH:CAPS"></a><h3>NM_SETTING_802_1X_CA_PATH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_CA_PATH "ca-path"
 </pre>
@@ -415,7 +441,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_CLIENT_CERT">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-CLIENT-CERT:CAPS"></a><h3>NM_SETTING_802_1X_CLIENT_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
 </pre>
@@ -423,7 +449,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE1_PEAPVER">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE1-PEAPVER:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_PEAPVER</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
 </pre>
@@ -431,7 +457,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE1_PEAPLABEL">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE1-PEAPLABEL:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_PEAPLABEL</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
 </pre>
@@ -439,7 +465,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE1-FAST-PROVISIONING:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
 </pre>
@@ -447,7 +473,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_AUTH">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-AUTH:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_AUTH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
 </pre>
@@ -455,7 +481,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_AUTHEAP">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-AUTHEAP:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_AUTHEAP</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
 </pre>
@@ -463,7 +489,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_CA_CERT">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-CA-CERT:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CA_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
 </pre>
@@ -471,7 +497,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_CA_PATH">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CA_PATH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
 </pre>
@@ -479,7 +505,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_CLIENT_CERT">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CLIENT_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
 </pre>
@@ -487,7 +513,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PASSWORD">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD "password"
 </pre>
@@ -495,7 +521,15 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PRIVATE_KEY">
+<div class="refsect2">
+<a name="NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PRIVATE-KEY:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
 </pre>
@@ -503,7 +537,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
 </pre>
@@ -511,7 +545,15 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY">
+<div class="refsect2">
+<a name="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
 </pre>
@@ -519,7 +561,7 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
 </pre>
@@ -527,7 +569,15 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PIN">
+<div class="refsect2">
+<a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-PIN:CAPS"></a><h3>NM_SETTING_802_1X_PIN</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PIN "pin"
 </pre>
@@ -535,15 +585,15 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_PSK">
-<a name="NM-SETTING-802-1X-PSK:CAPS"></a><h3>NM_SETTING_802_1X_PSK</h3>
-<pre class="programlisting">#define NM_SETTING_802_1X_PSK "psk"
+<div class="refsect2">
+<a name="NM-SETTING-802-1X-PIN-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PIN_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_802_1X_SYSTEM_CA_CERTS">
+<div class="refsect2">
 <a name="NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS"></a><h3>NM_SETTING_802_1X_SYSTEM_CA_CERTS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
 </pre>
@@ -551,14 +601,14 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSetting8021x">
+<div class="refsect2">
 <a name="NMSetting8021x-struct"></a><h3>NMSetting8021x</h3>
 <pre class="programlisting">typedef struct _NMSetting8021x NMSetting8021x;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSetting8021xClass">
+<div class="refsect2">
 <a name="NMSetting8021xClass"></a><h3>NMSetting8021xClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -574,22 +624,14 @@ Registers an error quark for <a class="link" href="NMSetting8021x.html" title="N
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-type"></a><h3>nm_setting_802_1x_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_802_1x_get_type          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_new ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-new"></a><h3>nm_setting_802_1x_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_802_1x_new               (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -599,13 +641,12 @@ Creates a new <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new empty <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> object
-</td>
+<td>the new empty <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> object</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_num_eap_methods ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-num-eap-methods"></a><h3>nm_setting_802_1x_get_num_eap_methods ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_802_1x_get_num_eap_methods
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -626,14 +667,13 @@ allowed EAP methods.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the number of allowed EAP methods
-</td>
+<td>the number of allowed EAP methods</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_eap_method ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-eap-method"></a><h3>nm_setting_802_1x_get_eap_method ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_eap_method    (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
@@ -650,19 +690,18 @@ Returns the name of the allowed EAP method at index <em class="parameter"><code>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>the index of the EAP method name to return
-</td>
+<td>the index of the EAP method name to return</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the name of the allowed EAP method at index <em class="parameter"><code>i</code></em>
+<td>the name of the allowed EAP method at index <em class="parameter"><code>i</code></em>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_add_eap_method ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-add-eap-method"></a><h3>nm_setting_802_1x_add_eap_method ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_add_eap_method    (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *eap</code></em>);</pre>
@@ -681,20 +720,18 @@ allowed EAP methods.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>eap</code></em> :</span></p></td>
-<td>the name of the EAP method to allow for this connection
-</td>
+<td>the name of the EAP method to allow for this connection</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the EAP method was successfully added, FALSE if it was
- not a valid method or if it was already allowed.
-</td>
+<td>TRUE if the EAP method was successfully added, FALSE if it was
+not a valid method or if it was already allowed.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_remove_eap_method ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-remove-eap-method"></a><h3>nm_setting_802_1x_remove_eap_method ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_802_1x_remove_eap_method (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
@@ -711,14 +748,13 @@ Removes the allowed EAP method at the specified index.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>the index of the EAP method to remove
-</td>
+<td>the index of the EAP method to remove</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_clear_eap_methods ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-clear-eap-methods"></a><h3>nm_setting_802_1x_clear_eap_methods ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_802_1x_clear_eap_methods (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
@@ -734,7 +770,7 @@ Clears all allowed EAP methods.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_identity ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-identity"></a><h3>nm_setting_802_1x_get_identity ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_identity      (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
@@ -751,14 +787,13 @@ authenticate the user.  Often this is a username or login name.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the user identifier
-</td>
+<td>the user identifier</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_anonymous_identity ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-anonymous-identity"></a><h3>nm_setting_802_1x_get_anonymous_identity ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_anonymous_identity
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -778,14 +813,13 @@ a secure form, if applicable for that EAP method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the anonymous identifier
-</td>
+<td>the anonymous identifier</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_system_ca_certs ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-system-ca-certs"></a><h3>nm_setting_802_1x_get_system_ca_certs ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_get_system_ca_certs
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -807,14 +841,13 @@ of these properties.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if a system CA certificate path should be used, FALSE if not
-</td>
+<td>TRUE if a system CA certificate path should be used, FALSE if not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_ca_path ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-ca-path"></a><h3>nm_setting_802_1x_get_ca_path ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_ca_path       (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
@@ -834,14 +867,13 @@ certificates for verifying the network to client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the CA certificate directory path
-</td>
+<td>the CA certificate directory path</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_path ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-ca-path"></a><h3>nm_setting_802_1x_get_phase2_ca_path ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_ca_path
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -862,21 +894,20 @@ to add more CA certificates for verifying the network to client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" CA certificate directory path
-</td>
+<td>the "phase 2" CA certificate directory path</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_ca_cert_scheme ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-ca-cert-scheme"></a><h3>nm_setting_802_1x_get_ca_cert_scheme ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_ca_cert_scheme
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the scheme used to store the CA certificate.  If the returned scheme
-is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>;
-if <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()"><code class="function">nm_setting_802_1x_get_ca_cert_path()</code></a>.
+is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>;
+if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()"><code class="function">nm_setting_802_1x_get_ca_cert_path()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -888,19 +919,19 @@ if <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use <a class="
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> scheme used to store the CA certificate (blob or path)
-</td>
+<td>scheme used to store the CA certificate (blob or path)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_ca_cert_blob ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-ca-cert-blob"></a><h3>nm_setting_802_1x_get_ca_cert_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_ca_cert_blob  (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      nm_setting_802_1x_get_ca_cert_blob
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the CA certificate blob if the CA certificate is stored using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.  Not all EAP methods use a
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme.  Not all EAP methods use a
 CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -916,19 +947,19 @@ of the network cannot be confirmed by the client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the CA certificate data
-</td>
+<td>the CA certificate data</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_ca_cert_path ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-ca-cert-path"></a><h3>nm_setting_802_1x_get_ca_cert_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_ca_cert_path  (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_ca_cert_path
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the CA certificate path if the CA certificate is stored using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.  Not all EAP methods use a
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.  Not all EAP methods use a
 CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -944,14 +975,13 @@ of the network cannot be confirmed by the client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> path to the CA certificate file
-</td>
+<td>path to the CA certificate file</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_ca_cert ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-set-ca-cert"></a><h3>nm_setting_802_1x_set_ca_cert ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_ca_cert       (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
@@ -960,9 +990,9 @@ of the network cannot be confirmed by the client.
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--ca-cert" title='The "ca-cert" property'><span class="type">"ca-cert"</span></a> property
-with the raw certificate data if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>
+with the raw certificate data if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>
 scheme, or with the path to the certificate file if using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -974,45 +1004,40 @@ scheme, or with the path to the certificate file if using the
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the CA certificate file
-  (PEM or DER format).  The path must be UTF-8 encoded; use
-  <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
-  clears the CA certificate.
-</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the CA certificate file
+(PEM or DER format).  The path must be UTF-8 encoded; use
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
+clears the CA certificate.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the certificate
-</td>
+<td>desired storage scheme for the certificate</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
+<td>on successful return, the type of the certificate added</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
+<td>on unsuccessful return, an error</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_client_cert_scheme ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-client-cert-scheme"></a><h3>nm_setting_802_1x_get_client_cert_scheme ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_client_cert_scheme
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the scheme used to store the client certificate.  If the returned scheme
-is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>;
-if <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
+is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>;
+if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -1024,16 +1049,15 @@ if <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use <a class="
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> scheme used to store the client certificate (blob or path)
-</td>
+<td>scheme used to store the client certificate (blob or path)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_client_cert_blob ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-client-cert-blob"></a><h3>nm_setting_802_1x_get_client_cert_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_client_cert_blob
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      nm_setting_802_1x_get_client_cert_blob
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Client certificates are used to identify the connecting client to the network
@@ -1050,16 +1074,15 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the client certificate data
-</td>
+<td>the client certificate data</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_client_cert_path ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-client-cert-path"></a><h3>nm_setting_802_1x_get_client_cert_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_client_cert_path
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_client_cert_path
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Client certificates are used to identify the connecting client to the network
@@ -1076,14 +1099,13 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> path to the client certificate file
-</td>
+<td>path to the client certificate file</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_client_cert ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-set-client-cert"></a><h3>nm_setting_802_1x_set_client_cert ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_client_cert   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
@@ -1093,8 +1115,8 @@ authentication method.
 <p>
 Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--client-cert" title='The "client-cert" property'><span class="type">"client-cert"</span></a>
 property with the raw certificate data if using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the certificate
-file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the certificate
+file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
 </p>
 <p>
 Client certificates are used to identify the connecting client to the network
@@ -1111,38 +1133,33 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the client certificate
-  file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded; use
-  <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
-  clears the client certificate.
-</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the client certificate
+file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded; use
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
+clears the client certificate.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the certificate
-</td>
+<td>desired storage scheme for the certificate</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
+<td>on successful return, the type of the certificate added</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
+<td>on unsuccessful return, an error</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase1_peapver ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase1-peapver"></a><h3>nm_setting_802_1x_get_phase1_peapver ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase1_peapver
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -1156,16 +1173,15 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 1" PEAP version to be used when authenticating with
- EAP-PEAP as contained in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peapver" title='The "phase1-peapver" property'><span class="type">"phase1-peapver"</span></a> property.  Valid
- values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
-</td>
+<td>the "phase 1" PEAP version to be used when authenticating with
+EAP-PEAP as contained in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peapver" title='The "phase1-peapver" property'><span class="type">"phase1-peapver"</span></a> property.  Valid
+values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase1_peaplabel ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase1-peaplabel"></a><h3>nm_setting_802_1x_get_phase1_peaplabel ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase1_peaplabel
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -1179,18 +1195,17 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> whether the "phase 1" PEAP label is new-style or old-style, to be
- used when authenticating with EAP-PEAP, as contained in the
- <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel" title='The "phase1-peaplabel" property'><span class="type">"phase1-peaplabel"</span></a> property.  Valid values are NULL (unset),
- "0" (use old-style label), and "1" (use new-style label).  See the
- wpa_supplicant documentation for more details.
-</td>
+<td>whether the "phase 1" PEAP label is new-style or old-style, to be
+used when authenticating with EAP-PEAP, as contained in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel" title='The "phase1-peaplabel" property'><span class="type">"phase1-peaplabel"</span></a> property.  Valid values are NULL (unset),
+"0" (use old-style label), and "1" (use new-style label).  See the
+wpa_supplicant documentation for more details.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase1_fast_provisioning ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase1-fast-provisioning"></a><h3>nm_setting_802_1x_get_phase1_fast_provisioning ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase1_fast_provisioning
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -1204,16 +1219,15 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> whether "phase 1" PEAP fast provisioning should be used, as specified
- by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning" title='The "phase1-fast-provisioning" property'><span class="type">"phase1-fast-provisioning"</span></a> property.  See the
- wpa_supplicant documentation for more details.
-</td>
+<td>whether "phase 1" PEAP fast provisioning should be used, as specified
+by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning" title='The "phase1-fast-provisioning" property'><span class="type">"phase1-fast-provisioning"</span></a> property.  See the
+wpa_supplicant documentation for more details.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_auth ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-auth"></a><h3>nm_setting_802_1x_get_phase2_auth ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_auth   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -1226,15 +1240,14 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" non-EAP (ex MD5) allowed authentication method as
-  specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title='The "phase2-auth" property'><span class="type">"phase2-auth"</span></a> property.
-</td>
+<td>the "phase 2" non-EAP (ex MD5) allowed authentication method as
+specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title='The "phase2-auth" property'><span class="type">"phase2-auth"</span></a> property.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_autheap ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-autheap"></a><h3>nm_setting_802_1x_get_phase2_autheap ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_autheap
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
@@ -1248,22 +1261,21 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" EAP-based (ex TLS) allowed authentication method as
-  specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title='The "phase2-autheap" property'><span class="type">"phase2-autheap"</span></a> property.
-</td>
+<td>the "phase 2" EAP-based (ex TLS) allowed authentication method as
+specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title='The "phase2-autheap" property'><span class="type">"phase2-autheap"</span></a> property.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_cert_scheme ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-ca-cert-scheme"></a><h3>nm_setting_802_1x_get_phase2_ca_cert_scheme ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the scheme used to store the "phase 2" CA certificate.  If the
-returned scheme is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>; if <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>,
+returned scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>; if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>,
 use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path" title="nm_setting_802_1x_get_ca_cert_path ()"><code class="function">nm_setting_802_1x_get_ca_cert_path()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
@@ -1276,20 +1288,19 @@ use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> scheme used to store the "phase 2" CA certificate (blob or path)
-</td>
+<td>scheme used to store the "phase 2" CA certificate (blob or path)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-ca-cert-blob"></a><h3>nm_setting_802_1x_get_phase2_ca_cert_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_phase2_ca_cert_blob
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      nm_setting_802_1x_get_phase2_ca_cert_blob
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the "phase 2" CA certificate blob if the CA certificate is stored
-using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.  Not all EAP methods use
+using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme.  Not all EAP methods use
 a CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -1305,20 +1316,19 @@ of the network cannot be confirmed by the client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" CA certificate data
-</td>
+<td>the "phase 2" CA certificate data</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_cert_path ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-ca-cert-path"></a><h3>nm_setting_802_1x_get_phase2_ca_cert_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_ca_cert_path
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_phase2_ca_cert_path
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the "phase 2" CA certificate path if the CA certificate is stored
-using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.  Not all EAP methods use
+using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.  Not all EAP methods use
 a CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -1334,14 +1344,13 @@ of the network cannot be confirmed by the client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> path to the "phase 2" CA certificate file
-</td>
+<td>path to the "phase 2" CA certificate file</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_phase2_ca_cert ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-set-phase2-ca-cert"></a><h3>nm_setting_802_1x_set_phase2_ca_cert ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_ca_cert
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -1352,8 +1361,8 @@ of the network cannot be confirmed by the client.
 <p>
 Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-ca-cert" title='The "phase2-ca-cert" property'><span class="type">"phase2-ca-cert"</span></a>
 property with the raw certificate data if using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the certificate
-file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the certificate
+file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -1365,46 +1374,41 @@ file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the "phase2" CA
-  certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
-  <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
-  clears the "phase2" CA certificate.
-</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the "phase2" CA
+certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
+clears the "phase2" CA certificate.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the certificate
-</td>
+<td>desired storage scheme for the certificate</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
+<td>on successful return, the type of the certificate added</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
+<td>on unsuccessful return, an error</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_client_cert_scheme ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-client-cert-scheme"></a><h3>nm_setting_802_1x_get_phase2_client_cert_scheme ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Returns the scheme used to store the "phase 2" client certificate.  If the
-returned scheme is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
+returned scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>; if
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
@@ -1417,16 +1421,15 @@ returned scheme is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> scheme used to store the "phase 2" client certificate (blob or path)
-</td>
+<td>scheme used to store the "phase 2" client certificate (blob or path)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_client_cert_blob ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-client-cert-blob"></a><h3>nm_setting_802_1x_get_phase2_client_cert_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_phase2_client_cert_blob
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      nm_setting_802_1x_get_phase2_client_cert_blob
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Client certificates are used to identify the connecting client to the network
@@ -1443,16 +1446,15 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" client certificate data
-</td>
+<td>the "phase 2" client certificate data</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_client_cert_path ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-phase2-client-cert-path"></a><h3>nm_setting_802_1x_get_phase2_client_cert_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_client_cert_path
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_phase2_client_cert_path
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Client certificates are used to identify the connecting client to the network
@@ -1469,14 +1471,13 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> path to the "phase 2" client certificate file
-</td>
+<td>path to the "phase 2" client certificate file</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_phase2_client_cert ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-set-phase2-client-cert"></a><h3>nm_setting_802_1x_set_phase2_client_cert ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_client_cert
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
@@ -1487,8 +1488,8 @@ authentication method.
 <p>
 Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-client-cert" title='The "phase2-client-cert" property'><span class="type">"phase2-client-cert"</span></a>
 property with the raw certificate data if using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the certificate
-file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the certificate
+file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
 </p>
 <p>
 Client certificates are used to identify the connecting client to the network
@@ -1505,38 +1506,33 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the "phase2" client
-  certificate file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8
-  encoded; use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with
-  any <em class="parameter"><code>scheme</code></em> clears the "phase2" client certificate.
-</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the "phase2" client
+certificate file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8
+encoded; use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with
+any <em class="parameter"><code>scheme</code></em> clears the "phase2" client certificate.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the certificate
-</td>
+<td>desired storage scheme for the certificate</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
+<td>on successful return, the type of the certificate added</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
+<td>on unsuccessful return, an error</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_password ()">
+<div class="refsect2">
 <a name="nm-setting-802-1x-get-password"></a><h3>nm_setting_802_1x_get_password ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_password      (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -1549,155 +1545,17 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the password used by the authentication method, if any, as specified
-  by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'><span class="type">"password"</span></a> property
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_pin ()">
-<a name="nm-setting-802-1x-get-pin"></a><h3>nm_setting_802_1x_get_pin ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_pin           (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the PIN used by the authentication method, if any, as specified
-  by the <span class="type">"pin"</span> property
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_psk ()">
-<a name="nm-setting-802-1x-get-psk"></a><h3>nm_setting_802_1x_get_psk ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_psk           (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the Pre-Shared-Key used by the authentication method, if any, as
-  specified by the <span class="type">"psk"</span> property
-</td>
+<td>the password used by the authentication method, if any, as specified
+by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'><span class="type">"password"</span></a> property</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key_scheme ()">
-<a name="nm-setting-802-1x-get-private-key-scheme"></a><h3>nm_setting_802_1x_get_private_key_scheme ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_private_key_scheme
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-password-flags"></a><h3>nm_setting_802_1x_get_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_802_1x_get_password_flags
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<p>
-Returns the scheme used to store the private key.  If the returned scheme is
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>; if
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> scheme used to store the private key (blob or path)
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key_blob ()">
-<a name="nm-setting-802-1x-get-private-key-blob"></a><h3>nm_setting_802_1x_get_private_key_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_private_key_blob
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the private key data
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key_path ()">
-<a name="nm-setting-802-1x-get-private-key-path"></a><h3>nm_setting_802_1x_get_private_key_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_private_key_path
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> path to the private key file
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_set_private_key ()">
-<a name="nm-setting-802-1x-set-private-key"></a><h3>nm_setting_802_1x_set_private_key ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_private_key   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>
-Reads a private key from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a>
-property with the raw private key data if using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the private key
-file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
-</p>
-<p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-</p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -1707,47 +1565,17 @@ authentication method.
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the private key file
-  (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded; use
-  <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
-  clears the private key.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>password</code></em> :</span></p></td>
-<td>password used to decrypt the private key
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the private key
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the private key added
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'><span class="type">"password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key_password ()">
-<a name="nm-setting-802-1x-get-private-key-password"></a><h3>nm_setting_802_1x_get_private_key_password ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_private_key_password
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-pin"></a><h3>nm_setting_802_1x_get_pin ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_pin           (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -1758,20 +1586,16 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the private key password used to decrypt the private key if
- previously set with <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file" title="nm_setting_802_1x_set_private_key_from_file ()"><code class="function">nm_setting_802_1x_set_private_key_from_file()</code></a>,
- <code class="function">nm_setting_802_1x_set_private_key_path()</code>, or the
- <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a> property.
-</td>
+<td>the PIN used by the authentication method, if any, as specified
+by the <span class="type">"pin"</span> property</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key_format ()">
-<a name="nm-setting-802-1x-get-private-key-format"></a><h3>nm_setting_802_1x_get_private_key_format ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  nm_setting_802_1x_get_private_key_format
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-pin-flags"></a><h3>nm_setting_802_1x_get_pin_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_802_1x_get_pin_flags   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -1782,23 +1606,23 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the data format of the private key data stored in the
-  <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> property
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
+<span class="type">"pin"</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_scheme ()">
-<a name="nm-setting-802-1x-get-phase2-private-key-scheme"></a><h3>nm_setting_802_1x_get_phase2_private_key_scheme ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_phase2_private_key_scheme
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-private-key-scheme"></a><h3>nm_setting_802_1x_get_private_key_scheme ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_private_key_scheme
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
-Returns the scheme used to store the "phase 2" private key.  If the returned
-scheme is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
+Returns the scheme used to store the private key.  If the returned scheme is
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>; if
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code>, use
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
@@ -1811,22 +1635,26 @@ scheme is <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, use
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> scheme used to store the "phase 2" private key (blob or path)
-</td>
+<td>scheme used to store the private key (blob or path)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_blob ()">
-<a name="nm-setting-802-1x-get-phase2-private-key-blob"></a><h3>nm_setting_802_1x_get_phase2_private_key_blob ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_phase2_private_key_blob
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-private-key-blob"></a><h3>nm_setting_802_1x_get_private_key_blob ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      nm_setting_802_1x_get_private_key_blob
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 </p>
+<p>
+WARNING: the private key property is not a "secret" property, and thus
+unencrypted private key data may be readable by unprivileged users.  Private
+keys should always be encrypted with a private key password.
+</p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -1837,16 +1665,15 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" private key data
-</td>
+<td>the private key data</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_path ()">
-<a name="nm-setting-802-1x-get-phase2-private-key-path"></a><h3>nm_setting_802_1x_get_phase2_private_key_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_private_key_path
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-private-key-path"></a><h3>nm_setting_802_1x_get_private_key_path ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_private_key_path
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
 Private keys are used to authenticate the connecting client to the network
@@ -1863,33 +1690,46 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> path to the "phase 2" private key file
-</td>
+<td>path to the private key file</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_phase2_private_key ()">
-<a name="nm-setting-802-1x-set-phase2-private-key"></a><h3>nm_setting_802_1x_set_phase2_private_key ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_private_key
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
+<div class="refsect2">
+<a name="nm-setting-802-1x-set-private-key"></a><h3>nm_setting_802_1x_set_private_key ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_private_key   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
-Reads a "phase 2" private key from disk and sets the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property with the raw private key data if
-using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme, or with the path to the
-private key file if using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> scheme.
-</p>
-<p>
 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 </p>
+<p>
+This function reads a private key from disk and sets the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> property with the private key file data if using
+the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the private
+key file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
+</p>
+<p>
+If <em class="parameter"><code>password</code></em> is given, this function attempts to decrypt the private key to
+verify that <em class="parameter"><code>password</code></em> is correct, and if it is, updates the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a> property with the given <em class="parameter"><code>password</code></em>.  If
+the decryption is unsuccessful, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned, <em class="parameter"><code>error</code></em> is set, and no
+internal data is changed.  If no <em class="parameter"><code>password</code></em> is given, the private key is
+assumed to be valid, no decryption is performed, and the password may be set
+at a later time.
+</p>
+<p>
+WARNING: the private key property is not a "secret" property, and thus
+unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a private
+key password to prevent unauthorized access to unencrypted private key data.
+</p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -1900,45 +1740,41 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>when <em class="parameter"><code>scheme</code></em> is set to either <code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code> or
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>, pass the path of the "phase2" private 
-  key file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded;
-  use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any
-  <em class="parameter"><code>scheme</code></em> clears the "phase2" private key.
-</td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the private key file
+(PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded; use
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any <em class="parameter"><code>scheme</code></em>
+clears the private key.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>password</code></em> :</span></p></td>
-<td>password used to decrypt the private key
-</td>
+<td>password used to decrypt the private key, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the password
+is unknown.  If the password is given but fails to decrypt the private key,
+an error is returned.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>desired storage scheme for the private key
-</td>
+<td>desired storage scheme for the private key</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
-<td>on successful return, the type of the private key added
-</td>
+<td>on successful return, the type of the private key added</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
+<td>on unsuccessful return, an error</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_password ()">
-<a name="nm-setting-802-1x-get-phase2-private-key-password"></a><h3>nm_setting_802_1x_get_phase2_private_key_password ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_802_1x_get_phase2_private_key_password
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-private-key-password"></a><h3>nm_setting_802_1x_get_private_key_password ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_private_key_password
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -1950,19 +1786,18 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the private key password used to decrypt the private key if
- previously set with <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file" title="nm_setting_802_1x_set_phase2_private_key_from_file ()"><code class="function">nm_setting_802_1x_set_phase2_private_key_from_file()</code></a>,
- <code class="function">nm_setting_802_1x_set_phase2_private_key_path()</code>, or the
- <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a> property.
-</td>
+<td>the private key password used to decrypt the private key if
+previously set with <code class="function">nm_setting_802_1x_set_private_key_from_file()</code>,
+<code class="function">nm_setting_802_1x_set_private_key_path()</code>, or the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a> property.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_format ()">
-<a name="nm-setting-802-1x-get-phase2-private-key-format"></a><h3>nm_setting_802_1x_get_phase2_private_key_format ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  nm_setting_802_1x_get_phase2_private_key_format
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-private-key-password-flags"></a><h3>nm_setting_802_1x_get_private_key_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_802_1x_get_private_key_password_flags
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -1974,80 +1809,18 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the data format of the "phase 2" private key data stored in the
-  <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSetting8021xCKType">
-<a name="NMSetting8021xCKType"></a><h3>enum NMSetting8021xCKType</h3>
-<pre class="programlisting">typedef enum {
-	NM_SETTING_802_1X_CK_TYPE_UNKNOWN = 0,
-	NM_SETTING_802_1X_CK_TYPE_X509,
-	NM_SETTING_802_1X_CK_TYPE_RAW_KEY,
-	NM_SETTING_802_1X_CK_TYPE_PKCS12
-} NMSetting8021xCKType;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_ca_cert ()">
-<a name="nm-setting-802-1x-get-ca-cert"></a><h3>nm_setting_802_1x_get_ca_cert ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_ca_cert       (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_ca_cert</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_ca_cert_blob()</code></a>.</p>
-</div>
-<p>
-Returns the CA certificate blob if the CA certificate is stored using the
-<code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.  Not all EAP methods use a
-CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the CA certificate data
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_set_ca_cert_from_file ()">
-<a name="nm-setting-802-1x-set-ca-cert-from-file"></a><h3>nm_setting_802_1x_set_ca_cert_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_ca_cert_from_file
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_set_ca_cert_from_file</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert" title="nm_setting_802_1x_set_ca_cert ()"><code class="function">nm_setting_802_1x_set_ca_cert()</code></a> with the
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
-</div>
-<p>
-Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--ca-cert" title='The "ca-cert" property'><span class="type">"ca-cert"</span></a> property
-with the raw certificate data using the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code>
-scheme.
-</p>
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-private-key-format"></a><h3>nm_setting_802_1x_get_private_key_format ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  nm_setting_802_1x_get_private_key_format
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -2057,43 +1830,24 @@ scheme.
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td>the path of the CA certificate file (PEM or DER format). Passing
-  NULL clears the CA certificate.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>the data format of the private key data stored in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> property</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_client_cert ()">
-<a name="nm-setting-802-1x-get-client-cert"></a><h3>nm_setting_802_1x_get_client_cert ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_client_cert   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_client_cert</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>.</p>
-</div>
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-phase2-private-key-scheme"></a><h3>nm_setting_802_1x_get_phase2_private_key_scheme ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="returnvalue">NMSetting8021xCKScheme</span></a>  nm_setting_802_1x_get_phase2_private_key_scheme
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
+Returns the scheme used to store the "phase 2" private key.  If the returned
+scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, use
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_client_cert_blob()</code></a>; if
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a>, use
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-path" title="nm_setting_802_1x_get_client_cert_path ()"><code class="function">nm_setting_802_1x_get_client_cert_path()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -2105,85 +1859,25 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the client certificate data
-</td>
+<td>scheme used to store the "phase 2" private key (blob or path)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_client_cert_from_file ()">
-<a name="nm-setting-802-1x-set-client-cert-from-file"></a><h3>nm_setting_802_1x_set_client_cert_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_client_cert_from_file
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_set_client_cert_from_file</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert" title="nm_setting_802_1x_set_client_cert ()"><code class="function">nm_setting_802_1x_set_client_cert()</code></a> with the
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
-</div>
-<p>
-Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--client-cert" title='The "client-cert" property'><span class="type">"client-cert"</span></a>
-property with the raw certificate data.
-</p>
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-phase2-private-key-blob"></a><h3>nm_setting_802_1x_get_phase2_private_key_blob ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *      nm_setting_802_1x_get_phase2_private_key_blob
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <p>
-Client certificates are used to identify the connecting client to the network
+Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td>the path of the client certificate file (PEM, DER, or
-  PKCS<span class="type">12</span> format).  Passing NULL clears the client certificate.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_ca_cert ()">
-<a name="nm-setting-802-1x-get-phase2-ca-cert"></a><h3>nm_setting_802_1x_get_phase2_ca_cert ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_phase2_ca_cert
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_phase2_ca_cert</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-blob" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()"><code class="function">nm_setting_802_1x_get_phase2_ca_cert_blob()</code></a>.</p>
-</div>
 <p>
-Returns the "phase 2" CA certificate blob.  Not all EAP methods use
-a CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
+WARNING: the phase2 private key property is not a "secret" property, and thus
+unencrypted private key data may be readable by unprivileged users.  Private
+keys should always be encrypted with a private key password.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -2195,76 +1889,18 @@ of the network cannot be confirmed by the client.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" CA certificate data
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_set_phase2_ca_cert_from_file ()">
-<a name="nm-setting-802-1x-set-phase2-ca-cert-from-file"></a><h3>nm_setting_802_1x_set_phase2_ca_cert_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_ca_cert_from_file
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_set_phase2_ca_cert_from_file</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert" title="nm_setting_802_1x_set_phase2_ca_cert ()"><code class="function">nm_setting_802_1x_set_phase2_ca_cert()</code></a>.
-  with the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
-</div>
-<p>
-Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-ca-cert" title='The "phase2-ca-cert" property'><span class="type">"phase2-ca-cert"</span></a>
-property with the raw certificate data.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td>the path of the "phase2" CA certificate file (PEM or DER format).
-  Passing NULL with any <em class="parameter"><code>scheme</code></em> clears the "phase2" CA certificate.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
+<td>the "phase 2" private key data</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_client_cert ()">
-<a name="nm-setting-802-1x-get-phase2-client-cert"></a><h3>nm_setting_802_1x_get_phase2_client_cert ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_phase2_client_cert
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-phase2-private-key-path"></a><h3>nm_setting_802_1x_get_phase2_private_key_path ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_phase2_private_key_path
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_phase2_client_cert</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-blob" title="nm_setting_802_1x_get_phase2_client_cert_blob ()"><code class="function">nm_setting_802_1x_get_phase2_client_cert_blob()</code></a>.</p>
-</div>
 <p>
-Client certificates are used to identify the connecting client to the network
+Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 </p>
@@ -2278,123 +1914,46 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" client certificate data
-</td>
+<td>path to the "phase 2" private key file</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_phase2_client_cert_from_file ()">
-<a name="nm-setting-802-1x-set-phase2-client-cert-from-file"></a><h3>nm_setting_802_1x_set_phase2_client_cert_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_client_cert_from_file
+<div class="refsect2">
+<a name="nm-setting-802-1x-set-phase2-private-key"></a><h3>nm_setting_802_1x_set_phase2_private_key ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_private_key
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme"><span class="type">NMSetting8021xCKScheme</span></a> scheme</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> *out_format</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_set_phase2_client_cert_from_file</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert" title="nm_setting_802_1x_set_phase2_client_cert ()"><code class="function">nm_setting_802_1x_set_phase2_client_cert()</code></a> with the.
-  <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
-</div>
 <p>
-Reads a certificate from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-client-cert" title='The "phase2-client-cert" property'><span class="type">"phase2-client-cert"</span></a>
-property with the raw certificate data.
-</p>
-<p>
-Client certificates are used to identify the connecting client to the network
+Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td>pass the path of the "phase2" client certificate file (PEM, DER,
-  or PKCS<span class="type">12</span> format).  Passing NULL clears the "phase2" client certificate.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
-<td>on successful return, the type of the certificate added
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key ()">
-<a name="nm-setting-802-1x-get-private-key"></a><h3>nm_setting_802_1x_get_private_key ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_private_key   (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_private_key</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob" title="nm_setting_802_1x_get_private_key_blob ()"><code class="function">nm_setting_802_1x_get_private_key_blob()</code></a>.</p>
-</div>
 <p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
+This function reads a private key from disk and sets the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property with the private key file data if
+using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a> scheme, or with the path to the
+private key file if using the <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> scheme.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the private key data
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_set_private_key_from_file ()">
-<a name="nm-setting-802-1x-set-private-key-from-file"></a><h3>nm_setting_802_1x_set_private_key_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_private_key_from_file
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_set_private_key_from_file</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a> with.
-  the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
-</div>
 <p>
-Reads a private key from disk and sets the <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a>
-property with the raw private key data.
+If <em class="parameter"><code>password</code></em> is given, this function attempts to decrypt the private key to
+verify that <em class="parameter"><code>password</code></em> is correct, and if it is, updates the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a> property with the given
+<em class="parameter"><code>password</code></em>.  If the decryption is unsuccessful, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned, <em class="parameter"><code>error</code></em> is
+set, and no internal data is changed.  If no <em class="parameter"><code>password</code></em> is given, the private
+key is assumed to be valid, no decryption is performed, and the password may
+be set at a later time.
 </p>
 <p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
+WARNING: the "phase2" private key property is not a "secret" property, and
+thus unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a private
+key password to prevent unauthorized access to unencrypted private key data.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -2405,78 +1964,43 @@ authentication method.
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td>the path of the private key file (PEM, DER, or PKCS<span class="type">12</span> format).
-  Passing NULL clears the private key.
-</td>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>when <em class="parameter"><code>scheme</code></em> is set to either <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_PATH</code></a> or
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"><code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code></a>, pass the path of the "phase2" private
+key file (PEM, DER, or PKCS<span class="type">12</span> format).  The path must be UTF-8 encoded;
+use <a href="http://library.gnome.org/devel/glib/unstable/glib-Character-Set-Conversion.html#g-filename-to-utf8"><code class="function">g_filename_to_utf8()</code></a> to convert if needed.  Passing NULL with any
+<em class="parameter"><code>scheme</code></em> clears the private key.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>password</code></em> :</span></p></td>
-<td>password used to decrypt the private key
-</td>
+<td>password used to decrypt the private key, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the password
+is unknown.  If the password is given but fails to decrypt the private key,
+an error is returned.</td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
-<td>on successful return, the type of the private key added
-</td>
+<td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
+<td>desired storage scheme for the private key</td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
+<td><p><span class="term"><em class="parameter"><code>out_format</code></em> :</span></p></td>
+<td>on successful return, the type of the private key added</td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_setting_802_1x_get_private_key_type ()">
-<a name="nm-setting-802-1x-get-private-key-type"></a><h3>nm_setting_802_1x_get_private_key_type ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="returnvalue">NMSetting8021xCKType</span></a>  nm_setting_802_1x_get_private_key_type
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_private_key_type</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-format" title="nm_setting_802_1x_get_private_key_format ()"><code class="function">nm_setting_802_1x_get_private_key_format()</code></a>.</p>
-</div>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a>
-</td>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>on unsuccessful return, an error</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the data format of the private key data stored in the
-  <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> property
-</td>
+<td>TRUE if the operation succeeded, FALSE if it was unsuccessful</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key ()">
-<a name="nm-setting-802-1x-get-phase2-private-key"></a><h3>nm_setting_802_1x_get_phase2_private_key ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_802_1x_get_phase2_private_key
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-phase2-private-key-password"></a><h3>nm_setting_802_1x_get_phase2_private_key_password ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_802_1x_get_phase2_private_key_password
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_phase2_private_key</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob" title="nm_setting_802_1x_get_private_key_blob ()"><code class="function">nm_setting_802_1x_get_private_key_blob()</code></a>.</p>
-</div>
-<p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-</p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -2487,37 +2011,19 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the "phase 2" private key data
-</td>
+<td>the private key password used to decrypt the private key if
+previously set with <code class="function">nm_setting_802_1x_set_phase2_private_key_from_file()</code>,
+<code class="function">nm_setting_802_1x_set_phase2_private_key_path()</code>, or the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a> property.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_set_phase2_private_key_from_file ()">
-<a name="nm-setting-802-1x-set-phase2-private-key-from-file"></a><h3>nm_setting_802_1x_set_phase2_private_key_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_802_1x_set_phase2_private_key_from_file
-                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *password</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="type">NMSetting8021xCKType</span></a> *out_ck_type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_set_phase2_private_key_from_file</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()"><code class="function">nm_setting_802_1x_set_phase2_private_key()</code></a> with
-  the <code class="literal">NM_SETTING_802_1X_CK_SCHEME_BLOB</code> scheme.</p>
-</div>
-<p>
-Reads a "phase 2" private key from disk and sets the
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property with the raw private key data.
-</p>
-<p>
-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-</p>
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-phase2-private-key-password-flags"></a><h3>nm_setting_802_1x_get_phase2_private_key_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_802_1x_get_phase2_private_key_password_flags
+                                                        (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -2527,45 +2033,19 @@ authentication method.
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td>the path of the "phase2" private key file (PEM, DER, or PKCS<span class="type">12</span>
-  format).  Passing NULL clears the "phase2" private key.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>password</code></em> :</span></p></td>
-<td>password used to decrypt the private key
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>out_ck_type</code></em> :</span></p></td>
-<td>on successful return, the type of the private key added
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>on unsuccessful return, an error
-</td>
-</tr>
-<tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the operation succeeded, FALSE if it was unsuccessful
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_802_1x_get_phase2_private_key_type ()">
-<a name="nm-setting-802-1x-get-phase2-private-key-type"></a><h3>nm_setting_802_1x_get_phase2_private_key_type ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType"><span class="returnvalue">NMSetting8021xCKType</span></a>  nm_setting_802_1x_get_phase2_private_key_type
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-phase2-private-key-format"></a><h3>nm_setting_802_1x_get_phase2_private_key_format ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="returnvalue">NMSetting8021xCKFormat</span></a>  nm_setting_802_1x_get_phase2_private_key_format
                                                         (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">nm_setting_802_1x_get_phase2_private_key_type</code> has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format" title="nm_setting_802_1x_get_phase2_private_key_format ()"><code class="function">nm_setting_802_1x_get_phase2_private_key_format()</code></a>.</p>
-</div>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -2576,17 +2056,16 @@ authentication method.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the data format of the private key data stored in the
-  <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property
-</td>
+<td>the data format of the "phase 2" private key data stored in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title='The "phase2-private-key" property'><span class="type">"phase2-private-key"</span></a> property</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSetting8021x.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "anonymous-identity" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--anonymous-identity"></a><h3>The <code class="literal">"anonymous-identity"</code> property</h3>
 <pre class="programlisting">  "anonymous-identity"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2597,7 +2076,7 @@ identity like EAP-TTLS.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "ca-cert" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--ca-cert"></a><h3>The <code class="literal">"ca-cert"</code> property</h3>
 <pre class="programlisting">  "ca-cert"                  <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -2607,7 +2086,7 @@ discouraged; use the <a class="link" href="NMSetting8021x.html#nm-setting-802-1x
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "ca-path" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--ca-path"></a><h3>The <code class="literal">"ca-path"</code> property</h3>
 <pre class="programlisting">  "ca-path"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2618,7 +2097,7 @@ certificate specified in the <a class="link" href="NMSetting8021x.html#NMSetting
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "client-cert" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--client-cert"></a><h3>The <code class="literal">"client-cert"</code> property</h3>
 <pre class="programlisting">  "client-cert"              <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -2628,7 +2107,7 @@ discouraged; use the <a class="link" href="NMSetting8021x.html#nm-setting-802-1x
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "eap" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--eap"></a><h3>The <code class="literal">"eap"</code> property</h3>
 <pre class="programlisting">  "eap"                      <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -2640,7 +2119,7 @@ allowed combinations.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "identity" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--identity"></a><h3>The <code class="literal">"identity"</code> property</h3>
 <pre class="programlisting">  "identity"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2650,7 +2129,7 @@ user or login name.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "password" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--password"></a><h3>The <code class="literal">"password"</code> property</h3>
 <pre class="programlisting">  "password"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2659,7 +2138,17 @@ Password used for EAP authentication methods.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase1-fast-provisioning" property'>
+<div class="refsect2">
+<a name="NMSetting8021x--password-flags"></a><h3>The <code class="literal">"password-flags"</code> property</h3>
+<pre class="programlisting">  "password-flags"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title='The "password" property'><span class="type">"password"</span></a>:.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSetting8021x--phase1-fast-provisioning"></a><h3>The <code class="literal">"phase1-fast-provisioning"</code> property</h3>
 <pre class="programlisting">  "phase1-fast-provisioning" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2673,7 +2162,7 @@ wpa_supplicant documentation for more details.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase1-peaplabel" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase1-peaplabel"></a><h3>The <code class="literal">"phase1-peaplabel"</code> property</h3>
 <pre class="programlisting">  "phase1-peaplabel"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2685,7 +2174,7 @@ wpa_supplicant documentation for more details.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase1-peapver" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase1-peapver"></a><h3>The <code class="literal">"phase1-peapver"</code> property</h3>
 <pre class="programlisting">  "phase1-peapver"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2699,7 +2188,7 @@ version.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-auth" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-auth"></a><h3>The <code class="literal">"phase2-auth"</code> property</h3>
 <pre class="programlisting">  "phase2-auth"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2713,7 +2202,7 @@ authentication; see the wpa_supplicant documentation for more details.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-autheap" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-autheap"></a><h3>The <code class="literal">"phase2-autheap"</code> property</h3>
 <pre class="programlisting">  "phase2-autheap"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2727,7 +2216,7 @@ wpa_supplicant documentation for more details.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-ca-cert" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-ca-cert"></a><h3>The <code class="literal">"phase2-ca-cert"</code> property</h3>
 <pre class="programlisting">  "phase2-ca-cert"           <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -2738,7 +2227,7 @@ Setting this property directly is discouraged; use the
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-ca-path" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-ca-path"></a><h3>The <code class="literal">"phase2-ca-path"</code> property</h3>
 <pre class="programlisting">  "phase2-ca-path"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2749,7 +2238,7 @@ certificate specified in the <a class="link" href="NMSetting8021x.html#NMSetting
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-client-cert" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-client-cert"></a><h3>The <code class="literal">"phase2-client-cert"</code> property</h3>
 <pre class="programlisting">  "phase2-client-cert"       <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -2760,7 +2249,7 @@ properties.  Setting this property directly is discouraged; use the
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-private-key" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-private-key"></a><h3>The <code class="literal">"phase2-private-key"</code> property</h3>
 <pre class="programlisting">  "phase2-private-key"       <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -2774,7 +2263,7 @@ property directly is discouraged; use the
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "phase2-private-key-password" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--phase2-private-key-password"></a><h3>The <code class="literal">"phase2-private-key-password"</code> property</h3>
 <pre class="programlisting">  "phase2-private-key-password" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2788,7 +2277,17 @@ the private key by the <a class="link" href="NMSetting8021x.html#nm-setting-802-
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "private-key" property'>
+<div class="refsect2">
+<a name="NMSetting8021x--phase2-private-key-password-flags"></a><h3>The <code class="literal">"phase2-private-key-password-flags"</code> property</h3>
+<pre class="programlisting">  "phase2-private-key-password-flags" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title='The "phase2-private-key-password" property'><span class="type">"phase2-private-key-password"</span></a>:.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSetting8021x--private-key"></a><h3>The <code class="literal">"private-key"</code> property</h3>
 <pre class="programlisting">  "private-key"              <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -2796,9 +2295,16 @@ Contains the private key if the <a class="link" href="NMSetting8021x.html#NMSett
 'tls'.  Setting this property directly is discouraged; use the
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a> function instead.
 </p>
+<p>
+WARNING: <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'><span class="type">"private-key"</span></a> is not a "secret" property, and thus
+unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a
+private key password to prevent unauthorized access to unencrypted
+private key data.
+</p>
 </div>
 <hr>
-<div class="refsect2" title='The "private-key-password" property'>
+<div class="refsect2">
 <a name="NMSetting8021x--private-key-password"></a><h3>The <code class="literal">"private-key-password"</code> property</h3>
 <pre class="programlisting">  "private-key-password"     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -2812,7 +2318,17 @@ the private key by the <a class="link" href="NMSetting8021x.html#nm-setting-802-
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "system-ca-certs" property'>
+<div class="refsect2">
+<a name="NMSetting8021x--private-key-password-flags"></a><h3>The <code class="literal">"private-key-password-flags"</code> property</h3>
+<pre class="programlisting">  "private-key-password-flags" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title='The "private-key-password" property'><span class="type">"private-key-password"</span></a>:.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSetting8021x--system-ca-certs"></a><h3>The <code class="literal">"system-ca-certs"</code> property</h3>
 <pre class="programlisting">  "system-ca-certs"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -2830,6 +2346,6 @@ addition to any certificates specified by the <a class="link" href="NMSetting802
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index 0dabd239..a6eae7b9 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
 <link rel="next" href="NMSettingSerial.html" title="NMSettingSerial">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingBluetooth.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingBluetooth">
+<div class="refentry">
 <a name="NMSettingBluetooth"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingBluetooth.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-SETTING-NAME:CAPS" title="NM_SETTING_BLUETOOTH_SETTING_NAME">NM_SETTING_BLUETOOTH_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingBluetooth.html#NMSettingBluetoothError" title="enum NMSettingBluetoothError">NMSettingBluetoothError</a>;
+<a name="NMSettingBluetoothError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-SETTING-NAME:CAPS" title="NM_SETTING_BLUETOOTH_SETTING_NAME">NM_SETTING_BLUETOOTH_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingBluetooth.html#NMSettingBluetoothError">NMSettingBluetoothError</a>;
 #define             <a class="link" href="NMSettingBluetooth.html#NM-TYPE-SETTING-BLUETOOTH-ERROR:CAPS" title="NM_TYPE_SETTING_BLUETOOTH_ERROR">NM_TYPE_SETTING_BLUETOOTH_ERROR</a>
 #define             <a class="link" href="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-ERROR:CAPS" title="NM_SETTING_BLUETOOTH_ERROR">NM_SETTING_BLUETOOTH_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingBluetooth.html#nm-setting-bluetooth-error-quark" title="nm_setting_bluetooth_error_quark ()">nm_setting_bluetooth_error_quark</a>    (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -59,29 +59,33 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="type">NMSettingBluetooth</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingBluetooth.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingBluetoothError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingBluetooth
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingBluetooth.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingBluetooth.html#NMSettingBluetooth--bdaddr" title='The "bdaddr" property'>bdaddr</a>"                   <span class="type">GArray_guchar_</span>*       : Read / Write
   "<a class="link" href="NMSettingBluetooth.html#NMSettingBluetooth--type" title='The "type" property'>type</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingBluetooth.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingBluetooth.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_BLUETOOTH_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BLUETOOTH_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
 </pre>
@@ -89,7 +93,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingBluetoothError">
+<div class="refsect2">
 <a name="NMSettingBluetoothError"></a><h3>enum NMSettingBluetoothError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -103,7 +107,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_BLUETOOTH_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-BLUETOOTH-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_BLUETOOTH_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_BLUETOOTH_ERROR (nm_setting_bluetooth_error_get_type ()) 
 </pre>
@@ -111,7 +115,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_BLUETOOTH_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-ERROR:CAPS"></a><h3>NM_SETTING_BLUETOOTH_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
 </pre>
@@ -119,22 +123,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_bluetooth_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-bluetooth-error-quark"></a><h3>nm_setting_bluetooth_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_bluetooth_error_quark    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_BLUETOOTH_BDADDR">
+<div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-BDADDR:CAPS"></a><h3>NM_SETTING_BLUETOOTH_BDADDR</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
 </pre>
@@ -142,7 +138,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_BLUETOOTH_TYPE">
+<div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-TYPE:CAPS"></a><h3>NM_SETTING_BLUETOOTH_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_TYPE      "type"
 </pre>
@@ -150,7 +146,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_BLUETOOTH_TYPE_DUN">
+<div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-TYPE-DUN:CAPS"></a><h3>NM_SETTING_BLUETOOTH_TYPE_DUN</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_TYPE_DUN  "dun"
 </pre>
@@ -158,7 +154,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_BLUETOOTH_TYPE_PANU">
+<div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-TYPE-PANU:CAPS"></a><h3>NM_SETTING_BLUETOOTH_TYPE_PANU</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_TYPE_PANU "panu"
 </pre>
@@ -166,14 +162,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingBluetooth">
+<div class="refsect2">
 <a name="NMSettingBluetooth-struct"></a><h3>NMSettingBluetooth</h3>
 <pre class="programlisting">typedef struct _NMSettingBluetooth NMSettingBluetooth;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingBluetoothClass">
+<div class="refsect2">
 <a name="NMSettingBluetoothClass"></a><h3>NMSettingBluetoothClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -189,84 +185,38 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_bluetooth_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-bluetooth-get-type"></a><h3>nm_setting_bluetooth_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_bluetooth_get_type       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_bluetooth_new ()">
+<div class="refsect2">
 <a name="nm-setting-bluetooth-new"></a><h3>nm_setting_bluetooth_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_bluetooth_new            (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_bluetooth_get_bdaddr ()">
+<div class="refsect2">
 <a name="nm-setting-bluetooth-get-bdaddr"></a><h3>nm_setting_bluetooth_get_bdaddr ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_bluetooth_get_bdaddr     (<em class="parameter"><code><a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="type">NMSettingBluetooth</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_bluetooth_get_connection_type ()">
+<div class="refsect2">
 <a name="nm-setting-bluetooth-get-connection-type"></a><h3>nm_setting_bluetooth_get_connection_type ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_bluetooth_get_connection_type
                                                         (<em class="parameter"><code><a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="type">NMSettingBluetooth</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingBluetooth.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "bdaddr" property'>
+<div class="refsect2">
 <a name="NMSettingBluetooth--bdaddr"></a><h3>The <code class="literal">"bdaddr"</code> property</h3>
 <pre class="programlisting">  "bdaddr"                   <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -274,7 +224,7 @@ The Bluetooth address of the device.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "type" property'>
+<div class="refsect2">
 <a name="NMSettingBluetooth--type"></a><h3>The <code class="literal">"type"</code> property</h3>
 <pre class="programlisting">  "type"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -287,6 +237,6 @@ Either 'dun' for Dial-Up Networking connections (not yet supported) or
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index 1704380c..3dc4a712 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingSerial.html" title="NMSettingSerial">
 <link rel="next" href="NMSettingGsm.html" title="NMSettingGsm">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingCdma.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingCdma">
+<div class="refentry">
 <a name="NMSettingCdma"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,19 +39,20 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingCdma.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
+<a name="NMSettingCdmaError"></a><pre class="synopsis">
 #include &lt;nm-setting-cdma.h&gt;
 
 #define             <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-SETTING-NAME:CAPS" title="NM_SETTING_CDMA_SETTING_NAME">NM_SETTING_CDMA_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingCdma.html#NMSettingCdmaError" title="enum NMSettingCdmaError">NMSettingCdmaError</a>;
+enum                <a class="link" href="NMSettingCdma.html#NMSettingCdmaError">NMSettingCdmaError</a>;
 #define             <a class="link" href="NMSettingCdma.html#NM-TYPE-SETTING-CDMA-ERROR:CAPS" title="NM_TYPE_SETTING_CDMA_ERROR">NM_TYPE_SETTING_CDMA_ERROR</a>
 #define             <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-ERROR:CAPS" title="NM_SETTING_CDMA_ERROR">NM_SETTING_CDMA_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingCdma.html#nm-setting-cdma-error-quark" title="nm_setting_cdma_error_quark ()">nm_setting_cdma_error_quark</a>         (<em class="parameter"><code><span class="type">void</span></code></em>);
 #define             <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-NUMBER:CAPS" title="NM_SETTING_CDMA_NUMBER">NM_SETTING_CDMA_NUMBER</a>
 #define             <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-USERNAME:CAPS" title="NM_SETTING_CDMA_USERNAME">NM_SETTING_CDMA_USERNAME</a>
 #define             <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD:CAPS" title="NM_SETTING_CDMA_PASSWORD">NM_SETTING_CDMA_PASSWORD</a>
+#define             <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS" title="NM_SETTING_CDMA_PASSWORD_FLAGS">NM_SETTING_CDMA_PASSWORD_FLAGS</a>
                     <a class="link" href="NMSettingCdma.html#NMSettingCdma-struct" title="NMSettingCdma">NMSettingCdma</a>;
                     <a class="link" href="NMSettingCdma.html#NMSettingCdmaClass" title="NMSettingCdmaClass">NMSettingCdmaClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-type" title="nm_setting_cdma_get_type ()">nm_setting_cdma_get_type</a>            (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -59,25 +60,32 @@ enum                <a class="link" href="NMSettingCdma.html#NMSettingCdmaError"
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-number" title="nm_setting_cdma_get_number ()">nm_setting_cdma_get_number</a>          (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-username" title="nm_setting_cdma_get_username ()">nm_setting_cdma_get_username</a>        (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-password" title="nm_setting_cdma_get_password ()">nm_setting_cdma_get_password</a>        (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-password-flags" title="nm_setting_cdma_get_password_flags ()">nm_setting_cdma_get_password_flags</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingCdma.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingCdmaError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingCdma
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingCdma.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingCdma.html#NMSettingCdma--number" title='The "number" property'>number</a>"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title='The "password" property'>password</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingCdma.html#NMSettingCdma--password-flags" title='The "password-flags" property'>password-flags</a>"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSettingCdma.html#NMSettingCdma--username" title='The "username" property'>username</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingCdma.description"></a><h2>Description</h2>
 <p>
 The <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes
@@ -85,9 +93,9 @@ properties that allow connections to IS-95-based mobile broadband
 networks, including those using CDMA2000/EVDO technology.
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingCdma.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_CDMA_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-CDMA-SETTING-NAME:CAPS"></a><h3>NM_SETTING_CDMA_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_SETTING_NAME "cdma"
 </pre>
@@ -95,7 +103,7 @@ networks, including those using CDMA2000/EVDO technology.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingCdmaError">
+<div class="refsect2">
 <a name="NMSettingCdmaError"></a><h3>enum NMSettingCdmaError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -109,7 +117,7 @@ networks, including those using CDMA2000/EVDO technology.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_CDMA_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-CDMA-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_CDMA_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_CDMA_ERROR (nm_setting_cdma_error_get_type ()) 
 </pre>
@@ -117,7 +125,7 @@ networks, including those using CDMA2000/EVDO technology.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CDMA_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-CDMA-ERROR:CAPS"></a><h3>NM_SETTING_CDMA_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_ERROR nm_setting_cdma_error_quark ()
 </pre>
@@ -125,7 +133,7 @@ networks, including those using CDMA2000/EVDO technology.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_cdma_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-cdma-error-quark"></a><h3>nm_setting_cdma_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_cdma_error_quark         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -135,44 +143,51 @@ Registers an error quark for <a class="link" href="NMSettingCdma.html" title="NM
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the error quark used for <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> errors.
-</td>
+<td>the error quark used for <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> errors.</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CDMA_NUMBER">
+<div class="refsect2">
 <a name="NM-SETTING-CDMA-NUMBER:CAPS"></a><h3>NM_SETTING_CDMA_NUMBER</h3>
-<pre class="programlisting">#define NM_SETTING_CDMA_NUMBER       "number"
+<pre class="programlisting">#define NM_SETTING_CDMA_NUMBER         "number"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CDMA_USERNAME">
+<div class="refsect2">
 <a name="NM-SETTING-CDMA-USERNAME:CAPS"></a><h3>NM_SETTING_CDMA_USERNAME</h3>
-<pre class="programlisting">#define NM_SETTING_CDMA_USERNAME     "username"
+<pre class="programlisting">#define NM_SETTING_CDMA_USERNAME       "username"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CDMA_PASSWORD">
+<div class="refsect2">
 <a name="NM-SETTING-CDMA-PASSWORD:CAPS"></a><h3>NM_SETTING_CDMA_PASSWORD</h3>
-<pre class="programlisting">#define NM_SETTING_CDMA_PASSWORD     "password"
+<pre class="programlisting">#define NM_SETTING_CDMA_PASSWORD       "password"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_CDMA_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingCdma">
+<div class="refsect2">
 <a name="NMSettingCdma-struct"></a><h3>NMSettingCdma</h3>
 <pre class="programlisting">typedef struct _NMSettingCdma NMSettingCdma;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingCdmaClass">
+<div class="refsect2">
 <a name="NMSettingCdmaClass"></a><h3>NMSettingCdmaClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -188,22 +203,14 @@ Registers an error quark for <a class="link" href="NMSettingCdma.html" title="NM
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_cdma_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-cdma-get-type"></a><h3>nm_setting_cdma_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_cdma_get_type            (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_cdma_new ()">
+<div class="refsect2">
 <a name="nm-setting-cdma-new"></a><h3>nm_setting_cdma_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_cdma_new                 (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -213,13 +220,12 @@ Creates a new <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><s
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new empty <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> object
-</td>
+<td>the new empty <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> object</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_cdma_get_number ()">
+<div class="refsect2">
 <a name="nm-setting-cdma-get-number"></a><h3>nm_setting_cdma_get_number ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_cdma_get_number          (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -232,14 +238,13 @@ Creates a new <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><s
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="NMSettingCdma.html#NMSettingCdma--number" title='The "number" property'><span class="type">"number"</span></a> property of the setting
-</td>
+<td>the <a class="link" href="NMSettingCdma.html#NMSettingCdma--number" title='The "number" property'><span class="type">"number"</span></a> property of the setting</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_cdma_get_username ()">
+<div class="refsect2">
 <a name="nm-setting-cdma-get-username"></a><h3>nm_setting_cdma_get_username ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_cdma_get_username        (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -252,14 +257,13 @@ Creates a new <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><s
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="NMSettingCdma.html#NMSettingCdma--username" title='The "username" property'><span class="type">"username"</span></a> property of the setting
-</td>
+<td>the <a class="link" href="NMSettingCdma.html#NMSettingCdma--username" title='The "username" property'><span class="type">"username"</span></a> property of the setting</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_cdma_get_password ()">
+<div class="refsect2">
 <a name="nm-setting-cdma-get-password"></a><h3>nm_setting_cdma_get_password ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_cdma_get_password        (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -272,16 +276,36 @@ Creates a new <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><s
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title='The "password" property'><span class="type">"password"</span></a> property of the setting
+<td>the <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title='The "password" property'><span class="type">"password"</span></a> property of the setting</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-cdma-get-password-flags"></a><h3>nm_setting_cdma_get_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_cdma_get_password_flags
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title='The "password" property'><span class="type">"password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingCdma.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "number" property'>
+<div class="refsect2">
 <a name="NMSettingCdma--number"></a><h3>The <code class="literal">"number"</code> property</h3>
 <pre class="programlisting">  "number"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -292,7 +316,7 @@ is used when required.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "password" property'>
+<div class="refsect2">
 <a name="NMSettingCdma--password"></a><h3>The <code class="literal">"password"</code> property</h3>
 <pre class="programlisting">  "password"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -303,7 +327,17 @@ password is required, it is specified here.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "username" property'>
+<div class="refsect2">
+<a name="NMSettingCdma--password-flags"></a><h3>The <code class="literal">"password-flags"</code> property</h3>
+<pre class="programlisting">  "password-flags"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title='The "password" property'><span class="type">"password"</span></a>:.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingCdma--username"></a><h3>The <code class="literal">"username"</code> property</h3>
 <pre class="programlisting">  "username"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -317,6 +351,6 @@ username is required, it is specified here.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index b84ed1bf..27c30ebd 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSetting.html" title="NMSetting">
 <link rel="next" href="NMSettingWired.html" title="NMSettingWired">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingConnection.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingConnection">
+<div class="refentry">
 <a name="NMSettingConnection"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,13 +39,13 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingConnection.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
+<a name="NMSettingConnectionError"></a><pre class="synopsis">
 #include &lt;nm-setting-connection.h&gt;
 
 #define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS" title="NM_SETTING_CONNECTION_SETTING_NAME">NM_SETTING_CONNECTION_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingConnection.html#NMSettingConnectionError" title="enum NMSettingConnectionError">NMSettingConnectionError</a>;
+enum                <a class="link" href="NMSettingConnection.html#NMSettingConnectionError">NMSettingConnectionError</a>;
 #define             <a class="link" href="NMSettingConnection.html#NM-TYPE-SETTING-CONNECTION-ERROR:CAPS" title="NM_TYPE_SETTING_CONNECTION_ERROR">NM_TYPE_SETTING_CONNECTION_ERROR</a>
 #define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR:CAPS" title="NM_SETTING_CONNECTION_ERROR">NM_SETTING_CONNECTION_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingConnection.html#nm-setting-connection-error-quark" title="nm_setting_connection_error_quark ()">nm_setting_connection_error_quark</a>   (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -55,6 +55,7 @@ enum                <a class="link" href="NMSettingConnection.html#NMSettingConn
 #define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT:CAPS" title="NM_SETTING_CONNECTION_AUTOCONNECT">NM_SETTING_CONNECTION_AUTOCONNECT</a>
 #define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-TIMESTAMP:CAPS" title="NM_SETTING_CONNECTION_TIMESTAMP">NM_SETTING_CONNECTION_TIMESTAMP</a>
 #define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-READ-ONLY:CAPS" title="NM_SETTING_CONNECTION_READ_ONLY">NM_SETTING_CONNECTION_READ_ONLY</a>
+#define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-PERMISSIONS:CAPS" title="NM_SETTING_CONNECTION_PERMISSIONS">NM_SETTING_CONNECTION_PERMISSIONS</a>
                     <a class="link" href="NMSettingConnection.html#NMSettingConnection-struct" title="NMSettingConnection">NMSettingConnection</a>;
                     <a class="link" href="NMSettingConnection.html#NMSettingConnectionClass" title="NMSettingConnectionClass">NMSettingConnectionClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-type" title="nm_setting_connection_get_type ()">nm_setting_connection_get_type</a>      (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -67,39 +68,63 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="returnvalue">guint64</span></a>             <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-timestamp" title="nm_setting_connection_get_timestamp ()">nm_setting_connection_get_timestamp</a> (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-read-only" title="nm_setting_connection_get_read_only ()">nm_setting_connection_get_read_only</a> (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-num-permissions" title="nm_setting_connection_get_num_permissions ()">nm_setting_connection_get_num_permissions</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-permission" title="nm_setting_connection_get_permission ()">nm_setting_connection_get_permission</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **out_ptype</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **out_pitem</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **out_detail</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingConnection.html#nm-setting-connection-permissions-user-allowed" title="nm_setting_connection_permissions_user_allowed ()">nm_setting_connection_permissions_user_allowed</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uname</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingConnection.html#nm-setting-connection-add-permission" title="nm_setting_connection_add_permission ()">nm_setting_connection_add_permission</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *ptype</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *pitem</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *detail</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingConnection.html#nm-setting-connection-remove-permission" title="nm_setting_connection_remove_permission ()">nm_setting_connection_remove_permission</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingConnectionError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingConnection
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingConnection.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingConnection.html#NMSettingConnection--autoconnect" title='The "autoconnect" property'>autoconnect</a>"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct
   "<a class="link" href="NMSettingConnection.html#NMSettingConnection--id" title='The "id" property'>id</a>"                       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title='The "permissions" property'>permissions</a>"              <span class="type">GSList_gchararray_</span>*   : Read / Write
   "<a class="link" href="NMSettingConnection.html#NMSettingConnection--read-only" title='The "read-only" property'>read-only</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct
   "<a class="link" href="NMSettingConnection.html#NMSettingConnection--timestamp" title='The "timestamp" property'>timestamp</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a>               : Read / Write / Construct
   "<a class="link" href="NMSettingConnection.html#NMSettingConnection--type" title='The "type" property'>type</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingConnection.html#NMSettingConnection--uuid" title='The "uuid" property'>uuid</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingConnection.description"></a><h2>Description</h2>
 <p>
 The <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes
-properties that apply to all <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> objects, regardless of what type
-of network connection they describe.  Each <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object must contain
+properties that apply to all <span class="type">NMConnection</span> objects, regardless of what type
+of network connection they describe.  Each <span class="type">NMConnection</span> object must contain
 a <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> setting.
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingConnection.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_CONNECTION_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-SETTING-NAME:CAPS"></a><h3>NM_SETTING_CONNECTION_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
 </pre>
@@ -107,7 +132,7 @@ a <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><s
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingConnectionError">
+<div class="refsect2">
 <a name="NMSettingConnectionError"></a><h3>enum NMSettingConnectionError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -145,14 +170,14 @@ Describes errors that may result from operations involving a
 <td><p><a name="NM-SETTING-CONNECTION-ERROR-TYPE-SETTING-NOT-FOUND:CAPS"></a><span class="term"><code class="literal">NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND</code></span></p></td>
 <td>the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object
   referenced by the setting name contained in the
-  <a class="link" href="NMSettingConnection.html#NMSettingConnection--type" title='The "type" property'><span class="type">"type"</span></a> property was not present in the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
+  <a class="link" href="NMSettingConnection.html#NMSettingConnection--type" title='The "type" property'><span class="type">"type"</span></a> property was not present in the <span class="type">NMConnection</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_CONNECTION_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-CONNECTION-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_CONNECTION_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_CONNECTION_ERROR (nm_setting_connection_error_get_type ()) 
 </pre>
@@ -160,7 +185,7 @@ Describes errors that may result from operations involving a
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-ERROR:CAPS"></a><h3>NM_SETTING_CONNECTION_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
 </pre>
@@ -168,7 +193,7 @@ Describes errors that may result from operations involving a
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-connection-error-quark"></a><h3>nm_setting_connection_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_connection_error_quark   (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -178,13 +203,12 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the error quark used for <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> errors.
-</td>
+<td>the error quark used for <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> errors.</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_ID">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-ID:CAPS"></a><h3>NM_SETTING_CONNECTION_ID</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_ID          "id"
 </pre>
@@ -192,7 +216,7 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_UUID">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-UUID:CAPS"></a><h3>NM_SETTING_CONNECTION_UUID</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_UUID        "uuid"
 </pre>
@@ -200,7 +224,7 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_TYPE">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-TYPE:CAPS"></a><h3>NM_SETTING_CONNECTION_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_TYPE        "type"
 </pre>
@@ -208,7 +232,7 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_AUTOCONNECT">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-AUTOCONNECT:CAPS"></a><h3>NM_SETTING_CONNECTION_AUTOCONNECT</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_AUTOCONNECT "autoconnect"
 </pre>
@@ -216,7 +240,7 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_TIMESTAMP">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-TIMESTAMP:CAPS"></a><h3>NM_SETTING_CONNECTION_TIMESTAMP</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_TIMESTAMP   "timestamp"
 </pre>
@@ -224,7 +248,7 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_CONNECTION_READ_ONLY">
+<div class="refsect2">
 <a name="NM-SETTING-CONNECTION-READ-ONLY:CAPS"></a><h3>NM_SETTING_CONNECTION_READ_ONLY</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_READ_ONLY   "read-only"
 </pre>
@@ -232,7 +256,15 @@ Registers an error quark for <a class="link" href="NMSettingConnection.html" tit
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingConnection">
+<div class="refsect2">
+<a name="NM-SETTING-CONNECTION-PERMISSIONS:CAPS"></a><h3>NM_SETTING_CONNECTION_PERMISSIONS</h3>
+<pre class="programlisting">#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingConnection-struct"></a><h3>NMSettingConnection</h3>
 <pre class="programlisting">typedef struct _NMSettingConnection NMSettingConnection;</pre>
 <p>
@@ -241,7 +273,7 @@ It should only be accessed through the functions described below.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingConnectionClass">
+<div class="refsect2">
 <a name="NMSettingConnectionClass"></a><h3>NMSettingConnectionClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -257,22 +289,14 @@ It should only be accessed through the functions described below.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-type"></a><h3>nm_setting_connection_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_connection_get_type      (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_new ()">
+<div class="refsect2">
 <a name="nm-setting-connection-new"></a><h3>nm_setting_connection_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_connection_new           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -282,13 +306,12 @@ Creates a new <a class="link" href="NMSettingConnection.html" title="NMSettingCo
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new empty <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> object
-</td>
+<td>the new empty <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> object</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_id ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-id"></a><h3>nm_setting_connection_get_id ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_connection_get_id        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
 <p>
@@ -304,14 +327,13 @@ Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the connection ID
-</td>
+<td>the connection ID</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_uuid ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-uuid"></a><h3>nm_setting_connection_get_uuid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_connection_get_uuid      (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
 <p>
@@ -327,14 +349,13 @@ Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the connection UUID
-</td>
+<td>the connection UUID</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_connection_type ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-connection-type"></a><h3>nm_setting_connection_get_connection_type ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_connection_get_connection_type
                                                         (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
@@ -351,14 +372,13 @@ Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the connection type
-</td>
+<td>the connection type</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_autoconnect ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-autoconnect"></a><h3>nm_setting_connection_get_autoconnect ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_connection_get_autoconnect
                                                         (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
@@ -375,14 +395,13 @@ Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the connection's autoconnect behavior
-</td>
+<td>the connection's autoconnect behavior</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_timestamp ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-timestamp"></a><h3>nm_setting_connection_get_timestamp ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="returnvalue">guint64</span></a>             nm_setting_connection_get_timestamp (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
 <p>
@@ -398,14 +417,13 @@ Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the connection's timestamp
-</td>
+<td>the connection's timestamp</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_connection_get_read_only ()">
+<div class="refsect2">
 <a name="nm-setting-connection-get-read-only"></a><h3>nm_setting_connection_get_read_only ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_connection_get_read_only (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
 <p>
@@ -421,16 +439,184 @@ Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the connection is read-only, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the connection is read-only, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is not</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-connection-get-num-permissions"></a><h3>nm_setting_connection_get_num_permissions ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_connection_get_num_permissions
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
+<p>
+Returns the number of entires in the <a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title='The "permissions" property'><span class="type">"permissions"</span></a>
+property of this setting.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
 </td>
 </tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the number of permissions entires</td>
+</tr>
 </tbody>
 </table></div>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-connection-get-permission"></a><h3>nm_setting_connection_get_permission ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_connection_get_permission
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **out_ptype</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **out_pitem</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> **out_detail</code></em>);</pre>
+<p>
+Retrieve one of the entries of the <a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title='The "permissions" property'><span class="type">"permissions"</span></a> property
+of this setting.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>idx</code></em> :</span></p></td>
+<td>the zero-based index of the permissions entry</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_ptype</code></em> :</span></p></td>
+<td>on return, the permission type (at this time, always "user")</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_pitem</code></em> :</span></p></td>
+<td>on return, the permission item (formatted accoring to <em class="parameter"><code>ptype</code></em>, see
+<a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title='The "permissions" property'><span class="type">"permissions"</span></a> for more detail</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>out_detail</code></em> :</span></p></td>
+<td>on return, the permission detail (at this time, always NULL)</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if a permission was returned, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if <em class="parameter"><code>idx</code></em> was invalid</td>
+</tr>
+</tbody>
+</table></div>
 </div>
-<div class="refsect1" title="Property Details">
+<hr>
+<div class="refsect2">
+<a name="nm-setting-connection-permissions-user-allowed"></a><h3>nm_setting_connection_permissions_user_allowed ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_connection_permissions_user_allowed
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uname</code></em>);</pre>
+<p>
+Checks whether the given username is allowed to view/access this connection.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>uname</code></em> :</span></p></td>
+<td>the user name to check permissions for</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the requested user is allowed to view this connection,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if the given user is not allowed to view this connection</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-connection-add-permission"></a><h3>nm_setting_connection_add_permission ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_connection_add_permission
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *ptype</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *pitem</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *detail</code></em>);</pre>
+<p>
+Adds a permission to the connection's permission list.  At this time, only
+the "user" permission type is supported, and <em class="parameter"><code>pitem</code></em> must be a username. See
+<a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title='The "permissions" property'><span class="type">"permissions"</span></a>: for more details.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>ptype</code></em> :</span></p></td>
+<td>the permission type; at this time only "user" is supported</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>pitem</code></em> :</span></p></td>
+<td>the permission item formatted as required for <em class="parameter"><code>ptype</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>detail</code></em> :</span></p></td>
+<td>unused at this time; must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <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><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>TRUE if the permission was unique and was successfully added to the
+list, FALSE if <em class="parameter"><code>ptype</code></em> or <em class="parameter"><code>pitem</code></em> was invalid or it the permission was already
+present in the list</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-connection-remove-permission"></a><h3>nm_setting_connection_remove_permission ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_connection_remove_permission
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);</pre>
+<p>
+Removes the permission at index <em class="parameter"><code>idx</code></em> from the connection.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>idx</code></em> :</span></p></td>
+<td>the zero-based index of the permission to remove</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<div class="refsect1">
 <a name="NMSettingConnection.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "autoconnect" property'>
+<div class="refsect2">
 <a name="NMSettingConnection--autoconnect"></a><h3>The <code class="literal">"autoconnect"</code> property</h3>
 <pre class="programlisting">  "autoconnect"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -442,7 +628,7 @@ intervention to activate the connection.  Defaults to <a href="http://library.gn
 <p>Default value: TRUE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "id" property'>
+<div class="refsect2">
 <a name="NMSettingConnection--id"></a><h3>The <code class="literal">"id"</code> property</h3>
 <pre class="programlisting">  "id"                       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -452,7 +638,29 @@ A human readable unique idenfier for the connection, like "Work WiFi" or
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "read-only" property'>
+<div class="refsect2">
+<a name="NMSettingConnection--permissions"></a><h3>The <code class="literal">"permissions"</code> property</h3>
+<pre class="programlisting">  "permissions"              <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
+<p>
+An array of strings defining what access a given user has to this
+connection.  If this is NULL or empty, all users are allowed to access
+this connection.  Otherwise a user is allowed to access this connection
+if and only if they are in this list. Each entry is of the form
+"[type]:[id]:[reserved]", for example:
+</p>
+<p>
+   user:dcbw:blah
+</p>
+<p>
+At this time only the 'user' [type] is allowed.  Any other values are
+ignored and reserved for future use.  [id] is the username that this
+permission refers to, which may not contain the ':' character. Any
+[reserved] information present must be ignored and is reserved for
+future use.  All of [type], [id], and [reserved] must be valid UTF-8.
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingConnection--read-only"></a><h3>The <code class="literal">"read-only"</code> property</h3>
 <pre class="programlisting">  "read-only"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -463,7 +671,7 @@ if the connection is read-only and cannot be modified.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "timestamp" property'>
+<div class="refsect2">
 <a name="NMSettingConnection--timestamp"></a><h3>The <code class="literal">"timestamp"</code> property</h3>
 <pre class="programlisting">  "timestamp"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a>               : Read / Write / Construct</pre>
 <p>
@@ -473,7 +681,7 @@ _successfully_ fully activated.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "type" property'>
+<div class="refsect2">
 <a name="NMSettingConnection--type"></a><h3>The <code class="literal">"type"</code> property</h3>
 <pre class="programlisting">  "type"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -485,7 +693,7 @@ type's parameters.  For example, for WiFi devices, the name of the
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "uuid" property'>
+<div class="refsect2">
 <a name="NMSettingConnection--uuid"></a><h3>The <code class="literal">"uuid"</code> property</h3>
 <pre class="programlisting">  "uuid"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -509,6 +717,6 @@ be generated by <a class="link" href="libnm-util-nm-utils.html#nm-utils-uuid-gen
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index 47af8253..4a2d7925 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingCdma.html" title="NMSettingCdma">
 <link rel="next" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingGsm.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingGsm">
+<div class="refentry">
 <a name="NMSettingGsm"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,29 +39,24 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingGsm.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-SETTING-NAME:CAPS" title="NM_SETTING_GSM_SETTING_NAME">NM_SETTING_GSM_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingGsm.html#NMSettingGsmError" title="enum NMSettingGsmError">NMSettingGsmError</a>;
+<a name="NMSettingGsmError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-SETTING-NAME:CAPS" title="NM_SETTING_GSM_SETTING_NAME">NM_SETTING_GSM_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingGsm.html#NMSettingGsmError">NMSettingGsmError</a>;
 #define             <a class="link" href="NMSettingGsm.html#NM-TYPE-SETTING-GSM-ERROR:CAPS" title="NM_TYPE_SETTING_GSM_ERROR">NM_TYPE_SETTING_GSM_ERROR</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-ERROR:CAPS" title="NM_SETTING_GSM_ERROR">NM_SETTING_GSM_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingGsm.html#nm-setting-gsm-error-quark" title="nm_setting_gsm_error_quark ()">nm_setting_gsm_error_quark</a>          (<em class="parameter"><code><span class="type">void</span></code></em>);
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-NUMBER:CAPS" title="NM_SETTING_GSM_NUMBER">NM_SETTING_GSM_NUMBER</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-USERNAME:CAPS" title="NM_SETTING_GSM_USERNAME">NM_SETTING_GSM_USERNAME</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD:CAPS" title="NM_SETTING_GSM_PASSWORD">NM_SETTING_GSM_PASSWORD</a>
+#define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD-FLAGS:CAPS" title="NM_SETTING_GSM_PASSWORD_FLAGS">NM_SETTING_GSM_PASSWORD_FLAGS</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-APN:CAPS" title="NM_SETTING_GSM_APN">NM_SETTING_GSM_APN</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-ID:CAPS" title="NM_SETTING_GSM_NETWORK_ID">NM_SETTING_GSM_NETWORK_ID</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE:CAPS" title="NM_SETTING_GSM_NETWORK_TYPE">NM_SETTING_GSM_NETWORK_TYPE</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS" title="NM_SETTING_GSM_ALLOWED_BANDS">NM_SETTING_GSM_ALLOWED_BANDS</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PIN:CAPS" title="NM_SETTING_GSM_PIN">NM_SETTING_GSM_PIN</a>
+#define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PIN-FLAGS:CAPS" title="NM_SETTING_GSM_PIN_FLAGS">NM_SETTING_GSM_PIN_FLAGS</a>
 #define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-HOME-ONLY:CAPS" title="NM_SETTING_GSM_HOME_ONLY">NM_SETTING_GSM_HOME_ONLY</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PUK:CAPS" title="NM_SETTING_GSM_PUK">NM_SETTING_GSM_PUK</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-BAND:CAPS" title="NM_SETTING_GSM_BAND">NM_SETTING_GSM_BAND</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-ANY:CAPS" title="NM_GSM_NETWORK_ANY">NM_GSM_NETWORK_ANY</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-UMTS-HSPA:CAPS" title="NM_GSM_NETWORK_UMTS_HSPA">NM_GSM_NETWORK_UMTS_HSPA</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-GPRS-EDGE:CAPS" title="NM_GSM_NETWORK_GPRS_EDGE">NM_GSM_NETWORK_GPRS_EDGE</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS" title="NM_GSM_NETWORK_PREFER_UMTS_HSPA">NM_GSM_NETWORK_PREFER_UMTS_HSPA</a>
-#define             <a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS" title="NM_GSM_NETWORK_PREFER_GPRS_EDGE">NM_GSM_NETWORK_PREFER_GPRS_EDGE</a>
 enum                <a class="link" href="NMSettingGsm.html#NMSettingGsmNetworkType" title="enum NMSettingGsmNetworkType">NMSettingGsmNetworkType</a>;
 enum                <a class="link" href="NMSettingGsm.html#NMSettingGsmNetworkBand" title="enum NMSettingGsmNetworkBand">NMSettingGsmNetworkBand</a>;
                     <a class="link" href="NMSettingGsm.html#NMSettingGsm-struct" title="NMSettingGsm">NMSettingGsm</a>;
@@ -77,42 +72,46 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-allowed-bands" title="nm_setting_gsm_get_allowed_bands ()">nm_setting_gsm_get_allowed_bands</a>    (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-pin" title="nm_setting_gsm_get_pin ()">nm_setting_gsm_get_pin</a>              (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-home-only" title="nm_setting_gsm_get_home_only ()">nm_setting_gsm_get_home_only</a>        (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-puk" title="nm_setting_gsm_get_puk ()">nm_setting_gsm_get_puk</a>              (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
-<span class="returnvalue">int</span>                 <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-band" title="nm_setting_gsm_get_band ()">nm_setting_gsm_get_band</a>             (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-pin-flags" title="nm_setting_gsm_get_pin_flags ()">nm_setting_gsm_get_pin_flags</a>      (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-password-flags" title="nm_setting_gsm_get_password_flags ()">nm_setting_gsm_get_password_flags</a> (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingGsm.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingGsmError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingGsm
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingGsm.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--allowed-bands" title='The "allowed-bands" property'>allowed-bands</a>"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--apn" title='The "apn" property'>apn</a>"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
-  "<a class="link" href="NMSettingGsm.html#NMSettingGsm--band" title='The "band" property'>band</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read / Write / Construct
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--home-only" title='The "home-only" property'>home-only</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--network-id" title='The "network-id" property'>network-id</a>"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--network-type" title='The "network-type" property'>network-type</a>"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read / Write / Construct
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--number" title='The "number" property'>number</a>"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--password" title='The "password" property'>password</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingGsm.html#NMSettingGsm--password-flags" title='The "password-flags" property'>password-flags</a>"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title='The "pin" property'>pin</a>"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
-  "<a class="link" href="NMSettingGsm.html#NMSettingGsm--puk" title='The "puk" property'>puk</a>"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingGsm.html#NMSettingGsm--pin-flags" title='The "pin-flags" property'>pin-flags</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSettingGsm.html#NMSettingGsm--username" title='The "username" property'>username</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingGsm.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingGsm.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_GSM_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-GSM-SETTING-NAME:CAPS"></a><h3>NM_SETTING_GSM_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_SETTING_NAME "gsm"
 </pre>
@@ -120,7 +119,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingGsmError">
+<div class="refsect2">
 <a name="NMSettingGsmError"></a><h3>enum NMSettingGsmError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -134,7 +133,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_GSM_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-GSM-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_GSM_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_GSM_ERROR (nm_setting_gsm_error_get_type ()) 
 </pre>
@@ -142,7 +141,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-GSM-ERROR:CAPS"></a><h3>NM_SETTING_GSM_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
 </pre>
@@ -150,150 +149,102 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-error-quark"></a><h3>nm_setting_gsm_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_gsm_error_quark          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_NUMBER">
+<div class="refsect2">
 <a name="NM-SETTING-GSM-NUMBER:CAPS"></a><h3>NM_SETTING_GSM_NUMBER</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_NUMBER        "number"
+<pre class="programlisting">#define NM_SETTING_GSM_NUMBER         "number"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_USERNAME">
+<div class="refsect2">
 <a name="NM-SETTING-GSM-USERNAME:CAPS"></a><h3>NM_SETTING_GSM_USERNAME</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_USERNAME      "username"
+<pre class="programlisting">#define NM_SETTING_GSM_USERNAME       "username"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_PASSWORD">
+<div class="refsect2">
 <a name="NM-SETTING-GSM-PASSWORD:CAPS"></a><h3>NM_SETTING_GSM_PASSWORD</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_PASSWORD      "password"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTING_GSM_APN">
-<a name="NM-SETTING-GSM-APN:CAPS"></a><h3>NM_SETTING_GSM_APN</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_APN           "apn"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTING_GSM_NETWORK_ID">
-<a name="NM-SETTING-GSM-NETWORK-ID:CAPS"></a><h3>NM_SETTING_GSM_NETWORK_ID</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_NETWORK_ID    "network-id"
+<pre class="programlisting">#define NM_SETTING_GSM_PASSWORD       "password"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_NETWORK_TYPE">
-<a name="NM-SETTING-GSM-NETWORK-TYPE:CAPS"></a><h3>NM_SETTING_GSM_NETWORK_TYPE</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_NETWORK_TYPE  "network-type"
+<div class="refsect2">
+<a name="NM-SETTING-GSM-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_GSM_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_ALLOWED_BANDS">
-<a name="NM-SETTING-GSM-ALLOWED-BANDS:CAPS"></a><h3>NM_SETTING_GSM_ALLOWED_BANDS</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_ALLOWED_BANDS "allowed-bands"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTING_GSM_PIN">
-<a name="NM-SETTING-GSM-PIN:CAPS"></a><h3>NM_SETTING_GSM_PIN</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_PIN           "pin"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTING_GSM_HOME_ONLY">
-<a name="NM-SETTING-GSM-HOME-ONLY:CAPS"></a><h3>NM_SETTING_GSM_HOME_ONLY</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_HOME_ONLY     "home-only"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="NM_SETTING_GSM_PUK">
-<a name="NM-SETTING-GSM-PUK:CAPS"></a><h3>NM_SETTING_GSM_PUK</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_PUK           "puk"
+<div class="refsect2">
+<a name="NM-SETTING-GSM-APN:CAPS"></a><h3>NM_SETTING_GSM_APN</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_APN            "apn"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_GSM_BAND">
-<a name="NM-SETTING-GSM-BAND:CAPS"></a><h3>NM_SETTING_GSM_BAND</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_BAND          "band"
+<div class="refsect2">
+<a name="NM-SETTING-GSM-NETWORK-ID:CAPS"></a><h3>NM_SETTING_GSM_NETWORK_ID</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_NETWORK_ID     "network-id"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_GSM_NETWORK_ANY">
-<a name="NM-GSM-NETWORK-ANY:CAPS"></a><h3>NM_GSM_NETWORK_ANY</h3>
-<pre class="programlisting">#define NM_GSM_NETWORK_ANY              NM_SETTING_GSM_NETWORK_TYPE_ANY
+<div class="refsect2">
+<a name="NM-SETTING-GSM-NETWORK-TYPE:CAPS"></a><h3>NM_SETTING_GSM_NETWORK_TYPE</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_NETWORK_TYPE   "network-type"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_GSM_NETWORK_UMTS_HSPA">
-<a name="NM-GSM-NETWORK-UMTS-HSPA:CAPS"></a><h3>NM_GSM_NETWORK_UMTS_HSPA</h3>
-<pre class="programlisting">#define NM_GSM_NETWORK_UMTS_HSPA        NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA
+<div class="refsect2">
+<a name="NM-SETTING-GSM-ALLOWED-BANDS:CAPS"></a><h3>NM_SETTING_GSM_ALLOWED_BANDS</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_ALLOWED_BANDS  "allowed-bands"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_GSM_NETWORK_GPRS_EDGE">
-<a name="NM-GSM-NETWORK-GPRS-EDGE:CAPS"></a><h3>NM_GSM_NETWORK_GPRS_EDGE</h3>
-<pre class="programlisting">#define NM_GSM_NETWORK_GPRS_EDGE        NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE
+<div class="refsect2">
+<a name="NM-SETTING-GSM-PIN:CAPS"></a><h3>NM_SETTING_GSM_PIN</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_PIN            "pin"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_GSM_NETWORK_PREFER_UMTS_HSPA">
-<a name="NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS"></a><h3>NM_GSM_NETWORK_PREFER_UMTS_HSPA</h3>
-<pre class="programlisting">#define NM_GSM_NETWORK_PREFER_UMTS_HSPA NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA
+<div class="refsect2">
+<a name="NM-SETTING-GSM-PIN-FLAGS:CAPS"></a><h3>NM_SETTING_GSM_PIN_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_GSM_NETWORK_PREFER_GPRS_EDGE">
-<a name="NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS"></a><h3>NM_GSM_NETWORK_PREFER_GPRS_EDGE</h3>
-<pre class="programlisting">#define NM_GSM_NETWORK_PREFER_GPRS_EDGE NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE
+<div class="refsect2">
+<a name="NM-SETTING-GSM-HOME-ONLY:CAPS"></a><h3>NM_SETTING_GSM_HOME_ONLY</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_HOME_ONLY      "home-only"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingGsmNetworkType">
+<div class="refsect2">
 <a name="NMSettingGsmNetworkType"></a><h3>enum NMSettingGsmNetworkType</h3>
 <pre class="programlisting">typedef enum {
 	NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
@@ -307,7 +258,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingGsmNetworkBand">
+<div class="refsect2">
 <a name="NMSettingGsmNetworkBand"></a><h3>enum NMSettingGsmNetworkBand</h3>
 <pre class="programlisting">typedef enum {
 	NM_SETTING_GSM_BAND_UNKNOWN      = 0x00000000,
@@ -330,14 +281,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingGsm">
+<div class="refsect2">
 <a name="NMSettingGsm-struct"></a><h3>NMSettingGsm</h3>
 <pre class="programlisting">typedef struct _NMSettingGsm NMSettingGsm;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingGsmClass">
+<div class="refsect2">
 <a name="NMSettingGsmClass"></a><h3>NMSettingGsmClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -353,281 +304,126 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-type"></a><h3>nm_setting_gsm_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_gsm_get_type             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_new ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-new"></a><h3>nm_setting_gsm_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_gsm_new                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_number ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-number"></a><h3>nm_setting_gsm_get_number ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_number           (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_username ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-username"></a><h3>nm_setting_gsm_get_username ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_username         (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_password ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-password"></a><h3>nm_setting_gsm_get_password ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_password         (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_apn ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-apn"></a><h3>nm_setting_gsm_get_apn ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_apn              (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_network_id ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-network-id"></a><h3>nm_setting_gsm_get_network_id ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_network_id       (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_network_type ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-network-type"></a><h3>nm_setting_gsm_get_network_type ()</h3>
 <pre class="programlisting"><span class="returnvalue">int</span>                 nm_setting_gsm_get_network_type     (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_allowed_bands ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-allowed-bands"></a><h3>nm_setting_gsm_get_allowed_bands ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_gsm_get_allowed_bands    (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_pin ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-pin"></a><h3>nm_setting_gsm_get_pin ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_pin              (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_home_only ()">
+<div class="refsect2">
 <a name="nm-setting-gsm-get-home-only"></a><h3>nm_setting_gsm_get_home_only ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_gsm_get_home_only        (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_puk ()">
-<a name="nm-setting-gsm-get-puk"></a><h3>nm_setting_gsm_get_puk ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_gsm_get_puk              (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
-<p>
-</p>
+<div class="refsect2">
+<a name="nm-setting-gsm-get-pin-flags"></a><h3>nm_setting_gsm_get_pin_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_gsm_get_pin_flags      (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title='The "pin" property'><span class="type">"pin"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_gsm_get_band ()">
-<a name="nm-setting-gsm-get-band"></a><h3>nm_setting_gsm_get_band ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>                 nm_setting_gsm_get_band             (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
-<p>
-</p>
+<div class="refsect2">
+<a name="nm-setting-gsm-get-password-flags"></a><h3>nm_setting_gsm_get_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingGsm.html#NMSettingGsm--password" title='The "password" property'><span class="type">"password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingGsm.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "allowed-bands" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--allowed-bands"></a><h3>The <code class="literal">"allowed-bands"</code> property</h3>
 <pre class="programlisting">  "allowed-bands"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -638,7 +434,7 @@ frequency band control.
 <p>Default value: 1</p>
 </div>
 <hr>
-<div class="refsect2" title='The "apn" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--apn"></a><h3>The <code class="literal">"apn"</code> property</h3>
 <pre class="programlisting">  "apn"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -653,17 +449,7 @@ GSM 03.60 Section 14.9.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "band" property'>
-<a name="NMSettingGsm--band"></a><h3>The <code class="literal">"band"</code> property</h3>
-<pre class="programlisting">  "band"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read / Write / Construct</pre>
-<p>
-DEPRECATED
-</p>
-<p>Allowed values: [-1,5]</p>
-<p>Default value: -1</p>
-</div>
-<hr>
-<div class="refsect2" title='The "home-only" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--home-only"></a><h3>The <code class="literal">"home-only"</code> property</h3>
 <pre class="programlisting">  "home-only"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write</pre>
 <p>
@@ -673,7 +459,7 @@ Connections to roaming networks will not be made.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "network-id" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--network-id"></a><h3>The <code class="literal">"network-id"</code> property</h3>
 <pre class="programlisting">  "network-id"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -686,7 +472,7 @@ roaming control of the device is not otherwise possible.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "network-type" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--network-type"></a><h3>The <code class="literal">"network-type"</code> property</h3>
 <pre class="programlisting">  "network-type"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>                  : Read / Write / Construct</pre>
 <p>
@@ -695,11 +481,11 @@ technologies.  The permitted values are: -1: any, 0: 3G only,
 1: GPRS/EDGE only, 2: prefer 3G, and 3: prefer 2G.  Note that not all
 devices allow network preference control.
 </p>
-<p>Allowed values: [-1,3]</p>
+<p>Allowed values: [G_MAXULONG,3]</p>
 <p>Default value: -1</p>
 </div>
 <hr>
-<div class="refsect2" title='The "number" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--number"></a><h3>The <code class="literal">"number"</code> property</h3>
 <pre class="programlisting">  "number"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -711,7 +497,7 @@ automatically when required.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "password" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--password"></a><h3>The <code class="literal">"password"</code> property</h3>
 <pre class="programlisting">  "password"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -722,7 +508,17 @@ password is required, it is specified here.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "pin" property'>
+<div class="refsect2">
+<a name="NMSettingGsm--password-flags"></a><h3>The <code class="literal">"password-flags"</code> property</h3>
+<pre class="programlisting">  "password-flags"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSettingGsm.html#NMSettingGsm--password" title='The "password" property'><span class="type">"password"</span></a>:.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingGsm--pin"></a><h3>The <code class="literal">"pin"</code> property</h3>
 <pre class="programlisting">  "pin"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -733,16 +529,17 @@ the device.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "puk" property'>
-<a name="NMSettingGsm--puk"></a><h3>The <code class="literal">"puk"</code> property</h3>
-<pre class="programlisting">  "puk"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
+<div class="refsect2">
+<a name="NMSettingGsm--pin-flags"></a><h3>The <code class="literal">"pin-flags"</code> property</h3>
+<pre class="programlisting">  "pin-flags"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
 <p>
-DEPRECATED
+Flags indicating how to handle <a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title='The "pin" property'><span class="type">"pin"</span></a>:.
 </p>
-<p>Default value: NULL</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "username" property'>
+<div class="refsect2">
 <a name="NMSettingGsm--username"></a><h3>The <code class="literal">"username"</code> property</h3>
 <pre class="programlisting">  "username"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -756,6 +553,6 @@ username is required, it is specified here.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index d4b1422f..6a701adf 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSetting8021x.html" title="NMSetting8021x">
 <link rel="next" href="NMSettingIP6Config.html" title="NMSettingIP6Config">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingIP4Config.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingIP4Config">
+<div class="refentry">
 <a name="NMSettingIP4Config"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingIP4Config.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS" title="NM_SETTING_IP4_CONFIG_SETTING_NAME">NM_SETTING_IP4_CONFIG_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingIP4Config.html#NMSettingIP4ConfigError" title="enum NMSettingIP4ConfigError">NMSettingIP4ConfigError</a>;
+<a name="NMSettingIP4ConfigError"></a><a name="NMIP4Address"></a><a name="NMIP4Route"></a><pre class="synopsis">#define             <a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS" title="NM_SETTING_IP4_CONFIG_SETTING_NAME">NM_SETTING_IP4_CONFIG_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingIP4Config.html#NMSettingIP4ConfigError">NMSettingIP4ConfigError</a>;
 #define             <a class="link" href="NMSettingIP4Config.html#NM-TYPE-SETTING-IP4-CONFIG-ERROR:CAPS" title="NM_TYPE_SETTING_IP4_CONFIG_ERROR">NM_TYPE_SETTING_IP4_CONFIG_ERROR</a>
 #define             <a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-ERROR:CAPS" title="NM_SETTING_IP4_CONFIG_ERROR">NM_SETTING_IP4_CONFIG_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-error-quark" title="nm_setting_ip4_config_error_quark ()">nm_setting_ip4_config_error_quark</a>   (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -63,40 +63,42 @@ enum                <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Co
 #define             <a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-MANUAL:CAPS" title="NM_SETTING_IP4_CONFIG_METHOD_MANUAL">NM_SETTING_IP4_CONFIG_METHOD_MANUAL</a>
 #define             <a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS" title="NM_SETTING_IP4_CONFIG_METHOD_SHARED">NM_SETTING_IP4_CONFIG_METHOD_SHARED</a>
 #define             <a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS" title="NM_SETTING_IP4_CONFIG_METHOD_DISABLED">NM_SETTING_IP4_CONFIG_METHOD_DISABLED</a>
-typedef             <a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address">NMIP4Address</a>;
-<a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-new" title="nm_ip4_address_new ()">nm_ip4_address_new</a>                  (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-dup" title="nm_ip4_address_dup ()">nm_ip4_address_dup</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *source</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-ref" title="nm_ip4_address_ref ()">nm_ip4_address_ref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-unref" title="nm_ip4_address_unref ()">nm_ip4_address_unref</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-compare" title="nm_ip4_address_compare ()">nm_ip4_address_compare</a>              (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *other</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-address" title="nm_ip4_address_get_address ()">nm_ip4_address_get_address</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-set-address" title="nm_ip4_address_set_address ()">nm_ip4_address_set_address</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+typedef             <a class="link" href="NMSettingIP4Config.html#NMIP4Address">NMIP4Address</a>;
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-type" title="nm_ip4_address_get_type ()">nm_ip4_address_get_type</a>             (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-new" title="nm_ip4_address_new ()">nm_ip4_address_new</a>                  (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-dup" title="nm_ip4_address_dup ()">nm_ip4_address_dup</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *source</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-ref" title="nm_ip4_address_ref ()">nm_ip4_address_ref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-unref" title="nm_ip4_address_unref ()">nm_ip4_address_unref</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-compare" title="nm_ip4_address_compare ()">nm_ip4_address_compare</a>              (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *other</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-address" title="nm_ip4_address_get_address ()">nm_ip4_address_get_address</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-set-address" title="nm_ip4_address_set_address ()">nm_ip4_address_set_address</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> addr</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-prefix" title="nm_ip4_address_get_prefix ()">nm_ip4_address_get_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-set-prefix" title="nm_ip4_address_set_prefix ()">nm_ip4_address_set_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-prefix" title="nm_ip4_address_get_prefix ()">nm_ip4_address_get_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-set-prefix" title="nm_ip4_address_set_prefix ()">nm_ip4_address_set_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-gateway" title="nm_ip4_address_get_gateway ()">nm_ip4_address_get_gateway</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-set-gateway" title="nm_ip4_address_set_gateway ()">nm_ip4_address_set_gateway</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-gateway" title="nm_ip4_address_get_gateway ()">nm_ip4_address_get_gateway</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-set-gateway" title="nm_ip4_address_set_gateway ()">nm_ip4_address_set_gateway</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> gateway</code></em>);
-typedef             <a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route">NMIP4Route</a>;
-<a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-new" title="nm_ip4_route_new ()">nm_ip4_route_new</a>                    (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-dup" title="nm_ip4_route_dup ()">nm_ip4_route_dup</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-ref" title="nm_ip4_route_ref ()">nm_ip4_route_ref</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-unref" title="nm_ip4_route_unref ()">nm_ip4_route_unref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-compare" title="nm_ip4_route_compare ()">nm_ip4_route_compare</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *other</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-dest" title="nm_ip4_route_get_dest ()">nm_ip4_route_get_dest</a>               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-dest" title="nm_ip4_route_set_dest ()">nm_ip4_route_set_dest</a>               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+typedef             <a class="link" href="NMSettingIP4Config.html#NMIP4Route">NMIP4Route</a>;
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-type" title="nm_ip4_route_get_type ()">nm_ip4_route_get_type</a>               (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-new" title="nm_ip4_route_new ()">nm_ip4_route_new</a>                    (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-dup" title="nm_ip4_route_dup ()">nm_ip4_route_dup</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-ref" title="nm_ip4_route_ref ()">nm_ip4_route_ref</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-unref" title="nm_ip4_route_unref ()">nm_ip4_route_unref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-compare" title="nm_ip4_route_compare ()">nm_ip4_route_compare</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *other</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-dest" title="nm_ip4_route_get_dest ()">nm_ip4_route_get_dest</a>               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-dest" title="nm_ip4_route_set_dest ()">nm_ip4_route_set_dest</a>               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> dest</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-prefix" title="nm_ip4_route_get_prefix ()">nm_ip4_route_get_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-prefix" title="nm_ip4_route_set_prefix ()">nm_ip4_route_set_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-prefix" title="nm_ip4_route_get_prefix ()">nm_ip4_route_get_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-prefix" title="nm_ip4_route_set_prefix ()">nm_ip4_route_set_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-next-hop" title="nm_ip4_route_get_next_hop ()">nm_ip4_route_get_next_hop</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-next-hop" title="nm_ip4_route_set_next_hop ()">nm_ip4_route_set_next_hop</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-next-hop" title="nm_ip4_route_get_next_hop ()">nm_ip4_route_get_next_hop</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-next-hop" title="nm_ip4_route_set_next_hop ()">nm_ip4_route_set_next_hop</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> next_hop</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-metric" title="nm_ip4_route_get_metric ()">nm_ip4_route_get_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-metric" title="nm_ip4_route_set_metric ()">nm_ip4_route_set_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-metric" title="nm_ip4_route_get_metric ()">nm_ip4_route_get_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-set-metric" title="nm_ip4_route_set_metric ()">nm_ip4_route_set_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> metric</code></em>);
                     <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config-struct" title="NMSettingIP4Config">NMSettingIP4Config</a>;
                     <a class="link" href="NMSettingIP4Config.html#NMSettingIP4ConfigClass" title="NMSettingIP4ConfigClass">NMSettingIP4ConfigClass</a>;
@@ -126,10 +128,10 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-num-addresses" title="nm_setting_ip4_config_get_num_addresses ()">nm_setting_ip4_config_get_num_addresses</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);
-<a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-address" title="nm_setting_ip4_config_get_address ()">nm_setting_ip4_config_get_address</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
+<a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-address" title="nm_setting_ip4_config_get_address ()">nm_setting_ip4_config_get_address</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-add-address" title="nm_setting_ip4_config_add_address ()">nm_setting_ip4_config_add_address</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-remove-address" title="nm_setting_ip4_config_remove_address ()">nm_setting_ip4_config_remove_address</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
@@ -137,10 +139,10 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-num-routes" title="nm_setting_ip4_config_get_num_routes ()">nm_setting_ip4_config_get_num_routes</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);
-<a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-route" title="nm_setting_ip4_config_get_route ()">nm_setting_ip4_config_get_route</a>     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
+<a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-route" title="nm_setting_ip4_config_get_route ()">nm_setting_ip4_config_get_route</a>     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-add-route" title="nm_setting_ip4_config_add_route ()">nm_setting_ip4_config_add_route</a>     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-remove-route" title="nm_setting_ip4_config_remove_route ()">nm_setting_ip4_config_remove_route</a>  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-clear-routes" title="nm_setting_ip4_config_clear_routes ()">nm_setting_ip4_config_clear_routes</a>  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);
@@ -159,15 +161,27 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-may-fail" title="nm_setting_ip4_config_get_may_fail ()">nm_setting_ip4_config_get_may_fail</a>  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingIP4Config.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingIP4ConfigError
+</pre>
+<pre class="synopsis">
+  GBoxed
+   +----NMIP4Address
+</pre>
+<pre class="synopsis">
+  GBoxed
+   +----NMIP4Route
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingIP4Config
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingIP4Config.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--addresses" title='The "addresses" property'>addresses</a>"                <span class="type">GPtrArray_GArray_guint__</span>*  : Read / Write
@@ -184,14 +198,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
   "<a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--routes" title='The "routes" property'>routes</a>"                   <span class="type">GPtrArray_GArray_guint__</span>*  : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingIP4Config.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingIP4Config.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
 </pre>
@@ -199,7 +213,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingIP4ConfigError">
+<div class="refsect2">
 <a name="NMSettingIP4ConfigError"></a><h3>enum NMSettingIP4ConfigError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -213,7 +227,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_IP4_CONFIG_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-IP4-CONFIG-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_IP4_CONFIG_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_IP4_CONFIG_ERROR (nm_setting_ip4_config_error_get_type ()) 
 </pre>
@@ -221,7 +235,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-ERROR:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
 </pre>
@@ -229,22 +243,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-error-quark"></a><h3>nm_setting_ip4_config_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_ip4_config_error_quark   (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_METHOD">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD             "method"
 </pre>
@@ -252,7 +258,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_DNS">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DNS:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DNS                "dns"
 </pre>
@@ -260,7 +266,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_DNS_SEARCH">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DNS-SEARCH:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DNS_SEARCH</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DNS_SEARCH         "dns-search"
 </pre>
@@ -268,7 +274,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_ADDRESSES">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-ADDRESSES:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_ADDRESSES</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
 </pre>
@@ -276,7 +282,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_ROUTES">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-ROUTES:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
 </pre>
@@ -284,7 +290,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-IGNORE-AUTO-ROUTES:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 </pre>
@@ -292,7 +298,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-IGNORE-AUTO-DNS:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 </pre>
@@ -300,7 +306,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DHCP-CLIENT-ID:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
 </pre>
@@ -308,7 +314,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DHCP-SEND-HOSTNAME:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
 </pre>
@@ -316,7 +322,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DHCP-HOSTNAME:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
 </pre>
@@ -324,7 +330,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_NEVER_DEFAULT">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_NEVER_DEFAULT</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
 </pre>
@@ -332,7 +338,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_MAY_FAIL">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-MAY-FAIL:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_MAY_FAIL</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
 </pre>
@@ -340,7 +346,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_METHOD_AUTO">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD-AUTO:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD_AUTO</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
 </pre>
@@ -348,7 +354,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD-LINK-LOCAL:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL "link-local"
 </pre>
@@ -356,7 +362,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_METHOD_MANUAL">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD-MANUAL:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD_MANUAL</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
 </pre>
@@ -364,7 +370,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_METHOD_SHARED">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD_SHARED</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD_SHARED     "shared"
 </pre>
@@ -372,7 +378,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP4_CONFIG_METHOD_DISABLED">
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD_DISABLED</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
 </pre>
@@ -380,7 +386,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMIP4Address">
+<div class="refsect2">
 <a name="NMIP4Address"></a><h3>NMIP4Address</h3>
 <pre class="programlisting">typedef struct NMIP4Address NMIP4Address;
 </pre>
@@ -388,237 +394,95 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_new ()">
+<div class="refsect2">
+<a name="nm-ip4-address-get-type"></a><h3>nm_ip4_address_get_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_ip4_address_get_type             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-ip4-address-new"></a><h3>nm_ip4_address_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      nm_ip4_address_new                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      nm_ip4_address_new                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_dup ()">
+<div class="refsect2">
 <a name="nm-ip4-address-dup"></a><h3>nm_ip4_address_dup ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      nm_ip4_address_dup                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *source</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      nm_ip4_address_dup                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *source</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>source</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_ref ()">
+<div class="refsect2">
 <a name="nm-ip4-address-ref"></a><h3>nm_ip4_address_ref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_ref                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_ref                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_unref ()">
+<div class="refsect2">
 <a name="nm-ip4-address-unref"></a><h3>nm_ip4_address_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_unref                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_unref                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_compare ()">
+<div class="refsect2">
 <a name="nm-ip4-address-compare"></a><h3>nm_ip4_address_compare ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip4_address_compare              (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *other</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip4_address_compare              (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *other</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>other</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_get_address ()">
+<div class="refsect2">
 <a name="nm-ip4-address-get-address"></a><h3>nm_ip4_address_get_address ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_address_get_address          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_address_get_address          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_set_address ()">
+<div class="refsect2">
 <a name="nm-ip4-address-set-address"></a><h3>nm_ip4_address_set_address ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_set_address          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_set_address          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> addr</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>addr</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_get_prefix ()">
+<div class="refsect2">
 <a name="nm-ip4-address-get-prefix"></a><h3>nm_ip4_address_get_prefix ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_address_get_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_address_get_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_set_prefix ()">
+<div class="refsect2">
 <a name="nm-ip4-address-set-prefix"></a><h3>nm_ip4_address_set_prefix ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_set_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_set_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>prefix</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_get_gateway ()">
+<div class="refsect2">
 <a name="nm-ip4-address-get-gateway"></a><h3>nm_ip4_address_get_gateway ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_address_get_gateway          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_address_get_gateway          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_address_set_gateway ()">
+<div class="refsect2">
 <a name="nm-ip4-address-set-gateway"></a><h3>nm_ip4_address_set_gateway ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_set_gateway          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_address_set_gateway          (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> gateway</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>gateway</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NMIP4Route">
+<div class="refsect2">
 <a name="NMIP4Route"></a><h3>NMIP4Route</h3>
 <pre class="programlisting">typedef struct NMIP4Route NMIP4Route;
 </pre>
@@ -626,289 +490,117 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_new ()">
+<div class="refsect2">
+<a name="nm-ip4-route-get-type"></a><h3>nm_ip4_route_get_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_ip4_route_get_type               (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-ip4-route-new"></a><h3>nm_ip4_route_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        nm_ip4_route_new                    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        nm_ip4_route_new                    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_dup ()">
+<div class="refsect2">
 <a name="nm-ip4-route-dup"></a><h3>nm_ip4_route_dup ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        nm_ip4_route_dup                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        nm_ip4_route_dup                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_ref ()">
+<div class="refsect2">
 <a name="nm-ip4-route-ref"></a><h3>nm_ip4_route_ref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_ref                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_ref                    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_unref ()">
+<div class="refsect2">
 <a name="nm-ip4-route-unref"></a><h3>nm_ip4_route_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_unref                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_unref                  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_compare ()">
+<div class="refsect2">
 <a name="nm-ip4-route-compare"></a><h3>nm_ip4_route_compare ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip4_route_compare                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *other</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip4_route_compare                (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *other</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>other</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_get_dest ()">
+<div class="refsect2">
 <a name="nm-ip4-route-get-dest"></a><h3>nm_ip4_route_get_dest ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_dest               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_dest               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_set_dest ()">
+<div class="refsect2">
 <a name="nm-ip4-route-set-dest"></a><h3>nm_ip4_route_set_dest ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_dest               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_dest               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> dest</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>dest</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_get_prefix ()">
+<div class="refsect2">
 <a name="nm-ip4-route-get-prefix"></a><h3>nm_ip4_route_get_prefix ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_set_prefix ()">
+<div class="refsect2">
 <a name="nm-ip4-route-set-prefix"></a><h3>nm_ip4_route_set_prefix ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>prefix</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_get_next_hop ()">
+<div class="refsect2">
 <a name="nm-ip4-route-get-next-hop"></a><h3>nm_ip4_route_get_next_hop ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_next_hop           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_next_hop           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_set_next_hop ()">
+<div class="refsect2">
 <a name="nm-ip4-route-set-next-hop"></a><h3>nm_ip4_route_set_next_hop ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_next_hop           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_next_hop           (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> next_hop</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>next_hop</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_get_metric ()">
+<div class="refsect2">
 <a name="nm-ip4-route-get-metric"></a><h3>nm_ip4_route_get_metric ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip4_route_get_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip4_route_set_metric ()">
+<div class="refsect2">
 <a name="nm-ip4-route-set-metric"></a><h3>nm_ip4_route_set_metric ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip4_route_set_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> metric</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>metric</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingIP4Config">
+<div class="refsect2">
 <a name="NMSettingIP4Config-struct"></a><h3>NMSettingIP4Config</h3>
 <pre class="programlisting">typedef struct _NMSettingIP4Config NMSettingIP4Config;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingIP4ConfigClass">
+<div class="refsect2">
 <a name="NMSettingIP4ConfigClass"></a><h3>NMSettingIP4ConfigClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -924,694 +616,246 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-type"></a><h3>nm_setting_ip4_config_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_ip4_config_get_type      (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_new ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-new"></a><h3>nm_setting_ip4_config_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_ip4_config_new           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_method ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-method"></a><h3>nm_setting_ip4_config_get_method ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_ip4_config_get_method    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_num_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-num-dns"></a><h3>nm_setting_ip4_config_get_num_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip4_config_get_num_dns   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-dns"></a><h3>nm_setting_ip4_config_get_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip4_config_get_dns       (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_add_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-add-dns"></a><h3>nm_setting_ip4_config_add_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_add_dns       (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> dns</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>dns</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_remove_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-remove-dns"></a><h3>nm_setting_ip4_config_remove_dns ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_remove_dns    (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_clear_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-clear-dns"></a><h3>nm_setting_ip4_config_clear_dns ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_clear_dns     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_num_dns_searches ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-num-dns-searches"></a><h3>nm_setting_ip4_config_get_num_dns_searches ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip4_config_get_num_dns_searches
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_dns_search ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-dns-search"></a><h3>nm_setting_ip4_config_get_dns_search ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_ip4_config_get_dns_search
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_add_dns_search ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-add-dns-search"></a><h3>nm_setting_ip4_config_add_dns_search ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_add_dns_search
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *dns_search</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>dns_search</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_remove_dns_search ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-remove-dns-search"></a><h3>nm_setting_ip4_config_remove_dns_search ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_remove_dns_search
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_clear_dns_searches ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-clear-dns-searches"></a><h3>nm_setting_ip4_config_clear_dns_searches ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_clear_dns_searches
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_num_addresses ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-num-addresses"></a><h3>nm_setting_ip4_config_get_num_addresses ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip4_config_get_num_addresses
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_address ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-address"></a><h3>nm_setting_ip4_config_get_address ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      nm_setting_ip4_config_get_address   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
+<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="returnvalue">NMIP4Address</span></a> *      nm_setting_ip4_config_get_address   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_add_address ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-add-address"></a><h3>nm_setting_ip4_config_add_address ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_add_address   (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_remove_address ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-remove-address"></a><h3>nm_setting_ip4_config_remove_address ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_remove_address
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_clear_addresses ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-clear-addresses"></a><h3>nm_setting_ip4_config_clear_addresses ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_clear_addresses
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_num_routes ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-num-routes"></a><h3>nm_setting_ip4_config_get_num_routes ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip4_config_get_num_routes
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_route ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-route"></a><h3>nm_setting_ip4_config_get_route ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        nm_setting_ip4_config_get_route     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
+<pre class="programlisting"><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="returnvalue">NMIP4Route</span></a> *        nm_setting_ip4_config_get_route     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_add_route ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-add-route"></a><h3>nm_setting_ip4_config_add_route ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_add_route     (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_remove_route ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-remove-route"></a><h3>nm_setting_ip4_config_remove_route ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_remove_route  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_clear_routes ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-clear-routes"></a><h3>nm_setting_ip4_config_clear_routes ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip4_config_clear_routes  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_ignore_auto_routes ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-ignore-auto-routes"></a><h3>nm_setting_ip4_config_get_ignore_auto_routes ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_get_ignore_auto_routes
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_ignore_auto_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-ignore-auto-dns"></a><h3>nm_setting_ip4_config_get_ignore_auto_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_get_ignore_auto_dns
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_dhcp_client_id ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-dhcp-client-id"></a><h3>nm_setting_ip4_config_get_dhcp_client_id ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_ip4_config_get_dhcp_client_id
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_dhcp_send_hostname ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-dhcp-send-hostname"></a><h3>nm_setting_ip4_config_get_dhcp_send_hostname ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_get_dhcp_send_hostname
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_dhcp_hostname ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-dhcp-hostname"></a><h3>nm_setting_ip4_config_get_dhcp_hostname ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_ip4_config_get_dhcp_hostname
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_never_default ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-never-default"></a><h3>nm_setting_ip4_config_get_never_default ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_get_never_default
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip4_config_get_may_fail ()">
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-may-fail"></a><h3>nm_setting_ip4_config_get_may_fail ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip4_config_get_may_fail  (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingIP4Config.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "addresses" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--addresses"></a><h3>The <code class="literal">"addresses"</code> property</h3>
 <pre class="programlisting">  "addresses"                <span class="type">GPtrArray_GArray_guint__</span>*  : Read / Write</pre>
 <p>
@@ -1626,7 +870,7 @@ either automatic or disabled with these methods.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "dhcp-client-id" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--dhcp-client-id"></a><h3>The <code class="literal">"dhcp-client-id"</code> property</h3>
 <pre class="programlisting">  "dhcp-client-id"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1636,7 +880,7 @@ DHCP server may use to cusomize the DHCP lease and options.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "dhcp-hostname" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--dhcp-hostname"></a><h3>The <code class="literal">"dhcp-hostname"</code> property</h3>
 <pre class="programlisting">  "dhcp-hostname"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1646,7 +890,7 @@ specified name will be sent to the DHCP server when acquiring a lease.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "dhcp-send-hostname" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--dhcp-send-hostname"></a><h3>The <code class="literal">"dhcp-send-hostname"</code> property</h3>
 <pre class="programlisting">  "dhcp-send-hostname"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1659,7 +903,7 @@ the current persistent hostname of the computer is sent.
 <p>Default value: TRUE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "dns" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--dns"></a><h3>The <code class="literal">"dns"</code> property</h3>
 <pre class="programlisting">  "dns"                      <span class="type">GArray_guint_</span>*        : Read / Write</pre>
 <p>
@@ -1672,7 +916,7 @@ connection.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "dns-search" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--dns-search"></a><h3>The <code class="literal">"dns-search"</code> property</h3>
 <pre class="programlisting">  "dns-search"               <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -1684,7 +928,7 @@ are used as the only search domains for this connection.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "ignore-auto-dns" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--ignore-auto-dns"></a><h3>The <code class="literal">"ignore-auto-dns"</code> property</h3>
 <pre class="programlisting">  "ignore-auto-dns"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1696,7 +940,7 @@ and search domains specified in <a class="link" href="NMSettingIP4Config.html#NM
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "ignore-auto-routes" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--ignore-auto-routes"></a><h3>The <code class="literal">"ignore-auto-routes"</code> property</h3>
 <pre class="programlisting">  "ignore-auto-routes"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1707,7 +951,7 @@ configured routes are ignored and only routes specified in
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "may-fail" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--may-fail"></a><h3>The <code class="literal">"may-fail"</code> property</h3>
 <pre class="programlisting">  "may-fail"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1721,7 +965,7 @@ but IPv6 configuration completes successfully.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "method" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--method"></a><h3>The <code class="literal">"method"</code> property</h3>
 <pre class="programlisting">  "method"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1741,7 +985,7 @@ This property must be set.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "never-default" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--never-default"></a><h3>The <code class="literal">"never-default"</code> property</h3>
 <pre class="programlisting">  "never-default"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1751,7 +995,7 @@ meaning it will never be assigned the default route by NetworkManager.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "routes" property'>
+<div class="refsect2">
 <a name="NMSettingIP4Config--routes"></a><h3>The <code class="literal">"routes"</code> property</h3>
 <pre class="programlisting">  "routes"                   <span class="type">GPtrArray_GArray_guint__</span>*  : Read / Write</pre>
 <p>
@@ -1769,6 +1013,6 @@ or 'disabled' methods because there is no upstream network.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index 6946c47d..060c80fe 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingIP4Config.html" title="NMSettingIP4Config">
 <link rel="next" href="NMSettingPPP.html" title="NMSettingPPP">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingIP6Config.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingIP6Config">
+<div class="refentry">
 <a name="NMSettingIP6Config"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingIP6Config.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-SETTING-NAME:CAPS" title="NM_SETTING_IP6_CONFIG_SETTING_NAME">NM_SETTING_IP6_CONFIG_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigError" title="enum NMSettingIP6ConfigError">NMSettingIP6ConfigError</a>;
+<a name="NMSettingIP6ConfigError"></a><a name="NMIP6Address"></a><a name="NMIP6Route"></a><pre class="synopsis">#define             <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-SETTING-NAME:CAPS" title="NM_SETTING_IP6_CONFIG_SETTING_NAME">NM_SETTING_IP6_CONFIG_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigError">NMSettingIP6ConfigError</a>;
 #define             <a class="link" href="NMSettingIP6Config.html#NM-TYPE-SETTING-IP6-CONFIG-ERROR:CAPS" title="NM_TYPE_SETTING_IP6_CONFIG_ERROR">NM_TYPE_SETTING_IP6_CONFIG_ERROR</a>
 #define             <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR:CAPS" title="NM_SETTING_IP6_CONFIG_ERROR">NM_SETTING_IP6_CONFIG_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-error-quark" title="nm_setting_ip6_config_error_quark ()">nm_setting_ip6_config_error_quark</a>   (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -61,46 +61,49 @@ enum                <a class="link" href="NMSettingIP6Config.html#NMSettingIP6Co
 #define             <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-LINK-LOCAL:CAPS" title="NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL">NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL</a>
 #define             <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS" title="NM_SETTING_IP6_CONFIG_METHOD_MANUAL">NM_SETTING_IP6_CONFIG_METHOD_MANUAL</a>
 #define             <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS" title="NM_SETTING_IP6_CONFIG_METHOD_SHARED">NM_SETTING_IP6_CONFIG_METHOD_SHARED</a>
-typedef             <a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address">NMIP6Address</a>;
-<a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *      <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-new" title="nm_ip6_address_new ()">nm_ip6_address_new</a>                  (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *      <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-dup" title="nm_ip6_address_dup ()">nm_ip6_address_dup</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *source</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-ref" title="nm_ip6_address_ref ()">nm_ip6_address_ref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-unref" title="nm_ip6_address_unref ()">nm_ip6_address_unref</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-compare" title="nm_ip6_address_compare ()">nm_ip6_address_compare</a>              (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *other</code></em>);
-const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-address" title="nm_ip6_address_get_address ()">nm_ip6_address_get_address</a>      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-set-address" title="nm_ip6_address_set_address ()">nm_ip6_address_set_address</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+typedef             <a class="link" href="NMSettingIP6Config.html#NMIP6Address">NMIP6Address</a>;
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-type" title="nm_ip6_address_get_type ()">nm_ip6_address_get_type</a>             (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *          <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-new" title="nm_ip6_address_new ()">nm_ip6_address_new</a>              (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *          <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-dup" title="nm_ip6_address_dup ()">nm_ip6_address_dup</a>              (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *source</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-ref" title="nm_ip6_address_ref ()">nm_ip6_address_ref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-unref" title="nm_ip6_address_unref ()">nm_ip6_address_unref</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-compare" title="nm_ip6_address_compare ()">nm_ip6_address_compare</a>              (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *other</code></em>);
+const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-address" title="nm_ip6_address_get_address ()">nm_ip6_address_get_address</a>      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-set-address" title="nm_ip6_address_set_address ()">nm_ip6_address_set_address</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *addr</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-prefix" title="nm_ip6_address_get_prefix ()">nm_ip6_address_get_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-set-prefix" title="nm_ip6_address_set_prefix ()">nm_ip6_address_set_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-prefix" title="nm_ip6_address_get_prefix ()">nm_ip6_address_get_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-set-prefix" title="nm_ip6_address_set_prefix ()">nm_ip6_address_set_prefix</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);
-const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-gateway" title="nm_ip6_address_get_gateway ()">nm_ip6_address_get_gateway</a>      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-set-gateway" title="nm_ip6_address_set_gateway ()">nm_ip6_address_set_gateway</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-gateway" title="nm_ip6_address_get_gateway ()">nm_ip6_address_get_gateway</a>      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-set-gateway" title="nm_ip6_address_set_gateway ()">nm_ip6_address_set_gateway</a>          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *gw</code></em>);
-typedef             <a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route">NMIP6Route</a>;
-<a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *        <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-new" title="nm_ip6_route_new ()">nm_ip6_route_new</a>                    (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *        <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-dup" title="nm_ip6_route_dup ()">nm_ip6_route_dup</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-ref" title="nm_ip6_route_ref ()">nm_ip6_route_ref</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-unref" title="nm_ip6_route_unref ()">nm_ip6_route_unref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-compare" title="nm_ip6_route_compare ()">nm_ip6_route_compare</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *other</code></em>);
-const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-dest" title="nm_ip6_route_get_dest ()">nm_ip6_route_get_dest</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-dest" title="nm_ip6_route_set_dest ()">nm_ip6_route_set_dest</a>               (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+typedef             <a class="link" href="NMSettingIP6Config.html#NMIP6Route">NMIP6Route</a>;
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-type" title="nm_ip6_route_get_type ()">nm_ip6_route_get_type</a>               (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *            <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-new" title="nm_ip6_route_new ()">nm_ip6_route_new</a>                (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *            <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-dup" title="nm_ip6_route_dup ()">nm_ip6_route_dup</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-ref" title="nm_ip6_route_ref ()">nm_ip6_route_ref</a>                    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-unref" title="nm_ip6_route_unref ()">nm_ip6_route_unref</a>                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-compare" title="nm_ip6_route_compare ()">nm_ip6_route_compare</a>                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *other</code></em>);
+const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-dest" title="nm_ip6_route_get_dest ()">nm_ip6_route_get_dest</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-dest" title="nm_ip6_route_set_dest ()">nm_ip6_route_set_dest</a>               (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *dest</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-prefix" title="nm_ip6_route_get_prefix ()">nm_ip6_route_get_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-prefix" title="nm_ip6_route_set_prefix ()">nm_ip6_route_set_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-prefix" title="nm_ip6_route_get_prefix ()">nm_ip6_route_get_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-prefix" title="nm_ip6_route_set_prefix ()">nm_ip6_route_set_prefix</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);
-const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-next-hop" title="nm_ip6_route_get_next_hop ()">nm_ip6_route_get_next_hop</a>       (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-next-hop" title="nm_ip6_route_set_next_hop ()">nm_ip6_route_set_next_hop</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-next-hop" title="nm_ip6_route_get_next_hop ()">nm_ip6_route_get_next_hop</a>       (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-next-hop" title="nm_ip6_route_set_next_hop ()">nm_ip6_route_set_next_hop</a>           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *next_hop</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-metric" title="nm_ip6_route_get_metric ()">nm_ip6_route_get_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-metric" title="nm_ip6_route_set_metric ()">nm_ip6_route_set_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-metric" title="nm_ip6_route_get_metric ()">nm_ip6_route_get_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-set-metric" title="nm_ip6_route_set_metric ()">nm_ip6_route_set_metric</a>             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> metric</code></em>);
                     <a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config-struct" title="NMSettingIP6Config">NMSettingIP6Config</a>;
                     <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigClass" title="NMSettingIP6ConfigClass">NMSettingIP6ConfigClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-type" title="nm_setting_ip6_config_get_type ()">nm_setting_ip6_config_get_type</a>      (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-new" title="nm_setting_ip6_config_new ()">nm_setting_ip6_config_new</a>           (<em class="parameter"><code><span class="type">void</span></code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-method" title="nm_setting_ip6_config_get_method ()">nm_setting_ip6_config_get_method</a>    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *             <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-new" title="nm_setting_ip6_config_new ()">nm_setting_ip6_config_new</a>       (<em class="parameter"><code><span class="type">void</span></code></em>);
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-method" title="nm_setting_ip6_config_get_method ()">nm_setting_ip6_config_get_method</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-num-dns" title="nm_setting_ip6_config_get_num_dns ()">nm_setting_ip6_config_get_num_dns</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
 const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-dns" title="nm_setting_ip6_config_get_dns ()">nm_setting_ip6_config_get_dns</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
@@ -111,7 +114,7 @@ const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="N
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-clear-dns" title="nm_setting_ip6_config_clear_dns ()">nm_setting_ip6_config_clear_dns</a>     (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-num-dns-searches" title="nm_setting_ip6_config_get_num_dns_searches ()">nm_setting_ip6_config_get_num_dns_searches</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
-const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-dns-search" title="nm_setting_ip6_config_get_dns_search ()">nm_setting_ip6_config_get_dns_search</a>
+const <span class="returnvalue">char</span> *            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-dns-search" title="nm_setting_ip6_config_get_dns_search ()">nm_setting_ip6_config_get_dns_search</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-add-dns-search" title="nm_setting_ip6_config_add_dns_search ()">nm_setting_ip6_config_add_dns_search</a>
@@ -124,10 +127,11 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-num-addresses" title="nm_setting_ip6_config_get_num_addresses ()">nm_setting_ip6_config_get_num_addresses</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
-<a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *      <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-address" title="nm_setting_ip6_config_get_address ()">nm_setting_ip6_config_get_address</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
+<a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *          <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-address" title="nm_setting_ip6_config_get_address ()">nm_setting_ip6_config_get_address</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-add-address" title="nm_setting_ip6_config_add_address ()">nm_setting_ip6_config_add_address</a>   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-remove-address" title="nm_setting_ip6_config_remove_address ()">nm_setting_ip6_config_remove_address</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
@@ -135,10 +139,10 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-num-routes" title="nm_setting_ip6_config_get_num_routes ()">nm_setting_ip6_config_get_num_routes</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
-<a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *        <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-route" title="nm_setting_ip6_config_get_route ()">nm_setting_ip6_config_get_route</a>     (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
+<a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-route" title="nm_setting_ip6_config_get_route ()">nm_setting_ip6_config_get_route</a> (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-add-route" title="nm_setting_ip6_config_add_route ()">nm_setting_ip6_config_add_route</a>     (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-remove-route" title="nm_setting_ip6_config_remove_route ()">nm_setting_ip6_config_remove_route</a>  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-clear-routes" title="nm_setting_ip6_config_clear_routes ()">nm_setting_ip6_config_clear_routes</a>  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
@@ -151,15 +155,27 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-may-fail" title="nm_setting_ip6_config_get_may_fail ()">nm_setting_ip6_config_get_may_fail</a>  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingIP6Config.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingIP6ConfigError
+</pre>
+<pre class="synopsis">
+  GBoxed
+   +----NMIP6Address
+</pre>
+<pre class="synopsis">
+  GBoxed
+   +----NMIP6Route
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingIP6Config
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingIP6Config.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--addresses" title='The "addresses" property'>addresses</a>"                <span class="type">GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*</span>  : Read / Write
@@ -173,14 +189,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
   "<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--routes" title='The "routes" property'>routes</a>"                   <span class="type">GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*</span>  : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingIP6Config.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingIP6Config.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-SETTING-NAME:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
 </pre>
@@ -188,7 +204,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingIP6ConfigError">
+<div class="refsect2">
 <a name="NMSettingIP6ConfigError"></a><h3>enum NMSettingIP6ConfigError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -202,7 +218,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_IP6_CONFIG_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-IP6-CONFIG-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_IP6_CONFIG_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_IP6_CONFIG_ERROR (nm_setting_ip6_config_error_get_type ()) 
 </pre>
@@ -210,7 +226,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-ERROR:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
 </pre>
@@ -218,22 +234,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-error-quark"></a><h3>nm_setting_ip6_config_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_ip6_config_error_quark   (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD             "method"
 </pre>
@@ -241,7 +249,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_DNS">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-DNS:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_DNS                "dns"
 </pre>
@@ -249,7 +257,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_DNS_SEARCH">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-DNS-SEARCH:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_DNS_SEARCH</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_DNS_SEARCH         "dns-search"
 </pre>
@@ -257,7 +265,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_ADDRESSES">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-ADDRESSES:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_ADDRESSES</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
 </pre>
@@ -265,7 +273,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_ROUTES">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-ROUTES:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
 </pre>
@@ -273,7 +281,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-IGNORE-AUTO-ROUTES:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 </pre>
@@ -281,7 +289,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-IGNORE-AUTO-DNS:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 </pre>
@@ -289,7 +297,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_NEVER_DEFAULT">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_NEVER_DEFAULT</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
 </pre>
@@ -297,7 +305,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_MAY_FAIL">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-MAY-FAIL:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_MAY_FAIL</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_MAY_FAIL           "may-fail"
 </pre>
@@ -305,7 +313,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD_IGNORE">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD-IGNORE:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD_IGNORE</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
 </pre>
@@ -313,7 +321,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD_AUTO">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD-AUTO:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD_AUTO</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_AUTO       "auto"
 </pre>
@@ -321,7 +329,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD_DHCP">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD-DHCP:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD_DHCP</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_DHCP       "dhcp"
 </pre>
@@ -329,7 +337,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD-LINK-LOCAL:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL "link-local"
 </pre>
@@ -337,7 +345,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD_MANUAL">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD_MANUAL</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_MANUAL     "manual"
 </pre>
@@ -345,7 +353,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_IP6_CONFIG_METHOD_SHARED">
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD_SHARED</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_SHARED     "shared"
 </pre>
@@ -353,7 +361,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMIP6Address">
+<div class="refsect2">
 <a name="NMIP6Address"></a><h3>NMIP6Address</h3>
 <pre class="programlisting">typedef struct NMIP6Address NMIP6Address;
 </pre>
@@ -361,237 +369,95 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_new ()">
+<div class="refsect2">
+<a name="nm-ip6-address-get-type"></a><h3>nm_ip6_address_get_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_ip6_address_get_type             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-ip6-address-new"></a><h3>nm_ip6_address_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *      nm_ip6_address_new                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *          nm_ip6_address_new              (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_dup ()">
+<div class="refsect2">
 <a name="nm-ip6-address-dup"></a><h3>nm_ip6_address_dup ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *      nm_ip6_address_dup                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *source</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *          nm_ip6_address_dup              (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *source</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>source</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_ref ()">
+<div class="refsect2">
 <a name="nm-ip6-address-ref"></a><h3>nm_ip6_address_ref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_ref                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_ref                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_unref ()">
+<div class="refsect2">
 <a name="nm-ip6-address-unref"></a><h3>nm_ip6_address_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_unref                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_unref                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_compare ()">
+<div class="refsect2">
 <a name="nm-ip6-address-compare"></a><h3>nm_ip6_address_compare ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip6_address_compare              (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *other</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip6_address_compare              (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *other</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>other</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_get_address ()">
+<div class="refsect2">
 <a name="nm-ip6-address-get-address"></a><h3>nm_ip6_address_get_address ()</h3>
-<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_address_get_address      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_address_get_address      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_set_address ()">
+<div class="refsect2">
 <a name="nm-ip6-address-set-address"></a><h3>nm_ip6_address_set_address ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_set_address          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_set_address          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *addr</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>addr</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_get_prefix ()">
+<div class="refsect2">
 <a name="nm-ip6-address-get-prefix"></a><h3>nm_ip6_address_get_prefix ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip6_address_get_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip6_address_get_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_set_prefix ()">
+<div class="refsect2">
 <a name="nm-ip6-address-set-prefix"></a><h3>nm_ip6_address_set_prefix ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_set_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_set_prefix           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>prefix</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_get_gateway ()">
+<div class="refsect2">
 <a name="nm-ip6-address-get-gateway"></a><h3>nm_ip6_address_get_gateway ()</h3>
-<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_address_get_gateway      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
+<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_address_get_gateway      (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_address_set_gateway ()">
+<div class="refsect2">
 <a name="nm-ip6-address-set-gateway"></a><h3>nm_ip6_address_set_gateway ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_set_gateway          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_address_set_gateway          (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *gw</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>gw</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NMIP6Route">
+<div class="refsect2">
 <a name="NMIP6Route"></a><h3>NMIP6Route</h3>
 <pre class="programlisting">typedef struct NMIP6Route NMIP6Route;
 </pre>
@@ -599,289 +465,117 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_new ()">
+<div class="refsect2">
+<a name="nm-ip6-route-get-type"></a><h3>nm_ip6_route_get_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_ip6_route_get_type               (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-ip6-route-new"></a><h3>nm_ip6_route_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *        nm_ip6_route_new                    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *            nm_ip6_route_new                (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_dup ()">
+<div class="refsect2">
 <a name="nm-ip6-route-dup"></a><h3>nm_ip6_route_dup ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *        nm_ip6_route_dup                    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *            nm_ip6_route_dup                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_ref ()">
+<div class="refsect2">
 <a name="nm-ip6-route-ref"></a><h3>nm_ip6_route_ref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_ref                    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_ref                    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_unref ()">
+<div class="refsect2">
 <a name="nm-ip6-route-unref"></a><h3>nm_ip6_route_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_unref                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_unref                  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_compare ()">
+<div class="refsect2">
 <a name="nm-ip6-route-compare"></a><h3>nm_ip6_route_compare ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip6_route_compare                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *other</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_ip6_route_compare                (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *other</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>other</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_get_dest ()">
+<div class="refsect2">
 <a name="nm-ip6-route-get-dest"></a><h3>nm_ip6_route_get_dest ()</h3>
-<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_route_get_dest           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_route_get_dest           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_set_dest ()">
+<div class="refsect2">
 <a name="nm-ip6-route-set-dest"></a><h3>nm_ip6_route_set_dest ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_dest               (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_dest               (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *dest</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>dest</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_get_prefix ()">
+<div class="refsect2">
 <a name="nm-ip6-route-get-prefix"></a><h3>nm_ip6_route_get_prefix ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip6_route_get_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip6_route_get_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_set_prefix ()">
+<div class="refsect2">
 <a name="nm-ip6-route-set-prefix"></a><h3>nm_ip6_route_set_prefix ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_prefix             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>prefix</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_get_next_hop ()">
+<div class="refsect2">
 <a name="nm-ip6-route-get-next-hop"></a><h3>nm_ip6_route_get_next_hop ()</h3>
-<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_route_get_next_hop       (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_ip6_route_get_next_hop       (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_set_next_hop ()">
+<div class="refsect2">
 <a name="nm-ip6-route-set-next-hop"></a><h3>nm_ip6_route_set_next_hop ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_next_hop           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_next_hop           (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *next_hop</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>next_hop</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_get_metric ()">
+<div class="refsect2">
 <a name="nm-ip6-route-get-metric"></a><h3>nm_ip6_route_get_metric ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip6_route_get_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_ip6_route_get_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_ip6_route_set_metric ()">
+<div class="refsect2">
 <a name="nm-ip6-route-set-metric"></a><h3>nm_ip6_route_set_metric ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_ip6_route_set_metric             (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> metric</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>metric</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingIP6Config">
+<div class="refsect2">
 <a name="NMSettingIP6Config-struct"></a><h3>NMSettingIP6Config</h3>
 <pre class="programlisting">typedef struct _NMSettingIP6Config NMSettingIP6Config;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingIP6ConfigClass">
+<div class="refsect2">
 <a name="NMSettingIP6ConfigClass"></a><h3>NMSettingIP6ConfigClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -897,625 +591,224 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-type"></a><h3>nm_setting_ip6_config_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_ip6_config_get_type      (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_new ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-new"></a><h3>nm_setting_ip6_config_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_ip6_config_new           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *             nm_setting_ip6_config_new       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_method ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-method"></a><h3>nm_setting_ip6_config_get_method ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_ip6_config_get_method    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_ip6_config_get_method
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_num_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-num-dns"></a><h3>nm_setting_ip6_config_get_num_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip6_config_get_num_dns   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-dns"></a><h3>nm_setting_ip6_config_get_dns ()</h3>
 <pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_setting_ip6_config_get_dns   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_add_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-add-dns"></a><h3>nm_setting_ip6_config_add_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_add_dns       (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">struct in6_addr</span> *dns</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>dns</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_remove_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-remove-dns"></a><h3>nm_setting_ip6_config_remove_dns ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_remove_dns    (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_clear_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-clear-dns"></a><h3>nm_setting_ip6_config_clear_dns ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_clear_dns     (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_num_dns_searches ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-num-dns-searches"></a><h3>nm_setting_ip6_config_get_num_dns_searches ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip6_config_get_num_dns_searches
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_dns_search ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-dns-search"></a><h3>nm_setting_ip6_config_get_dns_search ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_ip6_config_get_dns_search
+<pre class="programlisting">const <span class="returnvalue">char</span> *            nm_setting_ip6_config_get_dns_search
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_add_dns_search ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-add-dns-search"></a><h3>nm_setting_ip6_config_add_dns_search ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_add_dns_search
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *dns_search</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>dns_search</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_remove_dns_search ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-remove-dns-search"></a><h3>nm_setting_ip6_config_remove_dns_search ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_remove_dns_search
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_clear_dns_searches ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-clear-dns-searches"></a><h3>nm_setting_ip6_config_clear_dns_searches ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_clear_dns_searches
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_num_addresses ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-num-addresses"></a><h3>nm_setting_ip6_config_get_num_addresses ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip6_config_get_num_addresses
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_address ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-address"></a><h3>nm_setting_ip6_config_get_address ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *      nm_setting_ip6_config_get_address   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
+<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> *          nm_setting_ip6_config_get_address
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_add_address ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-add-address"></a><h3>nm_setting_ip6_config_add_address ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_add_address   (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> *address</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_remove_address ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-remove-address"></a><h3>nm_setting_ip6_config_remove_address ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_remove_address
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_clear_addresses ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-clear-addresses"></a><h3>nm_setting_ip6_config_clear_addresses ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_clear_addresses
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_num_routes ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-num-routes"></a><h3>nm_setting_ip6_config_get_num_routes ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ip6_config_get_num_routes
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_route ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-route"></a><h3>nm_setting_ip6_config_get_route ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *        nm_setting_ip6_config_get_route     (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
+<pre class="programlisting"><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="returnvalue">NMIP6Route</span></a> *            nm_setting_ip6_config_get_route (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_add_route ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-add-route"></a><h3>nm_setting_ip6_config_add_route ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_add_route     (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
+                                                         <em class="parameter"><code><a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> *route</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>route</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_remove_route ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-remove-route"></a><h3>nm_setting_ip6_config_remove_route ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_remove_route  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_clear_routes ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-clear-routes"></a><h3>nm_setting_ip6_config_clear_routes ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_ip6_config_clear_routes  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_ignore_auto_routes ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-ignore-auto-routes"></a><h3>nm_setting_ip6_config_get_ignore_auto_routes ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_get_ignore_auto_routes
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_ignore_auto_dns ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-ignore-auto-dns"></a><h3>nm_setting_ip6_config_get_ignore_auto_dns ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_get_ignore_auto_dns
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_never_default ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-never-default"></a><h3>nm_setting_ip6_config_get_never_default ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_get_never_default
                                                         (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ip6_config_get_may_fail ()">
+<div class="refsect2">
 <a name="nm-setting-ip6-config-get-may-fail"></a><h3>nm_setting_ip6_config_get_may_fail ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ip6_config_get_may_fail  (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingIP6Config.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "addresses" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--addresses"></a><h3>The <code class="literal">"addresses"</code> property</h3>
 <pre class="programlisting">  "addresses"                <span class="type">GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*</span>  : Read / Write</pre>
 <p>
@@ -1532,7 +825,7 @@ assigned an address with these methods.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "dns" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--dns"></a><h3>The <code class="literal">"dns"</code> property</h3>
 <pre class="programlisting">  "dns"                      <span class="type">GPtrArray_GArray_guchar__</span>*  : Read / Write</pre>
 <p>
@@ -1546,7 +839,7 @@ this connection.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "dns-search" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--dns-search"></a><h3>The <code class="literal">"dns-search"</code> property</h3>
 <pre class="programlisting">  "dns-search"               <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -1558,7 +851,7 @@ as the only search domains for this connection.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "ignore-auto-dns" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--ignore-auto-dns"></a><h3>The <code class="literal">"ignore-auto-dns"</code> property</h3>
 <pre class="programlisting">  "ignore-auto-dns"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1571,7 +864,7 @@ used.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "ignore-auto-routes" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--ignore-auto-routes"></a><h3>The <code class="literal">"ignore-auto-routes"</code> property</h3>
 <pre class="programlisting">  "ignore-auto-routes"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1582,7 +875,7 @@ specified in <a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--r
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "may-fail" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--may-fail"></a><h3>The <code class="literal">"may-fail"</code> property</h3>
 <pre class="programlisting">  "may-fail"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1596,7 +889,7 @@ but IPv4 configuration completes successfully.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "method" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--method"></a><h3>The <code class="literal">"method"</code> property</h3>
 <pre class="programlisting">  "method"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1614,7 +907,7 @@ method are not yet supported.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "never-default" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--never-default"></a><h3>The <code class="literal">"never-default"</code> property</h3>
 <pre class="programlisting">  "never-default"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -1624,7 +917,7 @@ meaning it will never be assigned the default IPv6 route by NetworkManager.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "routes" property'>
+<div class="refsect2">
 <a name="NMSettingIP6Config--routes"></a><h3>The <code class="literal">"routes"</code> property</h3>
 <pre class="programlisting">  "routes"                   <span class="type">GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*</span>  : Read / Write</pre>
 <p>
@@ -1642,6 +935,6 @@ automatic configuration.  Routes cannot be used with the 'shared' or
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index d77036ac..43ea8d27 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingGsm.html" title="NMSettingGsm">
 <link rel="next" href="NMSetting8021x.html" title="NMSetting8021x">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingOlpcMesh.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingOlpcMesh">
+<div class="refentry">
 <a name="NMSettingOlpcMesh"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingOlpcMesh.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS" title="NM_SETTING_OLPC_MESH_SETTING_NAME">NM_SETTING_OLPC_MESH_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMeshError" title="enum NMSettingOlpcMeshError">NMSettingOlpcMeshError</a>;
+<a name="NMSettingOlpcMeshError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS" title="NM_SETTING_OLPC_MESH_SETTING_NAME">NM_SETTING_OLPC_MESH_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMeshError">NMSettingOlpcMeshError</a>;
 #define             <a class="link" href="NMSettingOlpcMesh.html#NM-TYPE-SETTING-OLPC-MESH-ERROR:CAPS" title="NM_TYPE_SETTING_OLPC_MESH_ERROR">NM_TYPE_SETTING_OLPC_MESH_ERROR</a>
 #define             <a class="link" href="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR:CAPS" title="NM_SETTING_OLPC_MESH_ERROR">NM_SETTING_OLPC_MESH_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingOlpcMesh.html#nm-setting-olpc-mesh-error-quark" title="nm_setting_olpc_mesh_error_quark ()">nm_setting_olpc_mesh_error_quark</a>    (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -59,15 +59,19 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
                                                         (<em class="parameter"><code><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingOlpcMesh.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingOlpcMeshError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingOlpcMesh
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingOlpcMesh.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMesh--channel" title='The "channel" property'>channel</a>"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
@@ -75,14 +79,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
   "<a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMesh--ssid" title='The "ssid" property'>ssid</a>"                     <span class="type">GArray_guchar_</span>*       : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingOlpcMesh.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingOlpcMesh.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_OLPC_MESH_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS"></a><h3>NM_SETTING_OLPC_MESH_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
 </pre>
@@ -90,7 +94,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingOlpcMeshError">
+<div class="refsect2">
 <a name="NMSettingOlpcMeshError"></a><h3>enum NMSettingOlpcMeshError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -103,7 +107,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_OLPC_MESH_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-OLPC-MESH-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_OLPC_MESH_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_OLPC_MESH_ERROR (nm_setting_olpc_mesh_error_get_type ()) 
 </pre>
@@ -111,7 +115,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_OLPC_MESH_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-ERROR:CAPS"></a><h3>NM_SETTING_OLPC_MESH_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
 </pre>
@@ -119,22 +123,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_olpc_mesh_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-olpc-mesh-error-quark"></a><h3>nm_setting_olpc_mesh_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_olpc_mesh_error_quark    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_OLPC_MESH_SSID">
+<div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-SSID:CAPS"></a><h3>NM_SETTING_OLPC_MESH_SSID</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
 </pre>
@@ -142,7 +138,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_OLPC_MESH_CHANNEL">
+<div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-CHANNEL:CAPS"></a><h3>NM_SETTING_OLPC_MESH_CHANNEL</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
 </pre>
@@ -150,7 +146,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS">
+<div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-DHCP-ANYCAST-ADDRESS:CAPS"></a><h3>NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 </pre>
@@ -158,14 +154,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingOlpcMesh">
+<div class="refsect2">
 <a name="NMSettingOlpcMesh-struct"></a><h3>NMSettingOlpcMesh</h3>
 <pre class="programlisting">typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingOlpcMeshClass">
+<div class="refsect2">
 <a name="NMSettingOlpcMeshClass"></a><h3>NMSettingOlpcMeshClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -181,22 +177,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_olpc_mesh_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-olpc-mesh-get-type"></a><h3>nm_setting_olpc_mesh_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_olpc_mesh_get_type       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_olpc_mesh_new ()">
+<div class="refsect2">
 <a name="nm-setting-olpc-mesh-new"></a><h3>nm_setting_olpc_mesh_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_olpc_mesh_new            (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -206,82 +194,36 @@ Creates a new <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpc
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the new empty <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> object
-</td>
+<td>the new empty <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> object</td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_olpc_mesh_get_ssid ()">
+<div class="refsect2">
 <a name="nm-setting-olpc-mesh-get-ssid"></a><h3>nm_setting_olpc_mesh_get_ssid ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_olpc_mesh_get_ssid       (<em class="parameter"><code><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_olpc_mesh_get_channel ()">
+<div class="refsect2">
 <a name="nm-setting-olpc-mesh-get-channel"></a><h3>nm_setting_olpc_mesh_get_channel ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_olpc_mesh_get_channel    (<em class="parameter"><code><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_olpc_mesh_get_dhcp_anycast_address ()">
+<div class="refsect2">
 <a name="nm-setting-olpc-mesh-get-dhcp-anycast-address"></a><h3>nm_setting_olpc_mesh_get_dhcp_anycast_address ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_olpc_mesh_get_dhcp_anycast_address
                                                         (<em class="parameter"><code><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingOlpcMesh.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "channel" property'>
+<div class="refsect2">
 <a name="NMSettingOlpcMesh--channel"></a><h3>The <code class="literal">"channel"</code> property</h3>
 <pre class="programlisting">  "channel"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -290,7 +232,7 @@ Channel on which the mesh network to join is located.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "dhcp-anycast-address" property'>
+<div class="refsect2">
 <a name="NMSettingOlpcMesh--dhcp-anycast-address"></a><h3>The <code class="literal">"dhcp-anycast-address"</code> property</h3>
 <pre class="programlisting">  "dhcp-anycast-address"     <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -300,7 +242,7 @@ the request.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "ssid" property'>
+<div class="refsect2">
 <a name="NMSettingOlpcMesh--ssid"></a><h3>The <code class="literal">"ssid"</code> property</h3>
 <pre class="programlisting">  "ssid"                     <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -311,6 +253,6 @@ SSID of the mesh network to join.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index 6488a3f0..eade54a5 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingIP6Config.html" title="NMSettingIP6Config">
 <link rel="next" href="NMSettingPPPOE.html" title="NMSettingPPPOE">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingPPP.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingPPP">
+<div class="refentry">
 <a name="NMSettingPPP"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingPPP.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingPPP.html#NM-SETTING-PPP-SETTING-NAME:CAPS" title="NM_SETTING_PPP_SETTING_NAME">NM_SETTING_PPP_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" title="enum NMSettingPPPError">NMSettingPPPError</a>;
+<a name="NMSettingPPPError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingPPP.html#NM-SETTING-PPP-SETTING-NAME:CAPS" title="NM_SETTING_PPP_SETTING_NAME">NM_SETTING_PPP_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError">NMSettingPPPError</a>;
 #define             <a class="link" href="NMSettingPPP.html#NM-TYPE-SETTING-PPP-ERROR:CAPS" title="NM_TYPE_SETTING_PPP_ERROR">NM_TYPE_SETTING_PPP_ERROR</a>
 #define             <a class="link" href="NMSettingPPP.html#NM-SETTING-PPP-ERROR:CAPS" title="NM_SETTING_PPP_ERROR">NM_SETTING_PPP_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingPPP.html#nm-setting-ppp-error-quark" title="nm_setting_ppp_error_quark ()">nm_setting_ppp_error_quark</a>          (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -89,15 +89,19 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
                                                         (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingPPP.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingPPPError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingPPP
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingPPP.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingPPP.html#NMSettingPPP--baud" title='The "baud" property'>baud</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
@@ -120,14 +124,14 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
   "<a class="link" href="NMSettingPPP.html#NMSettingPPP--require-mppe-128" title='The "require-mppe-128" property'>require-mppe-128</a>"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingPPP.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingPPP.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_PPP_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-SETTING-NAME:CAPS"></a><h3>NM_SETTING_PPP_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_SETTING_NAME "ppp"
 </pre>
@@ -135,7 +139,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingPPPError">
+<div class="refsect2">
 <a name="NMSettingPPPError"></a><h3>enum NMSettingPPPError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -149,7 +153,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_PPP_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-PPP-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_PPP_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_PPP_ERROR (nm_setting_ppp_error_get_type ()) 
 </pre>
@@ -157,7 +161,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-ERROR:CAPS"></a><h3>NM_SETTING_PPP_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
 </pre>
@@ -165,22 +169,14 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-error-quark"></a><h3>nm_setting_ppp_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_ppp_error_quark          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_NOAUTH">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-NOAUTH:CAPS"></a><h3>NM_SETTING_PPP_NOAUTH</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NOAUTH            "noauth"
 </pre>
@@ -188,7 +184,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REFUSE_EAP">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-EAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_EAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
 </pre>
@@ -196,7 +192,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REFUSE_PAP">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-PAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_PAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
 </pre>
@@ -204,7 +200,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REFUSE_CHAP">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-CHAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_CHAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
 </pre>
@@ -212,7 +208,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REFUSE_MSCHAP">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-MSCHAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_MSCHAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
 </pre>
@@ -220,7 +216,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REFUSE_MSCHAPV2">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-MSCHAPV2:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_MSCHAPV2</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 </pre>
@@ -228,7 +224,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_NOBSDCOMP">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-NOBSDCOMP:CAPS"></a><h3>NM_SETTING_PPP_NOBSDCOMP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
 </pre>
@@ -236,7 +232,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_NODEFLATE">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-NODEFLATE:CAPS"></a><h3>NM_SETTING_PPP_NODEFLATE</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
 </pre>
@@ -244,7 +240,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_NO_VJ_COMP">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-NO-VJ-COMP:CAPS"></a><h3>NM_SETTING_PPP_NO_VJ_COMP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
 </pre>
@@ -252,7 +248,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REQUIRE_MPPE">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REQUIRE-MPPE:CAPS"></a><h3>NM_SETTING_PPP_REQUIRE_MPPE</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 </pre>
@@ -260,7 +256,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_REQUIRE_MPPE_128">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-REQUIRE-MPPE-128:CAPS"></a><h3>NM_SETTING_PPP_REQUIRE_MPPE_128</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 </pre>
@@ -268,7 +264,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_MPPE_STATEFUL">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-MPPE-STATEFUL:CAPS"></a><h3>NM_SETTING_PPP_MPPE_STATEFUL</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
 </pre>
@@ -276,7 +272,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_CRTSCTS">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-CRTSCTS:CAPS"></a><h3>NM_SETTING_PPP_CRTSCTS</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_CRTSCTS           "crtscts"
 </pre>
@@ -284,7 +280,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_BAUD">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-BAUD:CAPS"></a><h3>NM_SETTING_PPP_BAUD</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_BAUD              "baud"
 </pre>
@@ -292,7 +288,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_MRU">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-MRU:CAPS"></a><h3>NM_SETTING_PPP_MRU</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_MRU               "mru"
 </pre>
@@ -300,7 +296,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_MTU">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-MTU:CAPS"></a><h3>NM_SETTING_PPP_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_MTU               "mtu"
 </pre>
@@ -308,7 +304,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_LCP_ECHO_FAILURE">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-LCP-ECHO-FAILURE:CAPS"></a><h3>NM_SETTING_PPP_LCP_ECHO_FAILURE</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 </pre>
@@ -316,7 +312,7 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPP_LCP_ECHO_INTERVAL">
+<div class="refsect2">
 <a name="NM-SETTING-PPP-LCP-ECHO-INTERVAL:CAPS"></a><h3>NM_SETTING_PPP_LCP_ECHO_INTERVAL</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 </pre>
@@ -324,14 +320,14 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingPPP">
+<div class="refsect2">
 <a name="NMSettingPPP-struct"></a><h3>NMSettingPPP</h3>
 <pre class="programlisting">typedef struct _NMSettingPPP NMSettingPPP;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingPPPClass">
+<div class="refsect2">
 <a name="NMSettingPPPClass"></a><h3>NMSettingPPPClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -347,436 +343,150 @@ enum                <a class="link" href="NMSettingPPP.html#NMSettingPPPError" t
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-type"></a><h3>nm_setting_ppp_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_ppp_get_type             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_new ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-new"></a><h3>nm_setting_ppp_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_ppp_new                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_noauth ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-noauth"></a><h3>nm_setting_ppp_get_noauth ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_noauth           (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_refuse_eap ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-refuse-eap"></a><h3>nm_setting_ppp_get_refuse_eap ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_refuse_eap       (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_refuse_pap ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-refuse-pap"></a><h3>nm_setting_ppp_get_refuse_pap ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_refuse_pap       (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_refuse_chap ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-refuse-chap"></a><h3>nm_setting_ppp_get_refuse_chap ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_refuse_chap      (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_refuse_mschap ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-refuse-mschap"></a><h3>nm_setting_ppp_get_refuse_mschap ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_refuse_mschap    (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_refuse_mschapv2 ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-refuse-mschapv2"></a><h3>nm_setting_ppp_get_refuse_mschapv2 ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_refuse_mschapv2  (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_nobsdcomp ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-nobsdcomp"></a><h3>nm_setting_ppp_get_nobsdcomp ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_nobsdcomp        (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_nodeflate ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-nodeflate"></a><h3>nm_setting_ppp_get_nodeflate ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_nodeflate        (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_no_vj_comp ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-no-vj-comp"></a><h3>nm_setting_ppp_get_no_vj_comp ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_no_vj_comp       (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_require_mppe ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-require-mppe"></a><h3>nm_setting_ppp_get_require_mppe ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_require_mppe     (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_require_mppe_128 ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-require-mppe-128"></a><h3>nm_setting_ppp_get_require_mppe_128 ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_require_mppe_128 (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_mppe_stateful ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-mppe-stateful"></a><h3>nm_setting_ppp_get_mppe_stateful ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_mppe_stateful    (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_crtscts ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-crtscts"></a><h3>nm_setting_ppp_get_crtscts ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_ppp_get_crtscts          (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_baud ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-baud"></a><h3>nm_setting_ppp_get_baud ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ppp_get_baud             (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_mru ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-mru"></a><h3>nm_setting_ppp_get_mru ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ppp_get_mru              (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_mtu ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-mtu"></a><h3>nm_setting_ppp_get_mtu ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ppp_get_mtu              (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_lcp_echo_failure ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-lcp-echo-failure"></a><h3>nm_setting_ppp_get_lcp_echo_failure ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ppp_get_lcp_echo_failure (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_ppp_get_lcp_echo_interval ()">
+<div class="refsect2">
 <a name="nm-setting-ppp-get-lcp-echo-interval"></a><h3>nm_setting_ppp_get_lcp_echo_interval ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_ppp_get_lcp_echo_interval
                                                         (<em class="parameter"><code><a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingPPP.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "baud" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--baud"></a><h3>The <code class="literal">"baud"</code> property</h3>
 <pre class="programlisting">  "baud"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -787,7 +497,7 @@ choose the speed.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "crtscts" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--crtscts"></a><h3>The <code class="literal">"crtscts"</code> property</h3>
 <pre class="programlisting">  "crtscts"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -798,7 +508,7 @@ set to FALSE.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "lcp-echo-failure" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--lcp-echo-failure"></a><h3>The <code class="literal">"lcp-echo-failure"</code> property</h3>
 <pre class="programlisting">  "lcp-echo-failure"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -810,7 +520,7 @@ value if this property is used.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "lcp-echo-interval" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--lcp-echo-interval"></a><h3>The <code class="literal">"lcp-echo-interval"</code> property</h3>
 <pre class="programlisting">  "lcp-echo-interval"        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -822,7 +532,7 @@ possible to autodetect this.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "mppe-stateful" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--mppe-stateful"></a><h3>The <code class="literal">"mppe-stateful"</code> property</h3>
 <pre class="programlisting">  "mppe-stateful"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -832,7 +542,7 @@ information on stateful MPPE.",
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "mru" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--mru"></a><h3>The <code class="literal">"mru"</code> property</h3>
 <pre class="programlisting">  "mru"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -844,7 +554,7 @@ larger than the specified size.  If non-zero, the MRU should be between
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "mtu" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--mtu"></a><h3>The <code class="literal">"mtu"</code> property</h3>
 <pre class="programlisting">  "mtu"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -854,7 +564,7 @@ size.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "no-vj-comp" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--no-vj-comp"></a><h3>The <code class="literal">"no-vj-comp"</code> property</h3>
 <pre class="programlisting">  "no-vj-comp"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -863,7 +573,7 @@ If TRUE, Van Jacobsen TCP header compression will not be requested.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "noauth" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--noauth"></a><h3>The <code class="literal">"noauth"</code> property</h3>
 <pre class="programlisting">  "noauth"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -874,7 +584,7 @@ the remote side.  In almost all cases, this should be TRUE.
 <p>Default value: TRUE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "nobsdcomp" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--nobsdcomp"></a><h3>The <code class="literal">"nobsdcomp"</code> property</h3>
 <pre class="programlisting">  "nobsdcomp"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -883,7 +593,7 @@ If TRUE, BSD compression will not be requested.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "nodeflate" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--nodeflate"></a><h3>The <code class="literal">"nodeflate"</code> property</h3>
 <pre class="programlisting">  "nodeflate"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -892,7 +602,7 @@ If TRUE, 'deflate' compression will not be requested.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "refuse-chap" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--refuse-chap"></a><h3>The <code class="literal">"refuse-chap"</code> property</h3>
 <pre class="programlisting">  "refuse-chap"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -901,7 +611,7 @@ If TRUE, the CHAP authentication method will not be used.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "refuse-eap" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--refuse-eap"></a><h3>The <code class="literal">"refuse-eap"</code> property</h3>
 <pre class="programlisting">  "refuse-eap"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -910,7 +620,7 @@ If TRUE, the EAP authentication method will not be used.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "refuse-mschap" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--refuse-mschap"></a><h3>The <code class="literal">"refuse-mschap"</code> property</h3>
 <pre class="programlisting">  "refuse-mschap"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -919,7 +629,7 @@ If TRUE, the MSCHAP authentication method will not be used.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "refuse-mschapv2" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--refuse-mschapv2"></a><h3>The <code class="literal">"refuse-mschapv2"</code> property</h3>
 <pre class="programlisting">  "refuse-mschapv2"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -928,7 +638,7 @@ If TRUE, the MSCHAPv2 authentication method will not be used.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "refuse-pap" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--refuse-pap"></a><h3>The <code class="literal">"refuse-pap"</code> property</h3>
 <pre class="programlisting">  "refuse-pap"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -937,7 +647,7 @@ If TRUE, the PAP authentication method will not be used.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "require-mppe" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--require-mppe"></a><h3>The <code class="literal">"require-mppe"</code> property</h3>
 <pre class="programlisting">  "require-mppe"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -949,7 +659,7 @@ connections.
 <p>Default value: FALSE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "require-mppe-128" property'>
+<div class="refsect2">
 <a name="NMSettingPPP--require-mppe-128"></a><h3>The <code class="literal">"require-mppe-128"</code> property</h3>
 <pre class="programlisting">  "require-mppe-128"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>
@@ -963,6 +673,6 @@ be set to TRUE.  If 128-bit MPPE is not available the session will fail.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index 46c551bb..87669254 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingPPP.html" title="NMSettingPPP">
 <link rel="next" href="NMSettingVPN.html" title="NMSettingVPN">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingPPPOE.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingPPPOE">
+<div class="refentry">
 <a name="NMSettingPPPOE"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,16 +39,17 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingPPPOE.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-SETTING-NAME:CAPS" title="NM_SETTING_PPPOE_SETTING_NAME">NM_SETTING_PPPOE_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEError" title="enum NMSettingPPPOEError">NMSettingPPPOEError</a>;
+<a name="NMSettingPPPOEError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-SETTING-NAME:CAPS" title="NM_SETTING_PPPOE_SETTING_NAME">NM_SETTING_PPPOE_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEError">NMSettingPPPOEError</a>;
 #define             <a class="link" href="NMSettingPPPOE.html#NM-TYPE-SETTING-PPPOE-ERROR:CAPS" title="NM_TYPE_SETTING_PPPOE_ERROR">NM_TYPE_SETTING_PPPOE_ERROR</a>
 #define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-ERROR:CAPS" title="NM_SETTING_PPPOE_ERROR">NM_SETTING_PPPOE_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-error-quark" title="nm_setting_pppoe_error_quark ()">nm_setting_pppoe_error_quark</a>        (<em class="parameter"><code><span class="type">void</span></code></em>);
 #define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-SERVICE:CAPS" title="NM_SETTING_PPPOE_SERVICE">NM_SETTING_PPPOE_SERVICE</a>
 #define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-USERNAME:CAPS" title="NM_SETTING_PPPOE_USERNAME">NM_SETTING_PPPOE_USERNAME</a>
 #define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD:CAPS" title="NM_SETTING_PPPOE_PASSWORD">NM_SETTING_PPPOE_PASSWORD</a>
+#define             <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS" title="NM_SETTING_PPPOE_PASSWORD_FLAGS">NM_SETTING_PPPOE_PASSWORD_FLAGS</a>
                     <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE-struct" title="NMSettingPPPOE">NMSettingPPPOE</a>;
                     <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEClass" title="NMSettingPPPOEClass">NMSettingPPPOEClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-type" title="nm_setting_pppoe_get_type ()">nm_setting_pppoe_get_type</a>           (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -56,32 +57,39 @@ enum                <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEErro
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-service" title="nm_setting_pppoe_get_service ()">nm_setting_pppoe_get_service</a>        (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-username" title="nm_setting_pppoe_get_username ()">nm_setting_pppoe_get_username</a>       (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-password" title="nm_setting_pppoe_get_password ()">nm_setting_pppoe_get_password</a>       (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-password-flags" title="nm_setting_pppoe_get_password_flags ()">nm_setting_pppoe_get_password_flags</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingPPPOE.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingPPPOEError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingPPPOE
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingPPPOE.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--password" title='The "password" property'>password</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--password-flags" title='The "password-flags" property'>password-flags</a>"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--service" title='The "service" property'>service</a>"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--username" title='The "username" property'>username</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingPPPOE.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingPPPOE.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_PPPOE_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-PPPOE-SETTING-NAME:CAPS"></a><h3>NM_SETTING_PPPOE_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
 </pre>
@@ -89,7 +97,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingPPPOEError">
+<div class="refsect2">
 <a name="NMSettingPPPOEError"></a><h3>enum NMSettingPPPOEError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -103,7 +111,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_PPPOE_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-PPPOE-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_PPPOE_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_PPPOE_ERROR (nm_setting_pppoe_error_get_type ()) 
 </pre>
@@ -111,7 +119,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPPOE_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-PPPOE-ERROR:CAPS"></a><h3>NM_SETTING_PPPOE_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_ERROR nm_setting_pppoe_error_quark ()
 </pre>
@@ -119,53 +127,53 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_pppoe_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-pppoe-error-quark"></a><h3>nm_setting_pppoe_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_pppoe_error_quark        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPPOE_SERVICE">
+<div class="refsect2">
 <a name="NM-SETTING-PPPOE-SERVICE:CAPS"></a><h3>NM_SETTING_PPPOE_SERVICE</h3>
-<pre class="programlisting">#define NM_SETTING_PPPOE_SERVICE  "service"
+<pre class="programlisting">#define NM_SETTING_PPPOE_SERVICE        "service"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPPOE_USERNAME">
+<div class="refsect2">
 <a name="NM-SETTING-PPPOE-USERNAME:CAPS"></a><h3>NM_SETTING_PPPOE_USERNAME</h3>
-<pre class="programlisting">#define NM_SETTING_PPPOE_USERNAME "username"
+<pre class="programlisting">#define NM_SETTING_PPPOE_USERNAME       "username"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_PPPOE_PASSWORD">
+<div class="refsect2">
 <a name="NM-SETTING-PPPOE-PASSWORD:CAPS"></a><h3>NM_SETTING_PPPOE_PASSWORD</h3>
-<pre class="programlisting">#define NM_SETTING_PPPOE_PASSWORD "password"
+<pre class="programlisting">#define NM_SETTING_PPPOE_PASSWORD       "password"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingPPPOE">
+<div class="refsect2">
+<a name="NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_PPPOE_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingPPPOE-struct"></a><h3>NMSettingPPPOE</h3>
 <pre class="programlisting">typedef struct _NMSettingPPPOE NMSettingPPPOE;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingPPPOEClass">
+<div class="refsect2">
 <a name="NMSettingPPPOEClass"></a><h3>NMSettingPPPOEClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -181,105 +189,65 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_pppoe_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-pppoe-get-type"></a><h3>nm_setting_pppoe_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_pppoe_get_type           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_pppoe_new ()">
+<div class="refsect2">
 <a name="nm-setting-pppoe-new"></a><h3>nm_setting_pppoe_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_pppoe_new                (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_pppoe_get_service ()">
+<div class="refsect2">
 <a name="nm-setting-pppoe-get-service"></a><h3>nm_setting_pppoe_get_service ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_pppoe_get_service        (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_pppoe_get_username ()">
+<div class="refsect2">
 <a name="nm-setting-pppoe-get-username"></a><h3>nm_setting_pppoe_get_username ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_pppoe_get_username       (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_pppoe_get_password ()">
+<div class="refsect2">
 <a name="nm-setting-pppoe-get-password"></a><h3>nm_setting_pppoe_get_password ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_pppoe_get_password       (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);</pre>
 <p>
 </p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-pppoe-get-password-flags"></a><h3>nm_setting_pppoe_get_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_pppoe_get_password_flags
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--password" title='The "password" property'><span class="type">"password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingPPPOE.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "password" property'>
+<div class="refsect2">
 <a name="NMSettingPPPOE--password"></a><h3>The <code class="literal">"password"</code> property</h3>
 <pre class="programlisting">  "password"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -288,7 +256,17 @@ Password used to authenticate with the PPPoE service.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "service" property'>
+<div class="refsect2">
+<a name="NMSettingPPPOE--password-flags"></a><h3>The <code class="literal">"password-flags"</code> property</h3>
+<pre class="programlisting">  "password-flags"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--password" title='The "password" property'><span class="type">"password"</span></a>:.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingPPPOE--service"></a><h3>The <code class="literal">"service"</code> property</h3>
 <pre class="programlisting">  "service"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -300,7 +278,7 @@ access concentrators or a specific service is known to be required.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "username" property'>
+<div class="refsect2">
 <a name="NMSettingPPPOE--username"></a><h3>The <code class="literal">"username"</code> property</h3>
 <pre class="programlisting">  "username"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -312,6 +290,6 @@ Username used to authenticate with the PPPoE service.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 9d8082bd..5e5483ec 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingBluetooth.html" title="NMSettingBluetooth">
 <link rel="next" href="NMSettingCdma.html" title="NMSettingCdma">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingSerial.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingSerial">
+<div class="refentry">
 <a name="NMSettingSerial"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingSerial.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingSerial.html#NM-SETTING-SERIAL-SETTING-NAME:CAPS" title="NM_SETTING_SERIAL_SETTING_NAME">NM_SETTING_SERIAL_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialError" title="enum NMSettingSerialError">NMSettingSerialError</a>;
+<a name="NMSettingSerialError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingSerial.html#NM-SETTING-SERIAL-SETTING-NAME:CAPS" title="NM_SETTING_SERIAL_SETTING_NAME">NM_SETTING_SERIAL_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialError">NMSettingSerialError</a>;
 #define             <a class="link" href="NMSettingSerial.html#NM-TYPE-SETTING-SERIAL-ERROR:CAPS" title="NM_TYPE_SETTING_SERIAL_ERROR">NM_TYPE_SETTING_SERIAL_ERROR</a>
 #define             <a class="link" href="NMSettingSerial.html#NM-SETTING-SERIAL-ERROR:CAPS" title="NM_SETTING_SERIAL_ERROR">NM_SETTING_SERIAL_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingSerial.html#nm-setting-serial-error-quark" title="nm_setting_serial_error_quark ()">nm_setting_serial_error_quark</a>       (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -62,15 +62,19 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="returnvalue">guint64</span></a>             <a class="link" href="NMSettingSerial.html#nm-setting-serial-get-send-delay" title="nm_setting_serial_get_send_delay ()">nm_setting_serial_get_send_delay</a>    (<em class="parameter"><code><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingSerial.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingSerialError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingSerial
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingSerial.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingSerial.html#NMSettingSerial--baud" title='The "baud" property'>baud</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
@@ -80,14 +84,14 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
   "<a class="link" href="NMSettingSerial.html#NMSettingSerial--stopbits" title='The "stopbits" property'>stopbits</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingSerial.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingSerial.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_SERIAL_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-SETTING-NAME:CAPS"></a><h3>NM_SETTING_SERIAL_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_SETTING_NAME "serial"
 </pre>
@@ -95,7 +99,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingSerialError">
+<div class="refsect2">
 <a name="NMSettingSerialError"></a><h3>enum NMSettingSerialError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -109,7 +113,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_SERIAL_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-SERIAL-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_SERIAL_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_SERIAL_ERROR (nm_setting_serial_error_get_type ()) 
 </pre>
@@ -117,7 +121,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_SERIAL_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-ERROR:CAPS"></a><h3>NM_SETTING_SERIAL_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
 </pre>
@@ -125,22 +129,14 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-serial-error-quark"></a><h3>nm_setting_serial_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_serial_error_quark       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_SERIAL_BAUD">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-BAUD:CAPS"></a><h3>NM_SETTING_SERIAL_BAUD</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_BAUD "baud"
 </pre>
@@ -148,7 +144,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_SERIAL_BITS">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-BITS:CAPS"></a><h3>NM_SETTING_SERIAL_BITS</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_BITS "bits"
 </pre>
@@ -156,7 +152,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_SERIAL_PARITY">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-PARITY:CAPS"></a><h3>NM_SETTING_SERIAL_PARITY</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_PARITY "parity"
 </pre>
@@ -164,7 +160,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_SERIAL_STOPBITS">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-STOPBITS:CAPS"></a><h3>NM_SETTING_SERIAL_STOPBITS</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_STOPBITS "stopbits"
 </pre>
@@ -172,7 +168,7 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_SERIAL_SEND_DELAY">
+<div class="refsect2">
 <a name="NM-SETTING-SERIAL-SEND-DELAY:CAPS"></a><h3>NM_SETTING_SERIAL_SEND_DELAY</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 </pre>
@@ -180,14 +176,14 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingSerial">
+<div class="refsect2">
 <a name="NMSettingSerial-struct"></a><h3>NMSettingSerial</h3>
 <pre class="programlisting">typedef struct _NMSettingSerial NMSettingSerial;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingSerialClass">
+<div class="refsect2">
 <a name="NMSettingSerialClass"></a><h3>NMSettingSerialClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -203,149 +199,58 @@ enum                <a class="link" href="NMSettingSerial.html#NMSettingSerialEr
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-serial-get-type"></a><h3>nm_setting_serial_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_serial_get_type          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_new ()">
+<div class="refsect2">
 <a name="nm-setting-serial-new"></a><h3>nm_setting_serial_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_serial_new               (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_get_baud ()">
+<div class="refsect2">
 <a name="nm-setting-serial-get-baud"></a><h3>nm_setting_serial_get_baud ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               nm_setting_serial_get_baud          (<em class="parameter"><code><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_get_bits ()">
+<div class="refsect2">
 <a name="nm-setting-serial-get-bits"></a><h3>nm_setting_serial_get_bits ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               nm_setting_serial_get_bits          (<em class="parameter"><code><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_get_parity ()">
+<div class="refsect2">
 <a name="nm-setting-serial-get-parity"></a><h3>nm_setting_serial_get_parity ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span>                nm_setting_serial_get_parity        (<em class="parameter"><code><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_get_stopbits ()">
+<div class="refsect2">
 <a name="nm-setting-serial-get-stopbits"></a><h3>nm_setting_serial_get_stopbits ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               nm_setting_serial_get_stopbits      (<em class="parameter"><code><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_serial_get_send_delay ()">
+<div class="refsect2">
 <a name="nm-setting-serial-get-send-delay"></a><h3>nm_setting_serial_get_send_delay ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="returnvalue">guint64</span></a>             nm_setting_serial_get_send_delay    (<em class="parameter"><code><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingSerial.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "baud" property'>
+<div class="refsect2">
 <a name="NMSettingSerial--baud"></a><h3>The <code class="literal">"baud"</code> property</h3>
 <pre class="programlisting">  "baud"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -356,7 +261,7 @@ ignore speed settings and use the highest available speed.
 <p>Default value: 57600</p>
 </div>
 <hr>
-<div class="refsect2" title='The "bits" property'>
+<div class="refsect2">
 <a name="NMSettingSerial--bits"></a><h3>The <code class="literal">"bits"</code> property</h3>
 <pre class="programlisting">  "bits"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -366,7 +271,7 @@ Byte-width of the serial communication.
 <p>Default value: 8</p>
 </div>
 <hr>
-<div class="refsect2" title='The "parity" property'>
+<div class="refsect2">
 <a name="NMSettingSerial--parity"></a><h3>The <code class="literal">"parity"</code> property</h3>
 <pre class="programlisting">  "parity"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -377,7 +282,7 @@ odd parity, or 'n' for no parity.
 <p>Default value: 110</p>
 </div>
 <hr>
-<div class="refsect2" title='The "send-delay" property'>
+<div class="refsect2">
 <a name="NMSettingSerial--send-delay"></a><h3>The <code class="literal">"send-delay"</code> property</h3>
 <pre class="programlisting">  "send-delay"               <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a>               : Read / Write / Construct</pre>
 <p>
@@ -386,7 +291,7 @@ Time to delay between each byte sent to the modem, in microseconds.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "stopbits" property'>
+<div class="refsect2">
 <a name="NMSettingSerial--stopbits"></a><h3>The <code class="literal">"stopbits"</code> property</h3>
 <pre class="programlisting">  "stopbits"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -400,6 +305,6 @@ The 1 in '8n1' for example.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index 311f1008..e8cd2fb9 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingPPPOE.html" title="NMSettingPPPOE">
 <link rel="next" href="libnm-util-nm-utils.html" title="nm-utils">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingVPN.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingVPN">
+<div class="refentry">
 <a name="NMSettingVPN"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingVPN.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingVPN.html#NM-SETTING-VPN-SETTING-NAME:CAPS" title="NM_SETTING_VPN_SETTING_NAME">NM_SETTING_VPN_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingVPN.html#NMSettingVpnError" title="enum NMSettingVpnError">NMSettingVpnError</a>;
+<a name="NMSettingVpnError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingVPN.html#NM-SETTING-VPN-SETTING-NAME:CAPS" title="NM_SETTING_VPN_SETTING_NAME">NM_SETTING_VPN_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingVPN.html#NMSettingVpnError">NMSettingVpnError</a>;
 #define             <a class="link" href="NMSettingVPN.html#NM-TYPE-SETTING-VPN-ERROR:CAPS" title="NM_TYPE_SETTING_VPN_ERROR">NM_TYPE_SETTING_VPN_ERROR</a>
 #define             <a class="link" href="NMSettingVPN.html#NM-SETTING-VPN-ERROR:CAPS" title="NM_SETTING_VPN_ERROR">NM_SETTING_VPN_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingVPN.html#nm-setting-vpn-error-quark" title="nm_setting_vpn_error_quark ()">nm_setting_vpn_error_quark</a>          (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -52,7 +52,7 @@ enum                <a class="link" href="NMSettingVPN.html#NMSettingVpnError" t
 #define             <a class="link" href="NMSettingVPN.html#NM-SETTING-VPN-SECRETS:CAPS" title="NM_SETTING_VPN_SECRETS">NM_SETTING_VPN_SECRETS</a>
                     <a class="link" href="NMSettingVPN.html#NMSettingVPN-struct" title="NMSettingVPN">NMSettingVPN</a>;
                     <a class="link" href="NMSettingVPN.html#NMSettingVPNClass" title="NMSettingVPNClass">NMSettingVPNClass</a>;
-<span class="returnvalue">void</span>                (<a class="link" href="NMSettingVPN.html#VPNIterFunc" title="VPNIterFunc ()">*VPNIterFunc</a>)                      (<em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
+<span class="returnvalue">void</span>                (<a class="link" href="NMSettingVPN.html#NMVPNIterFunc" title="NMVPNIterFunc ()">*NMVPNIterFunc</a>)                    (<em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingVPN.html#nm-setting-vpn-get-type" title="nm_setting_vpn_get_type ()">nm_setting_vpn_get_type</a>             (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -67,7 +67,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingVPN.html#nm-setting-vpn-remove-data-item" title="nm_setting_vpn_remove_data_item ()">nm_setting_vpn_remove_data_item</a>     (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingVPN.html#nm-setting-vpn-foreach-data-item" title="nm_setting_vpn_foreach_data_item ()">nm_setting_vpn_foreach_data_item</a>    (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#VPNIterFunc" title="VPNIterFunc ()"><span class="type">VPNIterFunc</span></a> func</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#NMVPNIterFunc" title="NMVPNIterFunc ()"><span class="type">NMVPNIterFunc</span></a> func</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingVPN.html#nm-setting-vpn-add-secret" title="nm_setting_vpn_add_secret ()">nm_setting_vpn_add_secret</a>           (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
@@ -77,19 +77,23 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingVPN.html#nm-setting-vpn-remove-secret" title="nm_setting_vpn_remove_secret ()">nm_setting_vpn_remove_secret</a>        (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="NMSettingVPN.html#nm-setting-vpn-foreach-secret" title="nm_setting_vpn_foreach_secret ()">nm_setting_vpn_foreach_secret</a>       (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#VPNIterFunc" title="VPNIterFunc ()"><span class="type">VPNIterFunc</span></a> func</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#NMVPNIterFunc" title="NMVPNIterFunc ()"><span class="type">NMVPNIterFunc</span></a> func</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingVPN.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingVpnError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingVPN
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingVPN.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingVPN.html#NMSettingVPN--data" title='The "data" property'>data</a>"                     <span class="type">GHashTable_gchararray+gchararray_*</span>  : Read / Write
@@ -98,14 +102,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
   "<a class="link" href="NMSettingVPN.html#NMSettingVPN--user-name" title='The "user-name" property'>user-name</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingVPN.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingVPN.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_VPN_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-VPN-SETTING-NAME:CAPS"></a><h3>NM_SETTING_VPN_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_SETTING_NAME "vpn"
 </pre>
@@ -113,7 +117,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingVpnError">
+<div class="refsect2">
 <a name="NMSettingVpnError"></a><h3>enum NMSettingVpnError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -126,7 +130,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_VPN_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-VPN-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_VPN_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_VPN_ERROR (nm_setting_vpn_error_get_type ()) 
 </pre>
@@ -134,7 +138,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_VPN_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-VPN-ERROR:CAPS"></a><h3>NM_SETTING_VPN_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
 </pre>
@@ -142,22 +146,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-error-quark"></a><h3>nm_setting_vpn_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_vpn_error_quark          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_VPN_SERVICE_TYPE">
+<div class="refsect2">
 <a name="NM-SETTING-VPN-SERVICE-TYPE:CAPS"></a><h3>NM_SETTING_VPN_SERVICE_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
 </pre>
@@ -165,7 +161,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_VPN_USER_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-VPN-USER-NAME:CAPS"></a><h3>NM_SETTING_VPN_USER_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_USER_NAME    "user-name"
 </pre>
@@ -173,7 +169,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_VPN_DATA">
+<div class="refsect2">
 <a name="NM-SETTING-VPN-DATA:CAPS"></a><h3>NM_SETTING_VPN_DATA</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_DATA         "data"
 </pre>
@@ -181,7 +177,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_VPN_SECRETS">
+<div class="refsect2">
 <a name="NM-SETTING-VPN-SECRETS:CAPS"></a><h3>NM_SETTING_VPN_SECRETS</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_SECRETS      "secrets"
 </pre>
@@ -189,14 +185,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingVPN">
+<div class="refsect2">
 <a name="NMSettingVPN-struct"></a><h3>NMSettingVPN</h3>
 <pre class="programlisting">typedef struct _NMSettingVPN NMSettingVPN;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingVPNClass">
+<div class="refsect2">
 <a name="NMSettingVPNClass"></a><h3>NMSettingVPNClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -212,330 +208,156 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="VPNIterFunc ()">
-<a name="VPNIterFunc"></a><h3>VPNIterFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*VPNIterFunc)                      (<em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
+<div class="refsect2">
+<a name="NMVPNIterFunc"></a><h3>NMVPNIterFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMVPNIterFunc)                    (<em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *value</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-get-type"></a><h3>nm_setting_vpn_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_vpn_get_type             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_new ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-new"></a><h3>nm_setting_vpn_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_vpn_new                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_get_service_type ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-get-service-type"></a><h3>nm_setting_vpn_get_service_type ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_vpn_get_service_type     (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_get_user_name ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-get-user-name"></a><h3>nm_setting_vpn_get_user_name ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_vpn_get_user_name        (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_add_data_item ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-add-data-item"></a><h3>nm_setting_vpn_add_data_item ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_vpn_add_data_item        (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *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> *item</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_get_data_item ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-get-data-item"></a><h3>nm_setting_vpn_get_data_item ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_vpn_get_data_item        (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_remove_data_item ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-remove-data-item"></a><h3>nm_setting_vpn_remove_data_item ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_vpn_remove_data_item     (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_foreach_data_item ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-foreach-data-item"></a><h3>nm_setting_vpn_foreach_data_item ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_vpn_foreach_data_item    (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#VPNIterFunc" title="VPNIterFunc ()"><span class="type">VPNIterFunc</span></a> func</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#NMVPNIterFunc" title="NMVPNIterFunc ()"><span class="type">NMVPNIterFunc</span></a> func</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
+Iterates all data items stored in this setting
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>a <a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>func</code></em> :</span></p></td>
-<td>
+<td>an user provided function. <span class="annotation">[<acronym title="The callback is valid only during the call to the method."><span class="acronym">scope call</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
+<td>data to be passed to <em class="parameter"><code>func</code></em>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_add_secret ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-add-secret"></a><h3>nm_setting_vpn_add_secret ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_vpn_add_secret           (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *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> *secret</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>secret</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_get_secret ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-get-secret"></a><h3>nm_setting_vpn_get_secret ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_vpn_get_secret           (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_remove_secret ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-remove-secret"></a><h3>nm_setting_vpn_remove_secret ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_vpn_remove_secret        (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_vpn_foreach_secret ()">
+<div class="refsect2">
 <a name="nm-setting-vpn-foreach-secret"></a><h3>nm_setting_vpn_foreach_secret ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_vpn_foreach_secret       (<em class="parameter"><code><a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> *setting</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#VPNIterFunc" title="VPNIterFunc ()"><span class="type">VPNIterFunc</span></a> func</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="NMSettingVPN.html#NMVPNIterFunc" title="NMVPNIterFunc ()"><span class="type">NMVPNIterFunc</span></a> func</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
+Iterates all secrets stored in this setting.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>a <a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>func</code></em> :</span></p></td>
-<td>
+<td>an user provided function. <span class="annotation">[<acronym title="The callback is valid only during the call to the method."><span class="acronym">scope call</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
+<td>data to be passed to <em class="parameter"><code>func</code></em>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingVPN.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "data" property'>
+<div class="refsect2">
 <a name="NMSettingVPN--data"></a><h3>The <code class="literal">"data"</code> property</h3>
 <pre class="programlisting">  "data"                     <span class="type">GHashTable_gchararray+gchararray_*</span>  : Read / Write</pre>
 <p>
@@ -544,7 +366,7 @@ and values must be strings.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "secrets" property'>
+<div class="refsect2">
 <a name="NMSettingVPN--secrets"></a><h3>The <code class="literal">"secrets"</code> property</h3>
 <pre class="programlisting">  "secrets"                  <span class="type">GHashTable_gchararray+gchararray_*</span>  : Read / Write</pre>
 <p>
@@ -553,7 +375,7 @@ passwords or private keys.  Both keys and values must be strings.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "service-type" property'>
+<div class="refsect2">
 <a name="NMSettingVPN--service-type"></a><h3>The <code class="literal">"service-type"</code> property</h3>
 <pre class="programlisting">  "service-type"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -564,7 +386,7 @@ plugin.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "user-name" property'>
+<div class="refsect2">
 <a name="NMSettingVPN--user-name"></a><h3>The <code class="literal">"user-name"</code> property</h3>
 <pre class="programlisting">  "user-name"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>User name of the currently logged in user for connections provided by the user settings service.  This name is provided to the VPN plugin to use in lieu of a custom username provided by that VPN plugins specific configuration.  The VPN plugin itself decides which user name to use.</p>
@@ -574,6 +396,6 @@ plugin.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index 19b43451..d079de3a 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingConnection.html" title="NMSettingConnection">
 <link rel="next" href="NMSettingWireless.html" title="NMSettingWireless">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingWired.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingWired">
+<div class="refentry">
 <a name="NMSettingWired"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingWired.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingWired.html#NM-SETTING-WIRED-SETTING-NAME:CAPS" title="NM_SETTING_WIRED_SETTING_NAME">NM_SETTING_WIRED_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingWired.html#NMSettingWiredError" title="enum NMSettingWiredError">NMSettingWiredError</a>;
+<a name="NMSettingWiredError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingWired.html#NM-SETTING-WIRED-SETTING-NAME:CAPS" title="NM_SETTING_WIRED_SETTING_NAME">NM_SETTING_WIRED_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingWired.html#NMSettingWiredError">NMSettingWiredError</a>;
 #define             <a class="link" href="NMSettingWired.html#NM-TYPE-SETTING-WIRED-ERROR:CAPS" title="NM_TYPE_SETTING_WIRED_ERROR">NM_TYPE_SETTING_WIRED_ERROR</a>
 #define             <a class="link" href="NMSettingWired.html#NM-SETTING-WIRED-ERROR:CAPS" title="NM_SETTING_WIRED_ERROR">NM_SETTING_WIRED_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingWired.html#nm-setting-wired-error-quark" title="nm_setting_wired_error_quark ()">nm_setting_wired_error_quark</a>        (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -87,15 +87,19 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingWired.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingWiredError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingWired
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingWired.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingWired.html#NMSettingWired--auto-negotiate" title='The "auto-negotiate" property'>auto-negotiate</a>"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct
@@ -110,14 +114,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
   "<a class="link" href="NMSettingWired.html#NMSettingWired--speed" title='The "speed" property'>speed</a>"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingWired.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingWired.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_WIRED_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIRED_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
 </pre>
@@ -125,7 +129,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingWiredError">
+<div class="refsect2">
 <a name="NMSettingWiredError"></a><h3>enum NMSettingWiredError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -138,7 +142,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_WIRED_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-WIRED-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_WIRED_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_WIRED_ERROR (nm_setting_wired_error_get_type ()) 
 </pre>
@@ -146,7 +150,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-ERROR:CAPS"></a><h3>NM_SETTING_WIRED_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
 </pre>
@@ -154,22 +158,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-wired-error-quark"></a><h3>nm_setting_wired_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_wired_error_quark        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_PORT">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-PORT:CAPS"></a><h3>NM_SETTING_WIRED_PORT</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_PORT "port"
 </pre>
@@ -177,7 +173,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_SPEED">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-SPEED:CAPS"></a><h3>NM_SETTING_WIRED_SPEED</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_SPEED "speed"
 </pre>
@@ -185,7 +181,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_DUPLEX">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-DUPLEX:CAPS"></a><h3>NM_SETTING_WIRED_DUPLEX</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_DUPLEX "duplex"
 </pre>
@@ -193,7 +189,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_AUTO_NEGOTIATE">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-AUTO-NEGOTIATE:CAPS"></a><h3>NM_SETTING_WIRED_AUTO_NEGOTIATE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
 </pre>
@@ -201,7 +197,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_MAC_ADDRESS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRED_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
 </pre>
@@ -209,7 +205,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_CLONED_MAC_ADDRESS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-CLONED-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRED_CLONED_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
 </pre>
@@ -217,7 +213,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_MTU">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-MTU:CAPS"></a><h3>NM_SETTING_WIRED_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_MTU "mtu"
 </pre>
@@ -225,7 +221,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_S390_SUBCHANNELS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-S390-SUBCHANNELS:CAPS"></a><h3>NM_SETTING_WIRED_S390_SUBCHANNELS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels"
 </pre>
@@ -233,7 +229,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_S390_NETTYPE">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-S390-NETTYPE:CAPS"></a><h3>NM_SETTING_WIRED_S390_NETTYPE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
 </pre>
@@ -241,7 +237,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRED_S390_OPTIONS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRED-S390-OPTIONS:CAPS"></a><h3>NM_SETTING_WIRED_S390_OPTIONS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
 </pre>
@@ -249,14 +245,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingWired">
+<div class="refsect2">
 <a name="NMSettingWired-struct"></a><h3>NMSettingWired</h3>
 <pre class="programlisting">typedef struct _NMSettingWired NMSettingWired;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingWiredClass">
+<div class="refsect2">
 <a name="NMSettingWiredClass"></a><h3>NMSettingWiredClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -272,192 +268,71 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-type"></a><h3>nm_setting_wired_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_wired_get_type           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_new ()">
+<div class="refsect2">
 <a name="nm-setting-wired-new"></a><h3>nm_setting_wired_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_wired_new                (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_port ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-port"></a><h3>nm_setting_wired_get_port ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wired_get_port           (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_speed ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-speed"></a><h3>nm_setting_wired_get_speed ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wired_get_speed          (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_duplex ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-duplex"></a><h3>nm_setting_wired_get_duplex ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wired_get_duplex         (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_auto_negotiate ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-auto-negotiate"></a><h3>nm_setting_wired_get_auto_negotiate ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wired_get_auto_negotiate (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_mac_address ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-mac-address"></a><h3>nm_setting_wired_get_mac_address ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_wired_get_mac_address    (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_cloned_mac_address ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-cloned-mac-address"></a><h3>nm_setting_wired_get_cloned_mac_address ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_wired_get_cloned_mac_address
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_mtu ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-mtu"></a><h3>nm_setting_wired_get_mtu ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wired_get_mtu            (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_s390_subchannels ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-s390-subchannels"></a><h3>nm_setting_wired_get_s390_subchannels ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *   nm_setting_wired_get_s390_subchannels
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
@@ -476,15 +351,14 @@ conjunction with that device.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> of strings, each specifying one subchannel the
-s390 device uses to communicate to the host.
-</td>
+<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> of strings, each specifying one subchannel the
+s390 device uses to communicate to the host.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_s390_nettype ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-s390-nettype"></a><h3>nm_setting_wired_get_s390_nettype ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wired_get_s390_nettype   (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
 <p>
@@ -501,14 +375,13 @@ of 'qeth', 'lcs', or 'ctc'.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the s390 device type
-</td>
+<td>the s390 device type</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_num_s390_options ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-num-s390-options"></a><h3>nm_setting_wired_get_num_s390_options ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wired_get_num_s390_options
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>);</pre>
@@ -527,14 +400,13 @@ option individually using <a class="link" href="NMSettingWired.html#nm-setting-w
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the number of s390-specific device options
-</td>
+<td>the number of s390-specific device options</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_s390_option ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-s390-option"></a><h3>nm_setting_wired_get_s390_option ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wired_get_s390_option    (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>,
@@ -558,33 +430,30 @@ such as during option iteration.
 <tr>
 <td><p><span class="term"><em class="parameter"><code>idx</code></em> :</span></p></td>
 <td>index of the desired option, from 0 to
-<a class="link" href="NMSettingWired.html#nm-setting-wired-get-num-s390-options" title="nm_setting_wired_get_num_s390_options ()"><code class="function">nm_setting_wired_get_num_s390_options()</code></a> - 1
-</td>
+<a class="link" href="NMSettingWired.html#nm-setting-wired-get-num-s390-options" title="nm_setting_wired_get_num_s390_options ()"><code class="function">nm_setting_wired_get_num_s390_options()</code></a> - 1</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_key</code></em> :</span></p></td>
 <td>on return, the key name of the s390 specific option; this value is
-owned by the setting and should not be modified
-</td>
+owned by the setting and should not be modified</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_value</code></em> :</span></p></td>
 <td>on return, the value of the key of the s390 specific option; this
-value is owned by the setting and should not be modified
-</td>
+value is owned by the setting and should not be modified</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success if the index was valid and an option was found,
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success if the index was valid and an option was found,
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if the index was invalid (ie, greater than the number of options
-currently held by the setting)
-</td>
+currently held by the setting)</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_get_s390_option_by_key ()">
+<div class="refsect2">
 <a name="nm-setting-wired-get-s390-option-by-key"></a><h3>nm_setting_wired_get_s390_option_by_key ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wired_get_s390_option_by_key
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>,
@@ -603,91 +472,44 @@ Returns the value associated with the s390-specific option specified by
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>the key for which to retrieve the value
-</td>
+<td>the key for which to retrieve the value</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the value, or NULL if the key/value pair was never added to the
-setting; the value is owned by the setting and must not be modified
-</td>
+<td>the value, or NULL if the key/value pair was never added to the
+setting; the value is owned by the setting and must not be modified</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_add_s390_option ()">
+<div class="refsect2">
 <a name="nm-setting-wired-add-s390-option"></a><h3>nm_setting_wired_add_s390_option ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wired_add_s390_option    (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *item</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wired_remove_s390_option ()">
+<div class="refsect2">
 <a name="nm-setting-wired-remove-s390-option"></a><h3>nm_setting_wired_remove_s390_option ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wired_remove_s390_option (<em class="parameter"><code><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingWired.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "auto-negotiate" property'>
+<div class="refsect2">
 <a name="NMSettingWired--auto-negotiate"></a><h3>The <code class="literal">"auto-negotiate"</code> property</h3>
 <pre class="programlisting">  "auto-negotiate"           <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read / Write / Construct</pre>
 <p>If TRUE, allow auto-negotiation of port speed and duplex mode.  If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set.</p>
 <p>Default value: TRUE</p>
 </div>
 <hr>
-<div class="refsect2" title='The "cloned-mac-address" property'>
+<div class="refsect2">
 <a name="NMSettingWired--cloned-mac-address"></a><h3>The <code class="literal">"cloned-mac-address"</code> property</h3>
 <pre class="programlisting">  "cloned-mac-address"       <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -696,7 +518,7 @@ permanent MAC address.  This is known as MAC cloning or spoofing.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "duplex" property'>
+<div class="refsect2">
 <a name="NMSettingWired--duplex"></a><h3>The <code class="literal">"duplex"</code> property</h3>
 <pre class="programlisting">  "duplex"                   <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -706,7 +528,7 @@ Either 'half' or 'full'.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "mac-address" property'>
+<div class="refsect2">
 <a name="NMSettingWired--mac-address"></a><h3>The <code class="literal">"mac-address"</code> property</h3>
 <pre class="programlisting">  "mac-address"              <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -716,7 +538,7 @@ of the device (i.e. MAC spoofing).
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "mtu" property'>
+<div class="refsect2">
 <a name="NMSettingWired--mtu"></a><h3>The <code class="literal">"mtu"</code> property</h3>
 <pre class="programlisting">  "mtu"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -726,7 +548,7 @@ breaking larger packets up into multiple Ethernet frames.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "port" property'>
+<div class="refsect2">
 <a name="NMSettingWired--port"></a><h3>The <code class="literal">"port"</code> property</h3>
 <pre class="programlisting">  "port"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -738,7 +560,7 @@ If the device supports only one port type, this setting is ignored.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "s390-nettype" property'>
+<div class="refsect2">
 <a name="NMSettingWired--s390-nettype"></a><h3>The <code class="literal">"s390-nettype"</code> property</h3>
 <pre class="programlisting">  "s390-nettype"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -748,7 +570,7 @@ the different types of virtual network devices available on s390 systems.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "s390-options" property'>
+<div class="refsect2">
 <a name="NMSettingWired--s390-options"></a><h3>The <code class="literal">"s390-options"</code> property</h3>
 <pre class="programlisting">  "s390-options"             <span class="type">GHashTable_gchararray+gchararray_*</span>  : Read / Write</pre>
 <p>
@@ -759,7 +581,7 @@ alphanumeric characters (ie, [a-zA-Z0-9]).
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "s390-subchannels" property'>
+<div class="refsect2">
 <a name="NMSettingWired--s390-subchannels"></a><h3>The <code class="literal">"s390-subchannels"</code> property</h3>
 <pre class="programlisting">  "s390-subchannels"         <span class="type">GPtrArray_gchararray_</span>*  : Read / Write</pre>
 <p>
@@ -772,7 +594,7 @@ composed of hexadecimal characters and the period (.) character.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "speed" property'>
+<div class="refsect2">
 <a name="NMSettingWired--speed"></a><h3>The <code class="literal">"speed"</code> property</h3>
 <pre class="programlisting">  "speed"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -785,6 +607,6 @@ In Mbit/s, ie 100 == 100Mbit/s.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 34d1341b..21d51d29 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWired.html" title="NMSettingWired">
 <link rel="next" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingWireless.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingWireless">
+<div class="refentry">
 <a name="NMSettingWireless"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingWireless.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-SETTING-NAME:CAPS" title="NM_SETTING_WIRELESS_SETTING_NAME">NM_SETTING_WIRELESS_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingWireless.html#NMSettingWirelessError" title="enum NMSettingWirelessError">NMSettingWirelessError</a>;
+<a name="NMSettingWirelessError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-SETTING-NAME:CAPS" title="NM_SETTING_WIRELESS_SETTING_NAME">NM_SETTING_WIRELESS_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingWireless.html#NMSettingWirelessError">NMSettingWirelessError</a>;
 #define             <a class="link" href="NMSettingWireless.html#NM-TYPE-SETTING-WIRELESS-ERROR:CAPS" title="NM_TYPE_SETTING_WIRELESS_ERROR">NM_TYPE_SETTING_WIRELESS_ERROR</a>
 #define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-ERROR:CAPS" title="NM_SETTING_WIRELESS_ERROR">NM_SETTING_WIRELESS_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingWireless.html#nm-setting-wireless-error-quark" title="nm_setting_wireless_error_quark ()">nm_setting_wireless_error_quark</a>     (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -58,6 +58,8 @@ enum                <a class="link" href="NMSettingWireless.html#NMSettingWirele
 #define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS" title="NM_SETTING_WIRELESS_MTU">NM_SETTING_WIRELESS_MTU</a>
 #define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS" title="NM_SETTING_WIRELESS_SEEN_BSSIDS">NM_SETTING_WIRELESS_SEEN_BSSIDS</a>
 #define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-SEC:CAPS" title="NM_SETTING_WIRELESS_SEC">NM_SETTING_WIRELESS_SEC</a>
+#define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS" title="NM_SETTING_WIRELESS_MODE_ADHOC">NM_SETTING_WIRELESS_MODE_ADHOC</a>
+#define             <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS" title="NM_SETTING_WIRELESS_MODE_INFRA">NM_SETTING_WIRELESS_MODE_INFRA</a>
                     <a class="link" href="NMSettingWireless.html#NMSettingWireless-struct" title="NMSettingWireless">NMSettingWireless</a>;
                     <a class="link" href="NMSettingWireless.html#NMSettingWirelessClass" title="NMSettingWirelessClass">NMSettingWirelessClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingWireless.html#nm-setting-wireless-get-type" title="nm_setting_wireless_get_type ()">nm_setting_wireless_get_type</a>        (<em class="parameter"><code><span class="type">void</span></code></em>);
@@ -83,21 +85,25 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingWireless.html#nm-setting-wireless-ap-security-compatible" title="nm_setting_wireless_ap_security_compatible ()">nm_setting_wireless_ap_security_compatible</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *s_wireless</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *s_wireless_sec</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_flags</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_wpa</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_rsn</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_mode</code></em>);
+                                                         <em class="parameter"><code><span class="type">NM80211ApFlags</span> ap_flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">NM80211ApSecurityFlags</span> ap_wpa</code></em>,
+                                                         <em class="parameter"><code><span class="type">NM80211ApSecurityFlags</span> ap_rsn</code></em>,
+                                                         <em class="parameter"><code><span class="type">NM80211Mode</span> ap_mode</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingWireless.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingWirelessError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingWireless
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingWireless.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingWireless.html#NMSettingWireless--band" title='The "band" property'>band</a>"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
@@ -114,14 +120,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
   "<a class="link" href="NMSettingWireless.html#NMSettingWireless--tx-power" title='The "tx-power" property'>tx-power</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingWireless.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingWireless.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIRELESS_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
 </pre>
@@ -129,7 +135,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingWirelessError">
+<div class="refsect2">
 <a name="NMSettingWirelessError"></a><h3>enum NMSettingWirelessError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -144,7 +150,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_WIRELESS_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-WIRELESS-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_WIRELESS_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_WIRELESS_ERROR (nm_setting_wireless_error_get_type ()) 
 </pre>
@@ -152,7 +158,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-ERROR:CAPS"></a><h3>NM_SETTING_WIRELESS_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
 </pre>
@@ -160,22 +166,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-error-quark"></a><h3>nm_setting_wireless_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_wireless_error_quark     (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SSID">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SSID:CAPS"></a><h3>NM_SETTING_WIRELESS_SSID</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SSID        "ssid"
 </pre>
@@ -183,7 +181,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_MODE">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MODE:CAPS"></a><h3>NM_SETTING_WIRELESS_MODE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MODE        "mode"
 </pre>
@@ -191,7 +189,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_BAND">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-BAND:CAPS"></a><h3>NM_SETTING_WIRELESS_BAND</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_BAND        "band"
 </pre>
@@ -199,7 +197,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_CHANNEL">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-CHANNEL:CAPS"></a><h3>NM_SETTING_WIRELESS_CHANNEL</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_CHANNEL     "channel"
 </pre>
@@ -207,7 +205,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_BSSID">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-BSSID:CAPS"></a><h3>NM_SETTING_WIRELESS_BSSID</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_BSSID       "bssid"
 </pre>
@@ -215,7 +213,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_RATE">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-RATE:CAPS"></a><h3>NM_SETTING_WIRELESS_RATE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_RATE        "rate"
 </pre>
@@ -223,7 +221,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_TX_POWER">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-TX-POWER:CAPS"></a><h3>NM_SETTING_WIRELESS_TX_POWER</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
 </pre>
@@ -231,7 +229,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_MAC_ADDRESS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRELESS_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
 </pre>
@@ -239,7 +237,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-CLONED-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
 </pre>
@@ -247,7 +245,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_MTU">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MTU:CAPS"></a><h3>NM_SETTING_WIRELESS_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MTU         "mtu"
 </pre>
@@ -255,7 +253,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SEEN_BSSIDS">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS"></a><h3>NM_SETTING_WIRELESS_SEEN_BSSIDS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
 </pre>
@@ -263,7 +261,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SEC">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SEC:CAPS"></a><h3>NM_SETTING_WIRELESS_SEC</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SEC         "security"
 </pre>
@@ -271,14 +269,30 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingWireless">
+<div class="refsect2">
+<a name="NM-SETTING-WIRELESS-MODE-ADHOC:CAPS"></a><h3>NM_SETTING_WIRELESS_MODE_ADHOC</h3>
+<pre class="programlisting">#define NM_SETTING_WIRELESS_MODE_ADHOC  "adhoc"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-WIRELESS-MODE-INFRA:CAPS"></a><h3>NM_SETTING_WIRELESS_MODE_INFRA</h3>
+<pre class="programlisting">#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingWireless-struct"></a><h3>NMSettingWireless</h3>
 <pre class="programlisting">typedef struct _NMSettingWireless NMSettingWireless;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingWirelessClass">
+<div class="refsect2">
 <a name="NMSettingWirelessClass"></a><h3>NMSettingWirelessClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -294,414 +308,138 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-type"></a><h3>nm_setting_wireless_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_wireless_get_type        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_new ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-new"></a><h3>nm_setting_wireless_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_wireless_new             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_ssid ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-ssid"></a><h3>nm_setting_wireless_get_ssid ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_wireless_get_ssid        (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_mode ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-mode"></a><h3>nm_setting_wireless_get_mode ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_get_mode        (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_band ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-band"></a><h3>nm_setting_wireless_get_band ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_get_band        (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_channel ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-channel"></a><h3>nm_setting_wireless_get_channel ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_get_channel     (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_bssid ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-bssid"></a><h3>nm_setting_wireless_get_bssid ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_wireless_get_bssid       (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_rate ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-rate"></a><h3>nm_setting_wireless_get_rate ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_get_rate        (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_tx_power ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-tx-power"></a><h3>nm_setting_wireless_get_tx_power ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_get_tx_power    (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_mac_address ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-mac-address"></a><h3>nm_setting_wireless_get_mac_address ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_wireless_get_mac_address (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_cloned_mac_address ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-cloned-mac-address"></a><h3>nm_setting_wireless_get_cloned_mac_address ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *  nm_setting_wireless_get_cloned_mac_address
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_mtu ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-mtu"></a><h3>nm_setting_wireless_get_mtu ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_get_mtu         (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_security ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-security"></a><h3>nm_setting_wireless_get_security ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_get_security    (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_add_seen_bssid ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-add-seen-bssid"></a><h3>nm_setting_wireless_add_seen_bssid ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wireless_add_seen_bssid  (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *bssid</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>bssid</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_num_seen_bssids ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-num-seen-bssids"></a><h3>nm_setting_wireless_get_num_seen_bssids ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_get_num_seen_bssids
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_get_seen_bssid ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-get-seen-bssid"></a><h3>nm_setting_wireless_get_seen_bssid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_get_seen_bssid  (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_ap_security_compatible ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-ap-security-compatible"></a><h3>nm_setting_wireless_ap_security_compatible ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wireless_ap_security_compatible
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *s_wireless</code></em>,
                                                          <em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *s_wireless_sec</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_flags</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_wpa</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_rsn</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ap_mode</code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>s_wireless</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>s_wireless_sec</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>ap_flags</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>ap_wpa</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>ap_rsn</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>ap_mode</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
+                                                         <em class="parameter"><code><span class="type">NM80211ApFlags</span> ap_flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">NM80211ApSecurityFlags</span> ap_wpa</code></em>,
+                                                         <em class="parameter"><code><span class="type">NM80211ApSecurityFlags</span> ap_rsn</code></em>,
+                                                         <em class="parameter"><code><span class="type">NM80211Mode</span> ap_mode</code></em>);</pre>
+<p>
+</p>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingWireless.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "band" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--band"></a><h3>The <code class="literal">"band"</code> property</h3>
 <pre class="programlisting">  "band"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -715,7 +453,7 @@ capability and may not work with all drivers.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "bssid" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--bssid"></a><h3>The <code class="literal">"bssid"</code> property</h3>
 <pre class="programlisting">  "bssid"                    <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -726,7 +464,7 @@ creating an Ad-Hoc network and is unlikely to in the future.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "channel" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--channel"></a><h3>The <code class="literal">"channel"</code> property</h3>
 <pre class="programlisting">  "channel"                  <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -738,7 +476,7 @@ also requires the 'band' property to be set.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "cloned-mac-address" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--cloned-mac-address"></a><h3>The <code class="literal">"cloned-mac-address"</code> property</h3>
 <pre class="programlisting">  "cloned-mac-address"       <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -747,7 +485,7 @@ permanent MAC address.  This is known as MAC cloning or spoofing.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "mac-address" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--mac-address"></a><h3>The <code class="literal">"mac-address"</code> property</h3>
 <pre class="programlisting">  "mac-address"              <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -757,7 +495,7 @@ of the device (i.e. MAC spoofing).
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "mode" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--mode"></a><h3>The <code class="literal">"mode"</code> property</h3>
 <pre class="programlisting">  "mode"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -767,7 +505,7 @@ infrastructure is assumed.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "mtu" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--mtu"></a><h3>The <code class="literal">"mtu"</code> property</h3>
 <pre class="programlisting">  "mtu"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -777,7 +515,7 @@ breaking larger packets up into multiple Ethernet frames.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "rate" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--rate"></a><h3>The <code class="literal">"rate"</code> property</h3>
 <pre class="programlisting">  "rate"                     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -789,7 +527,7 @@ support setting a static bitrate.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "security" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--security"></a><h3>The <code class="literal">"security"</code> property</h3>
 <pre class="programlisting">  "security"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -800,7 +538,7 @@ the connection contains a valid 802-11-wireless-security setting.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "seen-bssids" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--seen-bssids"></a><h3>The <code class="literal">"seen-bssids"</code> property</h3>
 <pre class="programlisting">  "seen-bssids"              <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -814,7 +552,7 @@ find hidden APs by matching up scan results with the BSSIDs in this list.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "ssid" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--ssid"></a><h3>The <code class="literal">"ssid"</code> property</h3>
 <pre class="programlisting">  "ssid"                     <span class="type">GArray_guchar_</span>*       : Read / Write</pre>
 <p>
@@ -822,7 +560,7 @@ SSID of the WiFi network.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "tx-power" property'>
+<div class="refsect2">
 <a name="NMSettingWireless--tx-power"></a><h3>The <code class="literal">"tx-power"</code> property</h3>
 <pre class="programlisting">  "tx-power"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -836,6 +574,6 @@ devices support setting a static transmit power.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index 9642f812..7fdbc952 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWireless.html" title="NMSettingWireless">
 <link rel="next" href="NMSettingBluetooth.html" title="NMSettingBluetooth">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#NMSettingWirelessSecurity.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="NMSettingWirelessSecurity">
+<div class="refentry">
 <a name="NMSettingWirelessSecurity"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,10 +39,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="NMSettingWirelessSecurity.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS" title="NM_SETTING_WIRELESS_SECURITY_SETTING_NAME">NM_SETTING_WIRELESS_SECURITY_SETTING_NAME</a>
-enum                <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityError" title="enum NMSettingWirelessSecurityError">NMSettingWirelessSecurityError</a>;
+<a name="NMSettingWirelessSecurityError"></a><pre class="synopsis">#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS" title="NM_SETTING_WIRELESS_SECURITY_SETTING_NAME">NM_SETTING_WIRELESS_SECURITY_SETTING_NAME</a>
+enum                <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityError">NMSettingWirelessSecurityError</a>;
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-TYPE-SETTING-WIRELESS-SECURITY-ERROR:CAPS" title="NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR">NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR</a>
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR:CAPS" title="NM_SETTING_WIRELESS_SECURITY_ERROR">NM_SETTING_WIRELESS_SECURITY_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-error-quark" title="nm_setting_wireless_security_error_quark ()">nm_setting_wireless_security_error_quark</a>
@@ -59,9 +59,12 @@ enum                <a class="link" href="NMSettingWirelessSecurity.html#NMWepKe
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY1">NM_SETTING_WIRELESS_SECURITY_WEP_KEY1</a>
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY2">NM_SETTING_WIRELESS_SECURITY_WEP_KEY2</a>
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY3">NM_SETTING_WIRELESS_SECURITY_WEP_KEY3</a>
+#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS">NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS</a>
+#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE">NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE</a>
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS" title="NM_SETTING_WIRELESS_SECURITY_PSK">NM_SETTING_WIRELESS_SECURITY_PSK</a>
+#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS">NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS</a>
 #define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS" title="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD">NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD</a>
-#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE">NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE</a>
+#define             <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS">NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS</a>
                     <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>;
                     <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityClass" title="NMSettingWirelessSecurityClass">NMSettingWirelessSecurityClass</a>;
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-type" title="nm_setting_wireless_security_get_type ()">nm_setting_wireless_security_get_type</a>
@@ -110,10 +113,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk" title="nm_setting_wireless_security_get_psk ()">nm_setting_wireless_security_get_psk</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk-flags" title="nm_setting_wireless_security_get_psk_flags ()">nm_setting_wireless_security_get_psk_flags</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-username" title="nm_setting_wireless_security_get_leap_username ()">nm_setting_wireless_security_get_leap_username</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password" title="nm_setting_wireless_security_get_leap_password ()">nm_setting_wireless_security_get_leap_password</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password-flags" title="nm_setting_wireless_security_get_leap_password_flags ()">nm_setting_wireless_security_get_leap_password_flags</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key" title="nm_setting_wireless_security_get_wep_key ()">nm_setting_wireless_security_get_wep_key</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);
@@ -125,29 +132,38 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-auth-alg" title="nm_setting_wireless_security_get_auth_alg ()">nm_setting_wireless_security_get_auth_alg</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-flags" title="nm_setting_wireless_security_get_wep_key_flags ()">nm_setting_wireless_security_get_wep_key_flags</a>
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType"><span class="returnvalue">NMWepKeyType</span></a>        <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-type" title="nm_setting_wireless_security_get_wep_key_type ()">nm_setting_wireless_security_get_wep_key_type</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="NMSettingWirelessSecurity.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
+  GEnum
+   +----NMSettingWirelessSecurityError
+</pre>
+<pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
          +----NMSettingWirelessSecurity
 </pre>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="NMSettingWirelessSecurity.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg" title='The "auth-alg" property'>auth-alg</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--group" title='The "group" property'>group</a>"                    <span class="type">GSList_gchararray_</span>*   : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt" title='The "key-mgmt" property'>key-mgmt</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password" title='The "leap-password" property'>leap-password</a>"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password-flags" title='The "leap-password-flags" property'>leap-password-flags</a>"      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username" title='The "leap-username" property'>leap-username</a>"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--pairwise" title='The "pairwise" property'>pairwise</a>"                 <span class="type">GSList_gchararray_</span>*   : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--proto" title='The "proto" property'>proto</a>"                    <span class="type">GSList_gchararray_</span>*   : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk" title='The "psk" property'>psk</a>"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk-flags" title='The "psk-flags" property'>psk-flags</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
+  "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-flags" title='The "wep-key-flags" property'>wep-key-flags</a>"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type" title='The "wep-key-type" property'>wep-key-type</a>"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key0" title='The "wep-key0" property'>wep-key0</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key1" title='The "wep-key1" property'>wep-key1</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
@@ -156,14 +172,14 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
   "<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-tx-keyidx" title='The "wep-tx-keyidx" property'>wep-tx-keyidx</a>"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="NMSettingWirelessSecurity.description"></a><h2>Description</h2>
 <p>
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="NMSettingWirelessSecurity.details"></a><h2>Details</h2>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_SETTING_NAME">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
 </pre>
@@ -171,7 +187,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="enum NMSettingWirelessSecurityError">
+<div class="refsect2">
 <a name="NMSettingWirelessSecurityError"></a><h3>enum NMSettingWirelessSecurityError</h3>
 <pre class="programlisting">typedef enum
 {
@@ -188,7 +204,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR">
+<div class="refsect2">
 <a name="NM-TYPE-SETTING-WIRELESS-SECURITY-ERROR:CAPS"></a><h3>NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR</h3>
 <pre class="programlisting">#define NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR (nm_setting_wireless_security_error_get_type ()) 
 </pre>
@@ -196,7 +212,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_ERROR">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-ERROR:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
 </pre>
@@ -204,23 +220,15 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_error_quark ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-error-quark"></a><h3>nm_setting_wireless_security_error_quark ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              nm_setting_wireless_security_error_quark
                                                         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="enum NMWepKeyType">
+<div class="refsect2">
 <a name="NMWepKeyType"></a><h3>enum NMWepKeyType</h3>
 <pre class="programlisting">typedef enum {
 	NM_WEP_KEY_TYPE_UNKNOWN = 0,
@@ -234,7 +242,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_KEY_MGMT">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-KEY-MGMT:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_KEY_MGMT</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
 </pre>
@@ -242,7 +250,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-TX-KEYIDX:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
 </pre>
@@ -250,7 +258,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_AUTH_ALG">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-AUTH-ALG:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_AUTH_ALG</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
 </pre>
@@ -258,7 +266,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_PROTO">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PROTO:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PROTO</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
 </pre>
@@ -266,7 +274,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_PAIRWISE">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PAIRWISE:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PAIRWISE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
 </pre>
@@ -274,7 +282,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_GROUP">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-GROUP:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_GROUP</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
 </pre>
@@ -282,7 +290,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-LEAP-USERNAME:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME "leap-username"
 </pre>
@@ -290,7 +298,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY0">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY0:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY0</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
 </pre>
@@ -298,7 +306,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY1">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY1</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
 </pre>
@@ -306,7 +314,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY2">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY2</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
 </pre>
@@ -314,7 +322,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY3">
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY3</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
 </pre>
@@ -322,7 +330,23 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_PSK">
+<div class="refsect2">
+<a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE</h3>
+<pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PSK:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PSK</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
 </pre>
@@ -330,7 +354,15 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD">
+<div class="refsect2">
+<a name="NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
 </pre>
@@ -338,22 +370,22 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE">
-<a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE</h3>
-<pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
+<div class="refsect2">
+<a name="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS</h3>
+<pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingWirelessSecurity">
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity-struct"></a><h3>NMSettingWirelessSecurity</h3>
 <pre class="programlisting">typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;</pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="NMSettingWirelessSecurityClass">
+<div class="refsect2">
 <a name="NMSettingWirelessSecurityClass"></a><h3>NMSettingWirelessSecurityClass</h3>
 <pre class="programlisting">typedef struct {
 	NMSettingClass parent;
@@ -369,522 +401,236 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_type ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-type"></a><h3>nm_setting_wireless_security_get_type ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               nm_setting_wireless_security_get_type
                                                         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_new ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-new"></a><h3>nm_setting_wireless_security_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *         nm_setting_wireless_security_new    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_key_mgmt ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-key-mgmt"></a><h3>nm_setting_wireless_security_get_key_mgmt ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_key_mgmt
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_num_protos ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-num-protos"></a><h3>nm_setting_wireless_security_get_num_protos ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_security_get_num_protos
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_proto ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-proto"></a><h3>nm_setting_wireless_security_get_proto ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_proto
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_add_proto ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-add-proto"></a><h3>nm_setting_wireless_security_add_proto ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wireless_security_add_proto
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *proto</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proto</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_remove_proto ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-remove-proto"></a><h3>nm_setting_wireless_security_remove_proto ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_remove_proto
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_clear_protos ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-clear-protos"></a><h3>nm_setting_wireless_security_clear_protos ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_clear_protos
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_num_pairwise ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-num-pairwise"></a><h3>nm_setting_wireless_security_get_num_pairwise ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_security_get_num_pairwise
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_pairwise ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-pairwise"></a><h3>nm_setting_wireless_security_get_pairwise ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_pairwise
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_add_pairwise ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-add-pairwise"></a><h3>nm_setting_wireless_security_add_pairwise ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wireless_security_add_pairwise
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *pairwise</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>pairwise</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_remove_pairwise ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-remove-pairwise"></a><h3>nm_setting_wireless_security_remove_pairwise ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_remove_pairwise
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_clear_pairwise ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-clear-pairwise"></a><h3>nm_setting_wireless_security_clear_pairwise ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_clear_pairwise
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_num_groups ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-num-groups"></a><h3>nm_setting_wireless_security_get_num_groups ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_security_get_num_groups
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_group ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-group"></a><h3>nm_setting_wireless_security_get_group ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_group
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_add_group ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-add-group"></a><h3>nm_setting_wireless_security_add_group ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_wireless_security_add_group
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *group</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>group</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_remove_group ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-remove-group"></a><h3>nm_setting_wireless_security_remove_group ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_remove_group
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>i</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_clear_groups ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-clear-groups"></a><h3>nm_setting_wireless_security_clear_groups ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_clear_groups
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_psk ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-psk"></a><h3>nm_setting_wireless_security_get_psk ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_psk
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-wireless-security-get-psk-flags"></a><h3>nm_setting_wireless_security_get_psk_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_wireless_security_get_psk_flags
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk" title='The "psk" property'><span class="type">"psk"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_leap_username ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-leap-username"></a><h3>nm_setting_wireless_security_get_leap_username ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_leap_username
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_leap_password ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-leap-password"></a><h3>nm_setting_wireless_security_get_leap_password ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_leap_password
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-wireless-security-get-leap-password-flags"></a><h3>nm_setting_wireless_security_get_leap_password_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_wireless_security_get_leap_password_flags
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password" title='The "leap-password" property'><span class="type">"leap-password"</span></a>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_wep_key ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-wep-key"></a><h3>nm_setting_wireless_security_get_wep_key ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_wep_key
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>idx</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_set_wep_key ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-set-wep-key"></a><h3>nm_setting_wireless_security_set_wep_key ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_wireless_security_set_wep_key
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>,
@@ -892,100 +638,55 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMSet
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>idx</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_wep_tx_keyidx ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-wep-tx-keyidx"></a><h3>nm_setting_wireless_security_get_wep_tx_keyidx ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_setting_wireless_security_get_wep_tx_keyidx
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_auth_alg ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-auth-alg"></a><h3>nm_setting_wireless_security_get_auth_alg ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_setting_wireless_security_get_auth_alg
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-wireless-security-get-wep-key-flags"></a><h3>nm_setting_wireless_security_get_wep_key_flags ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>  nm_setting_wireless_security_get_wep_key_flags
+                                                        (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
+<td>the <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
+<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the all WEP keys</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_setting_wireless_security_get_wep_key_type ()">
+<div class="refsect2">
 <a name="nm-setting-wireless-security-get-wep-key-type"></a><h3>nm_setting_wireless_security_get_wep_key_type ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType"><span class="returnvalue">NMWepKeyType</span></a>        nm_setting_wireless_security_get_wep_key_type
                                                         (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="NMSettingWirelessSecurity.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "auth-alg" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--auth-alg"></a><h3>The <code class="literal">"auth-alg"</code> property</h3>
 <pre class="programlisting">  "auth-alg"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -998,7 +699,7 @@ the 'leap-username' and 'leap-password' properties must be specified.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "group" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--group"></a><h3>The <code class="literal">"group"</code> property</h3>
 <pre class="programlisting">  "group"                    <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -1008,7 +709,7 @@ one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "key-mgmt" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--key-mgmt"></a><h3>The <code class="literal">"key-mgmt"</code> property</h3>
 <pre class="programlisting">  "key-mgmt"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1020,7 +721,7 @@ any WiFi connection that uses security.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "leap-password" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--leap-password"></a><h3>The <code class="literal">"leap-password"</code> property</h3>
 <pre class="programlisting">  "leap-password"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1030,7 +731,17 @@ The login password for legacy LEAP connections (ie, key-mgmt =
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "leap-username" property'>
+<div class="refsect2">
+<a name="NMSettingWirelessSecurity--leap-password-flags"></a><h3>The <code class="literal">"leap-password-flags"</code> property</h3>
+<pre class="programlisting">  "leap-password-flags"      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password" title='The "leap-password" property'><span class="type">"leap-password"</span></a>.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--leap-username"></a><h3>The <code class="literal">"leap-username"</code> property</h3>
 <pre class="programlisting">  "leap-username"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1040,7 +751,7 @@ The login username for legacy LEAP connections (ie, key-mgmt =
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "pairwise" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--pairwise"></a><h3>The <code class="literal">"pairwise"</code> property</h3>
 <pre class="programlisting">  "pairwise"                 <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -1050,7 +761,7 @@ specified pairwise encryption capabilities.  Each element may be one of
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "proto" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--proto"></a><h3>The <code class="literal">"proto"</code> property</h3>
 <pre class="programlisting">  "proto"                    <span class="type">GSList_gchararray_</span>*   : Read / Write</pre>
 <p>
@@ -1060,7 +771,7 @@ not specified, both WPA and RSN connections are allowed.
 </p>
 </div>
 <hr>
-<div class="refsect2" title='The "psk" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--psk"></a><h3>The <code class="literal">"psk"</code> property</h3>
 <pre class="programlisting">  "psk"                      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1074,7 +785,27 @@ connecting to the WiFi network.
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wep-key-type" property'>
+<div class="refsect2">
+<a name="NMSettingWirelessSecurity--psk-flags"></a><h3>The <code class="literal">"psk-flags"</code> property</h3>
+<pre class="programlisting">  "psk-flags"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk" title='The "psk" property'><span class="type">"psk"</span></a>
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingWirelessSecurity--wep-key-flags"></a><h3>The <code class="literal">"wep-key-flags"</code> property</h3>
+<pre class="programlisting">  "wep-key-flags"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write</pre>
+<p>
+Flags indicating how to handle <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> WEP keys.
+</p>
+<p>Allowed values: &lt;= 7</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key-type"></a><h3>The <code class="literal">"wep-key-type"</code> property</h3>
 <pre class="programlisting">  "wep-key-type"             <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -1090,7 +821,7 @@ actual WEP key.
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wep-key0" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key0"></a><h3>The <code class="literal">"wep-key0"</code> property</h3>
 <pre class="programlisting">  "wep-key0"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1100,7 +831,7 @@ Index 0 WEP key.  This is the WEP key used in most networks.  See the
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wep-key1" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key1"></a><h3>The <code class="literal">"wep-key1"</code> property</h3>
 <pre class="programlisting">  "wep-key1"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1110,7 +841,7 @@ Index 1 WEP key.  This WEP index is not used by most networks.  See the
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wep-key2" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key2"></a><h3>The <code class="literal">"wep-key2"</code> property</h3>
 <pre class="programlisting">  "wep-key2"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1120,7 +851,7 @@ Index 2 WEP key.  This WEP index is not used by most networks.  See the
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wep-key3" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key3"></a><h3>The <code class="literal">"wep-key3"</code> property</h3>
 <pre class="programlisting">  "wep-key3"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1130,7 +861,7 @@ Index 3 WEP key.  This WEP index is not used by most networks.  See the
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "wep-tx-keyidx" property'>
+<div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-tx-keyidx"></a><h3>The <code class="literal">"wep-tx-keyidx"</code> property</h3>
 <pre class="programlisting">  "wep-tx-keyidx"            <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct</pre>
 <p>
@@ -1146,6 +877,6 @@ Linksys WRT54G) number the keys 1 - 4.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html
index 563fa60f..e0a1c869 100644
--- a/docs/libnm-util/html/annotation-glossary.html
+++ b/docs/libnm-util/html/annotation-glossary.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -19,18 +19,53 @@
 <th width="100%" align="center">libnm-util Reference Manual</th>
 <td> </td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><a class="shortcut" href="#glsE">E</a></td></tr>
+<tr><td colspan="5" class="shortcuts">
+<a class="shortcut" href="#glsO">O</a>
+                      | 
+                   <a class="shortcut" href="#glsA">A</a>
+                      | 
+                   <a class="shortcut" href="#glsE">E</a>
+                      | 
+                   <a class="shortcut" href="#glsT">T</a>
+                      | 
+                   <a class="shortcut" href="#glsS">S</a>
+                      | 
+                   <a class="shortcut" href="#glsT">T</a>
+</td></tr>
 </table>
-<div class="glossary" title="Annotation Glossary">
+<div class="glossary">
 <div class="titlepage"><div><div><h2 class="title">
 <a name="annotation-glossary"></a>Annotation Glossary</h2></div></div></div>
+<a name="glsO"></a><h3 class="title">O</h3>
+<dt>
+<a name="annotation-glossterm-out"></a>out</dt>
+<dd><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<a name="glsA"></a><h3 class="title">A</h3>
+<dt>
+<a name="annotation-glossterm-allow-none"></a>allow-none</dt>
+<dd><p>NULL is ok, both for passing and for returning.</p></dd>
 <a name="glsE"></a><h3 class="title">E</h3>
 <dt>
 <a name="annotation-glossterm-element-type"></a>element-type</dt>
 <dd><p>Generics and defining elements of containers and arrays.</p></dd>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt>
+<a name="annotation-glossterm-transfer%20container"></a>transfer container</dt>
+<dd><p>Free data container after the code is done.</p></dd>
+<a name="glsS"></a><h3 class="title">S</h3>
+<dt>
+<a name="annotation-glossterm-scope%20call"></a>scope call</dt>
+<dd><p>The callback is valid only during the call to the method.</p></dd>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt>
+<a name="annotation-glossterm-transfer%20full"></a>transfer full</dt>
+<dd><p>Free data after the code is done.</p></dd>
+<dt>
+<a name="annotation-glossterm-transfer%20none"></a>transfer none</dt>
+<dd><p>Don't free data after the code is done.</p></dd>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 195b24d9..b6776b7d 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="object-tree.html" title="Object Hierarchy">
 <link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -23,16 +23,8 @@
 <tr><td colspan="5" class="shortcuts">
 <a class="shortcut" href="#idxC">C</a>
                       | 
-                   <a class="shortcut" href="#idxD">D</a>
-                      | 
-                   <a class="shortcut" href="#idxE">E</a>
-                      | 
-                   <a class="shortcut" href="#idxG">G</a>
-                      | 
                    <a class="shortcut" href="#idxI">I</a>
                       | 
-                   <a class="shortcut" href="#idxP">P</a>
-                      | 
                    <a class="shortcut" href="#idxS">S</a>
                       | 
                    <a class="shortcut" href="#idxT">T</a>
@@ -44,212 +36,209 @@
                    <a class="shortcut" href="#idxW">W</a>
 </td></tr>
 </table>
-<div class="index" title="API Index">
+<div class="index">
 <div class="titlepage"><div><div><h2 class="title">
 <a name="api-index-full"></a>API Index</h2></div></div></div>
 <a name="idx"></a><a name="idxC"></a><h3 class="title">C</h3>
 <dt>
-<a class="link" href="NMConnection.html#NMConnection-struct" title="NMConnection">NMConnection</a>, struct in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NMConnection, struct in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NMConnection-secrets-updated" title='The "secrets-updated" signal'>NMConnection::secrets-updated</a>, object signal in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NMConnection::secrets-updated, object signal in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NMConnection--path" title='The "path" property'>NMConnection:path</a>, object property in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NMConnection:path, object property in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NMConnection--scope" title='The "scope" property'>NMConnection:scope</a>, object property in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NMConnectionClass, struct in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NMConnectionClass" title="NMConnectionClass">NMConnectionClass</a>, struct in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NMConnectionError, enum in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NMConnectionError" title="enum NMConnectionError">NMConnectionError</a>, enum in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_add_setting, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NMConnectionScope" title="enum NMConnectionScope">NMConnectionScope</a>, enum in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_clear_secrets, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-add-setting" title="nm_connection_add_setting ()">nm_connection_add_setting</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_compare, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-clear-secrets" title="nm_connection_clear_secrets ()">nm_connection_clear_secrets</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_create_setting, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-compare" title="nm_connection_compare ()">nm_connection_compare</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_diff, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-create-setting" title="nm_connection_create_setting ()">nm_connection_create_setting</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_dump, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-diff" title="nm_connection_diff ()">nm_connection_diff</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_duplicate, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-dump" title="nm_connection_dump ()">nm_connection_dump</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NM_CONNECTION_ERROR, macro in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-duplicate" title="nm_connection_duplicate ()">nm_connection_duplicate</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_error_quark, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NM-CONNECTION-ERROR:CAPS" title="NM_CONNECTION_ERROR">NM_CONNECTION_ERROR</a>, macro in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_for_each_setting_value, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-error-quark" title="nm_connection_error_quark ()">nm_connection_error_quark</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_id, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-for-each-setting-value" title="nm_connection_for_each_setting_value ()">nm_connection_for_each_setting_value</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_path, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-get-path" title="nm_connection_get_path ()">nm_connection_get_path</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-get-scope" title="nm_connection_get_scope ()">nm_connection_get_scope</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_802_1x, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()">nm_connection_get_setting</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_bluetooth, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()">nm_connection_get_setting_by_name</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_by_name, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-get-type" title="nm_connection_get_type ()">nm_connection_get_type</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_cdma, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-lookup-setting-type" title="nm_connection_lookup_setting_type ()">nm_connection_lookup_setting_type</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_connection, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-lookup-setting-type-by-quark" title="nm_connection_lookup_setting_type_by_quark ()">nm_connection_lookup_setting_type_by_quark</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_gsm, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-need-secrets" title="nm_connection_need_secrets ()">nm_connection_need_secrets</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_ip4_config, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-new" title="nm_connection_new ()">nm_connection_new</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_ip6_config, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-new-from-hash" title="nm_connection_new_from_hash ()">nm_connection_new_from_hash</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_olpc_mesh, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NM-CONNECTION-PATH:CAPS" title="NM_CONNECTION_PATH">NM_CONNECTION_PATH</a>, macro in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_ppp, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-remove-setting" title="nm_connection_remove_setting ()">nm_connection_remove_setting</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_pppoe, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-replace-settings" title="nm_connection_replace_settings ()">nm_connection_replace_settings</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_vpn, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#NM-CONNECTION-SCOPE:CAPS" title="NM_CONNECTION_SCOPE">NM_CONNECTION_SCOPE</a>, macro in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_wimax, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()">nm_connection_set_path</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_wired, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-set-scope" title="nm_connection_set_scope ()">nm_connection_set_scope</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_wireless, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-to-hash" title="nm_connection_to_hash ()">nm_connection_to_hash</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_setting_wireless_security, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-update-secrets" title="nm_connection_update_secrets ()">nm_connection_update_secrets</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_type, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMConnection.html#nm-connection-verify" title="nm_connection_verify ()">nm_connection_verify</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+nm_connection_get_uuid, function in NMConnection
 </dt>
 <dd></dd>
-<a name="idxD"></a><h3 class="title">D</h3>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-debug" title="nm_debug()">nm_debug</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_lookup_setting_type, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-debug-str" title="nm_debug_str()">nm_debug_str</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_lookup_setting_type_by_quark, function in NMConnection
 </dt>
 <dd></dd>
-<a name="idxE"></a><h3 class="title">E</h3>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-error" title="nm_error()">nm_error</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_need_secrets, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-error-str" title="nm_error_str()">nm_error_str</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_new, function in NMConnection
 </dt>
 <dd></dd>
-<a name="idxG"></a><h3 class="title">G</h3>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-get-timestamp" title="nm_get_timestamp()">nm_get_timestamp</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_new_from_hash, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-ANY:CAPS" title="NM_GSM_NETWORK_ANY">NM_GSM_NETWORK_ANY</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+NM_CONNECTION_PATH, macro in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-GPRS-EDGE:CAPS" title="NM_GSM_NETWORK_GPRS_EDGE">NM_GSM_NETWORK_GPRS_EDGE</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+nm_connection_remove_setting, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS" title="NM_GSM_NETWORK_PREFER_GPRS_EDGE">NM_GSM_NETWORK_PREFER_GPRS_EDGE</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+nm_connection_replace_settings, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS" title="NM_GSM_NETWORK_PREFER_UMTS_HSPA">NM_GSM_NETWORK_PREFER_UMTS_HSPA</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+nm_connection_set_path, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-GSM-NETWORK-UMTS-HSPA:CAPS" title="NM_GSM_NETWORK_UMTS_HSPA">NM_GSM_NETWORK_UMTS_HSPA</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+nm_connection_to_hash, function in NMConnection
 </dt>
 <dd></dd>
-<a name="idxI"></a><h3 class="title">I</h3>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-info" title="nm_info()">nm_info</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_update_secrets, function in NMConnection
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-info-str" title="nm_info_str()">nm_info_str</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+nm_connection_verify, function in NMConnection
 </dt>
 <dd></dd>
+<a name="idxI"></a><h3 class="title">I</h3>
 <dt>
-<a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address">NMIP4Address</a>, typedef in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
+<a class="link" href="NMSettingIP4Config.html#NMIP4Address">NMIP4Address</a>, typedef in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route">NMIP4Route</a>, typedef in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
+<a class="link" href="NMSettingIP4Config.html#NMIP4Route">NMIP4Route</a>, typedef in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
 </dt>
 <dd></dd>
 <dt>
@@ -273,6 +262,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIP4Config.html#nm-ip4-address-get-type" title="nm_ip4_address_get_type ()">nm_ip4_address_get_type</a>, function in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP4Config.html#nm-ip4-address-new" title="nm_ip4_address_new ()">nm_ip4_address_new</a>, function in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
 </dt>
 <dd></dd>
@@ -321,6 +314,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIP4Config.html#nm-ip4-route-get-type" title="nm_ip4_route_get_type ()">nm_ip4_route_get_type</a>, function in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP4Config.html#nm-ip4-route-new" title="nm_ip4_route_new ()">nm_ip4_route_new</a>, function in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
 </dt>
 <dd></dd>
@@ -349,11 +346,11 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address">NMIP6Address</a>, typedef in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+<a class="link" href="NMSettingIP6Config.html#NMIP6Address">NMIP6Address</a>, typedef in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route">NMIP6Route</a>, typedef in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+<a class="link" href="NMSettingIP6Config.html#NMIP6Route">NMIP6Route</a>, typedef in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
 <dt>
@@ -377,6 +374,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIP6Config.html#nm-ip6-address-get-type" title="nm_ip6_address_get_type ()">nm_ip6_address_get_type</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP6Config.html#nm-ip6-address-new" title="nm_ip6_address_new ()">nm_ip6_address_new</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
@@ -425,6 +426,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIP6Config.html#nm-ip6-route-get-type" title="nm_ip6_route_get_type ()">nm_ip6_route_get_type</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-new" title="nm_ip6_route_new ()">nm_ip6_route_new</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
@@ -452,11 +457,6 @@
 <a class="link" href="NMSettingIP6Config.html#nm-ip6-route-unref" title="nm_ip6_route_unref ()">nm_ip6_route_unref</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
-<a name="idxP"></a><h3 class="title">P</h3>
-<dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-print-backtrace" title="nm_print_backtrace">nm_print_backtrace</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
-</dt>
-<dd></dd>
 <a name="idxS"></a><h3 class="title">S</h3>
 <dt>
 <a class="link" href="NMSetting.html#NMSetting-struct" title="NMSetting">NMSetting</a>, struct in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
@@ -495,6 +495,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--password-flags" title='The "password-flags" property'>NMSetting8021x:password-flags</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning" title='The "phase1-fast-provisioning" property'>NMSetting8021x:phase1-fast-provisioning</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -535,6 +539,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password-flags" title='The "phase2-private-key-password-flags" property'>NMSetting8021x:phase2-private-key-password-flags</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title='The "private-key" property'>NMSetting8021x:private-key</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -543,19 +551,19 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#NMSetting8021x--system-ca-certs" title='The "system-ca-certs" property'>NMSetting8021x:system-ca-certs</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password-flags" title='The "private-key-password-flags" property'>NMSetting8021x:private-key-password-flags</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat">NMSetting8021xCKFormat</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--system-ca-certs" title='The "system-ca-certs" property'>NMSetting8021x:system-ca-certs</a>, object property in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme">NMSetting8021xCKScheme</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat">NMSetting8021xCKFormat</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#NMSetting8021xCKType" title="enum NMSetting8021xCKType">NMSetting8021xCKType</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme">NMSetting8021xCKScheme</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
@@ -563,7 +571,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#NMSetting8021xError" title="enum NMSetting8021xError">NMSetting8021xError</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#NMSetting8021xError">NMSetting8021xError</a>, enum in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
@@ -587,7 +595,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingBluetooth.html#NMSettingBluetoothError" title="enum NMSettingBluetoothError">NMSettingBluetoothError</a>, enum in <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth">NMSettingBluetooth</a>
+<a class="link" href="NMSettingBluetooth.html#NMSettingBluetoothError">NMSettingBluetoothError</a>, enum in <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth">NMSettingBluetooth</a>
 </dt>
 <dd></dd>
 <dt>
@@ -603,6 +611,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingCdma.html#NMSettingCdma--password-flags" title='The "password-flags" property'>NMSettingCdma:password-flags</a>, object property in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingCdma.html#NMSettingCdma--username" title='The "username" property'>NMSettingCdma:username</a>, object property in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
 </dt>
 <dd></dd>
@@ -611,7 +623,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingCdma.html#NMSettingCdmaError" title="enum NMSettingCdmaError">NMSettingCdmaError</a>, enum in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
+<a class="link" href="NMSettingCdma.html#NMSettingCdmaError">NMSettingCdmaError</a>, enum in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
 </dt>
 <dd></dd>
 <dt>
@@ -635,6 +647,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title='The "permissions" property'>NMSettingConnection:permissions</a>, object property in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingConnection.html#NMSettingConnection--read-only" title='The "read-only" property'>NMSettingConnection:read-only</a>, object property in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -655,7 +671,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingConnection.html#NMSettingConnectionError" title="enum NMSettingConnectionError">NMSettingConnectionError</a>, enum in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+<a class="link" href="NMSettingConnection.html#NMSettingConnectionError">NMSettingConnectionError</a>, enum in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
 <dt>
@@ -663,7 +679,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting.html#NMSettingError" title="enum NMSettingError">NMSettingError</a>, enum in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+<a class="link" href="NMSetting.html#NMSettingError">NMSettingError</a>, enum in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
 <dt>
@@ -679,10 +695,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NMSettingGsm--band" title='The "band" property'>NMSettingGsm:band</a>, object property in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingGsm.html#NMSettingGsm--home-only" title='The "home-only" property'>NMSettingGsm:home-only</a>, object property in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
@@ -703,11 +715,15 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingGsm.html#NMSettingGsm--password-flags" title='The "password-flags" property'>NMSettingGsm:password-flags</a>, object property in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title='The "pin" property'>NMSettingGsm:pin</a>, object property in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NMSettingGsm--puk" title='The "puk" property'>NMSettingGsm:puk</a>, object property in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSettingGsm.html#NMSettingGsm--pin-flags" title='The "pin-flags" property'>NMSettingGsm:pin-flags</a>, object property in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
@@ -719,7 +735,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NMSettingGsmError" title="enum NMSettingGsmError">NMSettingGsmError</a>, enum in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSettingGsm.html#NMSettingGsmError">NMSettingGsmError</a>, enum in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
@@ -731,6 +747,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting.html#NMSettingHashFlags" title="enum NMSettingHashFlags">NMSettingHashFlags</a>, enum in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config-struct" title="NMSettingIP4Config">NMSettingIP4Config</a>, struct in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
 </dt>
 <dd></dd>
@@ -787,7 +807,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIP4Config.html#NMSettingIP4ConfigError" title="enum NMSettingIP4ConfigError">NMSettingIP4ConfigError</a>, enum in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
+<a class="link" href="NMSettingIP4Config.html#NMSettingIP4ConfigError">NMSettingIP4ConfigError</a>, enum in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
 </dt>
 <dd></dd>
 <dt>
@@ -835,7 +855,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigError" title="enum NMSettingIP6ConfigError">NMSettingIP6ConfigError</a>, enum in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+<a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigError">NMSettingIP6ConfigError</a>, enum in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
 <dt>
@@ -859,7 +879,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMeshError" title="enum NMSettingOlpcMeshError">NMSettingOlpcMeshError</a>, enum in <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">NMSettingOlpcMesh</a>
+<a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMeshError">NMSettingOlpcMeshError</a>, enum in <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">NMSettingOlpcMesh</a>
 </dt>
 <dd></dd>
 <dt>
@@ -943,7 +963,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingPPP.html#NMSettingPPPError" title="enum NMSettingPPPError">NMSettingPPPError</a>, enum in <a class="link" href="NMSettingPPP.html" title="NMSettingPPP">NMSettingPPP</a>
+<a class="link" href="NMSettingPPP.html#NMSettingPPPError">NMSettingPPPError</a>, enum in <a class="link" href="NMSettingPPP.html" title="NMSettingPPP">NMSettingPPP</a>
 </dt>
 <dd></dd>
 <dt>
@@ -955,6 +975,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--password-flags" title='The "password-flags" property'>NMSettingPPPOE:password-flags</a>, object property in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--service" title='The "service" property'>NMSettingPPPOE:service</a>, object property in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
 </dt>
 <dd></dd>
@@ -967,7 +991,11 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEError" title="enum NMSettingPPPOEError">NMSettingPPPOEError</a>, enum in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
+<a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEError">NMSettingPPPOEError</a>, enum in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags">NMSettingSecretFlags</a>, enum in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
 <dt>
@@ -999,7 +1027,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingSerial.html#NMSettingSerialError" title="enum NMSettingSerialError">NMSettingSerialError</a>, enum in <a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
+<a class="link" href="NMSettingSerial.html#NMSettingSerialError">NMSettingSerialError</a>, enum in <a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1031,7 +1059,27 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingVPN.html#NMSettingVpnError" title="enum NMSettingVpnError">NMSettingVpnError</a>, enum in <a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
+<a class="link" href="NMSettingVPN.html#NMSettingVpnError">NMSettingVpnError</a>, enum in <a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
+</dt>
+<dd></dd>
+<dt>
+NMSettingWimax, struct in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NMSettingWimax:mac-address, object property in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NMSettingWimax:network-name, object property in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NMSettingWimaxClass, struct in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NMSettingWimaxError, enum in NMSettingWimax
 </dt>
 <dd></dd>
 <dt>
@@ -1083,7 +1131,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingWired.html#NMSettingWiredError" title="enum NMSettingWiredError">NMSettingWiredError</a>, enum in <a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
+<a class="link" href="NMSettingWired.html#NMSettingWiredError">NMSettingWiredError</a>, enum in <a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1143,7 +1191,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingWireless.html#NMSettingWirelessError" title="enum NMSettingWirelessError">NMSettingWirelessError</a>, enum in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
+<a class="link" href="NMSettingWireless.html#NMSettingWirelessError">NMSettingWirelessError</a>, enum in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1167,6 +1215,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password-flags" title='The "leap-password-flags" property'>NMSettingWirelessSecurity:leap-password-flags</a>, object property in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username" title='The "leap-username" property'>NMSettingWirelessSecurity:leap-username</a>, object property in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -1183,6 +1235,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk-flags" title='The "psk-flags" property'>NMSettingWirelessSecurity:psk-flags</a>, object property in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-flags" title='The "wep-key-flags" property'>NMSettingWirelessSecurity:wep-key-flags</a>, object property in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type" title='The "wep-key-type" property'>NMSettingWirelessSecurity:wep-key-type</a>, object property in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -1211,7 +1271,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityError" title="enum NMSettingWirelessSecurityError">NMSettingWirelessSecurityError</a>, enum in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityError">NMSettingWirelessSecurityError</a>, enum in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1255,10 +1315,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert" title="nm_setting_802_1x_get_ca_cert ()">nm_setting_802_1x_get_ca_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-blob" title="nm_setting_802_1x_get_ca_cert_blob ()">nm_setting_802_1x_get_ca_cert_blob</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1275,10 +1331,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert" title="nm_setting_802_1x_get_client_cert ()">nm_setting_802_1x_get_client_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-client-cert-blob" title="nm_setting_802_1x_get_client_cert_blob ()">nm_setting_802_1x_get_client_cert_blob</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1307,6 +1359,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-password-flags" title="nm_setting_802_1x_get_password_flags ()">nm_setting_802_1x_get_password_flags</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase1-fast-provisioning" title="nm_setting_802_1x_get_phase1_fast_provisioning ()">nm_setting_802_1x_get_phase1_fast_provisioning</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1327,10 +1383,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert" title="nm_setting_802_1x_get_phase2_ca_cert ()">nm_setting_802_1x_get_phase2_ca_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert-blob" title="nm_setting_802_1x_get_phase2_ca_cert_blob ()">nm_setting_802_1x_get_phase2_ca_cert_blob</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1347,10 +1399,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert" title="nm_setting_802_1x_get_phase2_client_cert ()">nm_setting_802_1x_get_phase2_client_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-blob" title="nm_setting_802_1x_get_phase2_client_cert_blob ()">nm_setting_802_1x_get_phase2_client_cert_blob</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1363,10 +1411,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key" title="nm_setting_802_1x_get_phase2_private_key ()">nm_setting_802_1x_get_phase2_private_key</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob" title="nm_setting_802_1x_get_phase2_private_key_blob ()">nm_setting_802_1x_get_phase2_private_key_blob</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1379,15 +1423,15 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path" title="nm_setting_802_1x_get_phase2_private_key_path ()">nm_setting_802_1x_get_phase2_private_key_path</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password-flags" title="nm_setting_802_1x_get_phase2_private_key_password_flags ()">nm_setting_802_1x_get_phase2_private_key_password_flags</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-scheme" title="nm_setting_802_1x_get_phase2_private_key_scheme ()">nm_setting_802_1x_get_phase2_private_key_scheme</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path" title="nm_setting_802_1x_get_phase2_private_key_path ()">nm_setting_802_1x_get_phase2_private_key_path</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-type" title="nm_setting_802_1x_get_phase2_private_key_type ()">nm_setting_802_1x_get_phase2_private_key_type</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-scheme" title="nm_setting_802_1x_get_phase2_private_key_scheme ()">nm_setting_802_1x_get_phase2_private_key_scheme</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1395,7 +1439,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key" title="nm_setting_802_1x_get_private_key ()">nm_setting_802_1x_get_private_key</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-pin-flags" title="nm_setting_802_1x_get_pin_flags ()">nm_setting_802_1x_get_pin_flags</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1411,19 +1455,15 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path" title="nm_setting_802_1x_get_private_key_path ()">nm_setting_802_1x_get_private_key_path</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password-flags" title="nm_setting_802_1x_get_private_key_password_flags ()">nm_setting_802_1x_get_private_key_password_flags</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-scheme" title="nm_setting_802_1x_get_private_key_scheme ()">nm_setting_802_1x_get_private_key_scheme</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-type" title="nm_setting_802_1x_get_private_key_type ()">nm_setting_802_1x_get_private_key_type</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path" title="nm_setting_802_1x_get_private_key_path ()">nm_setting_802_1x_get_private_key_path</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-psk" title="nm_setting_802_1x_get_psk ()">nm_setting_802_1x_get_psk</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-private-key-scheme" title="nm_setting_802_1x_get_private_key_scheme ()">nm_setting_802_1x_get_private_key_scheme</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1447,6 +1487,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PASSWORD_FLAGS">NM_SETTING_802_1X_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE1-FAST-PROVISIONING:CAPS" title="NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING">NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1487,10 +1531,18 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS">NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PIN:CAPS" title="NM_SETTING_802_1X_PIN">NM_SETTING_802_1X_PIN</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PIN-FLAGS:CAPS" title="NM_SETTING_802_1X_PIN_FLAGS">NM_SETTING_802_1X_PIN_FLAGS</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY:CAPS" title="NM_SETTING_802_1X_PRIVATE_KEY">NM_SETTING_802_1X_PRIVATE_KEY</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1499,7 +1551,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PSK:CAPS" title="NM_SETTING_802_1X_PSK">NM_SETTING_802_1X_PSK</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" title="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS">NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1515,50 +1567,26 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert-from-file" title="nm_setting_802_1x_set_ca_cert_from_file ()">nm_setting_802_1x_set_ca_cert_from_file</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert" title="nm_setting_802_1x_set_client_cert ()">nm_setting_802_1x_set_client_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert-from-file" title="nm_setting_802_1x_set_client_cert_from_file ()">nm_setting_802_1x_set_client_cert_from_file</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert" title="nm_setting_802_1x_set_phase2_ca_cert ()">nm_setting_802_1x_set_phase2_ca_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert-from-file" title="nm_setting_802_1x_set_phase2_ca_cert_from_file ()">nm_setting_802_1x_set_phase2_ca_cert_from_file</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert" title="nm_setting_802_1x_set_phase2_client_cert ()">nm_setting_802_1x_set_phase2_client_cert</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert-from-file" title="nm_setting_802_1x_set_phase2_client_cert_from_file ()">nm_setting_802_1x_set_phase2_client_cert_from_file</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()">nm_setting_802_1x_set_phase2_private_key</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file" title="nm_setting_802_1x_set_phase2_private_key_from_file ()">nm_setting_802_1x_set_phase2_private_key_from_file</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()">nm_setting_802_1x_set_private_key</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file" title="nm_setting_802_1x_set_private_key_from_file ()">nm_setting_802_1x_set_private_key_from_file</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS" title="NM_SETTING_802_1X_SYSTEM_CA_CERTS">NM_SETTING_802_1X_SYSTEM_CA_CERTS</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -1623,6 +1651,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-password-flags" title="nm_setting_cdma_get_password_flags ()">nm_setting_cdma_get_password_flags</a>, function in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-type" title="nm_setting_cdma_get_type ()">nm_setting_cdma_get_type</a>, function in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
 </dt>
 <dd></dd>
@@ -1643,6 +1675,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS" title="NM_SETTING_CDMA_PASSWORD_FLAGS">NM_SETTING_CDMA_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-SETTING-NAME:CAPS" title="NM_SETTING_CDMA_SETTING_NAME">NM_SETTING_CDMA_SETTING_NAME</a>, macro in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
 </dt>
 <dd></dd>
@@ -1659,6 +1695,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-add-permission" title="nm_setting_connection_add_permission ()">nm_setting_connection_add_permission</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT:CAPS" title="NM_SETTING_CONNECTION_AUTOCONNECT">NM_SETTING_CONNECTION_AUTOCONNECT</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -1683,6 +1723,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-num-permissions" title="nm_setting_connection_get_num_permissions ()">nm_setting_connection_get_num_permissions</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-permission" title="nm_setting_connection_get_permission ()">nm_setting_connection_get_permission</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-read-only" title="nm_setting_connection_get_read_only ()">nm_setting_connection_get_read_only</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -1707,10 +1755,22 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-PERMISSIONS:CAPS" title="NM_SETTING_CONNECTION_PERMISSIONS">NM_SETTING_CONNECTION_PERMISSIONS</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-permissions-user-allowed" title="nm_setting_connection_permissions_user_allowed ()">nm_setting_connection_permissions_user_allowed</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-READ-ONLY:CAPS" title="NM_SETTING_CONNECTION_READ_ONLY">NM_SETTING_CONNECTION_READ_ONLY</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-remove-permission" title="nm_setting_connection_remove_permission ()">nm_setting_connection_remove_permission</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS" title="NM_SETTING_CONNECTION_SETTING_NAME">NM_SETTING_CONNECTION_SETTING_NAME</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -1751,19 +1811,19 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting.html#nm-setting-get-type" title="nm_setting_get_type ()">nm_setting_get_type</a>, function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+<a class="link" href="NMSetting.html#nm-setting-get-secret-flags" title="nm_setting_get_secret_flags ()">nm_setting_get_secret_flags</a>, function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS" title="NM_SETTING_GSM_ALLOWED_BANDS">NM_SETTING_GSM_ALLOWED_BANDS</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSetting.html#nm-setting-get-type" title="nm_setting_get_type ()">nm_setting_get_type</a>, function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-APN:CAPS" title="NM_SETTING_GSM_APN">NM_SETTING_GSM_APN</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS" title="NM_SETTING_GSM_ALLOWED_BANDS">NM_SETTING_GSM_ALLOWED_BANDS</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-BAND:CAPS" title="NM_SETTING_GSM_BAND">NM_SETTING_GSM_BAND</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-APN:CAPS" title="NM_SETTING_GSM_APN">NM_SETTING_GSM_APN</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1783,10 +1843,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-band" title="nm_setting_gsm_get_band ()">nm_setting_gsm_get_band</a>, function in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-home-only" title="nm_setting_gsm_get_home_only ()">nm_setting_gsm_get_home_only</a>, function in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
@@ -1807,11 +1863,15 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-password-flags" title="nm_setting_gsm_get_password_flags ()">nm_setting_gsm_get_password_flags</a>, function in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-pin" title="nm_setting_gsm_get_pin ()">nm_setting_gsm_get_pin</a>, function in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-puk" title="nm_setting_gsm_get_puk ()">nm_setting_gsm_get_puk</a>, function in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-pin-flags" title="nm_setting_gsm_get_pin_flags ()">nm_setting_gsm_get_pin_flags</a>, function in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1847,11 +1907,15 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD-FLAGS:CAPS" title="NM_SETTING_GSM_PASSWORD_FLAGS">NM_SETTING_GSM_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PIN:CAPS" title="NM_SETTING_GSM_PIN">NM_SETTING_GSM_PIN</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PUK:CAPS" title="NM_SETTING_GSM_PUK">NM_SETTING_GSM_PUK</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-PIN-FLAGS:CAPS" title="NM_SETTING_GSM_PIN_FLAGS">NM_SETTING_GSM_PIN_FLAGS</a>, macro in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
 <dt>
@@ -2327,6 +2391,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-password-flags" title="nm_setting_pppoe_get_password_flags ()">nm_setting_pppoe_get_password_flags</a>, function in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingPPPOE.html#nm-setting-pppoe-get-service" title="nm_setting_pppoe_get_service ()">nm_setting_pppoe_get_service</a>, function in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
 </dt>
 <dd></dd>
@@ -2347,6 +2415,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS" title="NM_SETTING_PPPOE_PASSWORD_FLAGS">NM_SETTING_PPPOE_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingPPPOE.html#NM-SETTING-PPPOE-SERVICE:CAPS" title="NM_SETTING_PPPOE_SERVICE">NM_SETTING_PPPOE_SERVICE</a>, macro in <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
 </dt>
 <dd></dd>
@@ -2523,6 +2595,10 @@
 </dt>
 <dd></dd>
 <dt>
+NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingSerial.html#NM-SETTING-SERIAL-BAUD:CAPS" title="NM_SETTING_SERIAL_BAUD">NM_SETTING_SERIAL_BAUD</a>, macro in <a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
 </dt>
 <dd></dd>
@@ -2583,6 +2659,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting.html#nm-setting-set-secret-flags" title="nm_setting_set_secret_flags ()">nm_setting_set_secret_flags</a>, function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting.html#nm-setting-to-hash" title="nm_setting_to_hash ()">nm_setting_to_hash</a>, function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
@@ -2675,6 +2755,42 @@
 </dt>
 <dd></dd>
 <dt>
+NM_SETTING_WIMAX_ERROR, macro in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+nm_setting_wimax_error_quark, function in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+nm_setting_wimax_get_mac_address, function in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+nm_setting_wimax_get_network_name, function in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+nm_setting_wimax_get_type, function in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NM_SETTING_WIMAX_MAC_ADDRESS, macro in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NM_SETTING_WIMAX_NETWORK_NAME, macro in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+nm_setting_wimax_new, function in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
+NM_SETTING_WIMAX_SETTING_NAME, macro in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWired.html#nm-setting-wired-add-s390-option" title="nm_setting_wired_add_s390_option ()">nm_setting_wired_add_s390_option</a>, function in <a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
 </dt>
 <dd></dd>
@@ -2887,6 +3003,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS" title="NM_SETTING_WIRELESS_MODE_ADHOC">NM_SETTING_WIRELESS_MODE_ADHOC</a>, macro in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS" title="NM_SETTING_WIRELESS_MODE_INFRA">NM_SETTING_WIRELESS_MODE_INFRA</a>, macro in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS" title="NM_SETTING_WIRELESS_MTU">NM_SETTING_WIRELESS_MTU</a>, macro in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
 </dt>
 <dd></dd>
@@ -2955,6 +3079,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password-flags" title="nm_setting_wireless_security_get_leap_password_flags ()">nm_setting_wireless_security_get_leap_password_flags</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-username" title="nm_setting_wireless_security_get_leap_username ()">nm_setting_wireless_security_get_leap_username</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -2983,6 +3111,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk-flags" title="nm_setting_wireless_security_get_psk_flags ()">nm_setting_wireless_security_get_psk_flags</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-type" title="nm_setting_wireless_security_get_type ()">nm_setting_wireless_security_get_type</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -2991,6 +3123,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-flags" title="nm_setting_wireless_security_get_wep_key_flags ()">nm_setting_wireless_security_get_wep_key_flags</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-type" title="nm_setting_wireless_security_get_wep_key_type ()">nm_setting_wireless_security_get_wep_key_type</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -3011,6 +3147,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS">NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-USERNAME:CAPS" title="NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME">NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME</a>, macro in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -3031,6 +3171,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS">NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS</a>, macro in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-remove-group" title="nm_setting_wireless_security_remove_group ()">nm_setting_wireless_security_remove_group</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -3067,6 +3211,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS">NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS</a>, macro in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE">NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE</a>, macro in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -3092,7 +3240,7 @@
 <dd></dd>
 <a name="idxT"></a><h3 class="title">T</h3>
 <dt>
-<a class="link" href="NMConnection.html#NM-TYPE-CONNECTION-ERROR:CAPS" title="NM_TYPE_CONNECTION_ERROR">NM_TYPE_CONNECTION_ERROR</a>, macro in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+NM_TYPE_CONNECTION_ERROR, macro in NMConnection
 </dt>
 <dd></dd>
 <dt>
@@ -3148,6 +3296,10 @@
 </dt>
 <dd></dd>
 <dt>
+NM_TYPE_SETTING_WIMAX_ERROR, macro in NMSettingWimax
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWired.html#NM-TYPE-SETTING-WIRED-ERROR:CAPS" title="NM_TYPE_SETTING_WIRED_ERROR">NM_TYPE_SETTING_WIRED_ERROR</a>, macro in <a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
 </dt>
 <dd></dd>
@@ -3282,25 +3434,17 @@
 <dd></dd>
 <a name="idxV"></a><h3 class="title">V</h3>
 <dt>
-<a class="link" href="NMSettingVPN.html#VPNIterFunc" title="VPNIterFunc ()">VPNIterFunc</a>, user_function in <a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
+<a class="link" href="NMSettingVPN.html#NMVPNIterFunc" title="NMVPNIterFunc ()">NMVPNIterFunc</a>, user_function in <a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
 </dt>
 <dd></dd>
 <a name="idxW"></a><h3 class="title">W</h3>
 <dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-warning" title="nm_warning()">nm_warning</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="libnm-util-nm-utils.html#nm-warning-str" title="nm_warning_str()">nm_warning_str</a>, macro in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType">NMWepKeyType</a>, enum in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index 545175e7..2800abf2 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -7,8 +7,8 @@
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="index.html" title="libnm-util Reference Manual">
-<link rel="next" href="NMConnection.html" title="NMConnection">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<link rel="next" href="NMSetting.html" title="NMSetting">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -17,16 +17,13 @@
 <td> </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libnm-util Reference Manual</th>
-<td><a accesskey="n" href="NMConnection.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="NMSetting.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
-<div class="chapter" title="libnm-util API Reference">
+<div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2699944"></a>libnm-util API Reference</h2></div></div></div>
+<a name="id396708"></a>libnm-util API Reference</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
-<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="NMSetting.html">NMSetting</a></span><span class="refpurpose"> — Describes related configuration information</span>
 </dt>
 <dt>
@@ -78,9 +75,10 @@
 <span class="refentrytitle"><a href="libnm-util-nm-utils.html">nm-utils</a></span><span class="refpurpose"> — Utility functions</span>
 </dt>
 </dl></div>
+<span style="color: red">&lt;xi:include&gt;&lt;/xi:include&gt;</span>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 69dc2827..90ada1bf 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -6,18 +6,18 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="next" href="ch01.html" title="libnm-util API Reference">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<div class="book" title="libnm-util Reference Manual">
+<div class="book">
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-util Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-util 0.8
+      for libnm-util 0.9
       The latest version of this documentation can be found on-line at
-      <a class="ulink" href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/" target="_top">http://projects.gnome.org/NetworkManager/developers/libnm-util/08/</a>.
+      <a class="ulink" href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/" target="_top">http://projects.gnome.org/NetworkManager/developers/libnm-util/09/</a>.
     </p></div>
 </div>
 <hr>
@@ -26,9 +26,6 @@
 <dt><span class="chapter"><a href="ch01.html">libnm-util API Reference</a></span></dt>
 <dd><dl>
 <dt>
-<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="NMSetting.html">NMSetting</a></span><span class="refpurpose"> — Describes related configuration information</span>
 </dt>
 <dt>
@@ -87,6 +84,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index ee50d977..d9981473 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -1,57 +1,7 @@
-<ONLINE href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/">
-<ANCHOR id="NMConnection" href="libnm-util/NMConnection.html">
-<ANCHOR id="NMConnection.synopsis" href="libnm-util/NMConnection.html#NMConnection.synopsis">
-<ANCHOR id="NMConnection.object-hierarchy" href="libnm-util/NMConnection.html#NMConnection.object-hierarchy">
-<ANCHOR id="NMConnection.properties" href="libnm-util/NMConnection.html#NMConnection.properties">
-<ANCHOR id="NMConnection.signals" href="libnm-util/NMConnection.html#NMConnection.signals">
-<ANCHOR id="NMConnection.description" href="libnm-util/NMConnection.html#NMConnection.description">
-<ANCHOR id="NMConnection.details" href="libnm-util/NMConnection.html#NMConnection.details">
-<ANCHOR id="NMConnectionScope" href="libnm-util/NMConnection.html#NMConnectionScope">
-<ANCHOR id="NM-CONNECTION-SCOPE-UNKNOWN:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-SCOPE-UNKNOWN:CAPS">
-<ANCHOR id="NM-CONNECTION-SCOPE-SYSTEM:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-SCOPE-SYSTEM:CAPS">
-<ANCHOR id="NM-CONNECTION-SCOPE-USER:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-SCOPE-USER:CAPS">
-<ANCHOR id="NMConnectionError" href="libnm-util/NMConnection.html#NMConnectionError">
-<ANCHOR id="NM-CONNECTION-ERROR-UNKNOWN:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-ERROR-UNKNOWN:CAPS">
-<ANCHOR id="NM-CONNECTION-ERROR-CONNECTION-SETTING-NOT-FOUND:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-ERROR-CONNECTION-SETTING-NOT-FOUND:CAPS">
-<ANCHOR id="NM-TYPE-CONNECTION-ERROR:CAPS" href="libnm-util/NMConnection.html#NM-TYPE-CONNECTION-ERROR:CAPS">
-<ANCHOR id="NM-CONNECTION-ERROR:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-ERROR:CAPS">
-<ANCHOR id="nm-connection-error-quark" href="libnm-util/NMConnection.html#nm-connection-error-quark">
-<ANCHOR id="NM-CONNECTION-SCOPE:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-SCOPE:CAPS">
-<ANCHOR id="NM-CONNECTION-PATH:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-PATH:CAPS">
-<ANCHOR id="NMConnection-struct" href="libnm-util/NMConnection.html#NMConnection-struct">
-<ANCHOR id="NMConnectionClass" href="libnm-util/NMConnection.html#NMConnectionClass">
-<ANCHOR id="nm-connection-get-type" href="libnm-util/NMConnection.html#nm-connection-get-type">
-<ANCHOR id="nm-connection-new" href="libnm-util/NMConnection.html#nm-connection-new">
-<ANCHOR id="nm-connection-new-from-hash" href="libnm-util/NMConnection.html#nm-connection-new-from-hash">
-<ANCHOR id="nm-connection-duplicate" href="libnm-util/NMConnection.html#nm-connection-duplicate">
-<ANCHOR id="nm-connection-add-setting" href="libnm-util/NMConnection.html#nm-connection-add-setting">
-<ANCHOR id="nm-connection-remove-setting" href="libnm-util/NMConnection.html#nm-connection-remove-setting">
-<ANCHOR id="nm-connection-get-setting" href="libnm-util/NMConnection.html#nm-connection-get-setting">
-<ANCHOR id="nm-connection-get-setting-by-name" href="libnm-util/NMConnection.html#nm-connection-get-setting-by-name">
-<ANCHOR id="nm-connection-replace-settings" href="libnm-util/NMConnection.html#nm-connection-replace-settings">
-<ANCHOR id="nm-connection-compare" href="libnm-util/NMConnection.html#nm-connection-compare">
-<ANCHOR id="nm-connection-diff" href="libnm-util/NMConnection.html#nm-connection-diff">
-<ANCHOR id="nm-connection-verify" href="libnm-util/NMConnection.html#nm-connection-verify">
-<ANCHOR id="nm-connection-need-secrets" href="libnm-util/NMConnection.html#nm-connection-need-secrets">
-<ANCHOR id="nm-connection-clear-secrets" href="libnm-util/NMConnection.html#nm-connection-clear-secrets">
-<ANCHOR id="nm-connection-update-secrets" href="libnm-util/NMConnection.html#nm-connection-update-secrets">
-<ANCHOR id="nm-connection-set-scope" href="libnm-util/NMConnection.html#nm-connection-set-scope">
-<ANCHOR id="nm-connection-get-scope" href="libnm-util/NMConnection.html#nm-connection-get-scope">
-<ANCHOR id="nm-connection-set-path" href="libnm-util/NMConnection.html#nm-connection-set-path">
-<ANCHOR id="nm-connection-get-path" href="libnm-util/NMConnection.html#nm-connection-get-path">
-<ANCHOR id="nm-connection-for-each-setting-value" href="libnm-util/NMConnection.html#nm-connection-for-each-setting-value">
-<ANCHOR id="nm-connection-to-hash" href="libnm-util/NMConnection.html#nm-connection-to-hash">
-<ANCHOR id="nm-connection-dump" href="libnm-util/NMConnection.html#nm-connection-dump">
-<ANCHOR id="nm-connection-create-setting" href="libnm-util/NMConnection.html#nm-connection-create-setting">
-<ANCHOR id="nm-connection-lookup-setting-type" href="libnm-util/NMConnection.html#nm-connection-lookup-setting-type">
-<ANCHOR id="nm-connection-lookup-setting-type-by-quark" href="libnm-util/NMConnection.html#nm-connection-lookup-setting-type-by-quark">
-<ANCHOR id="NMConnection.property-details" href="libnm-util/NMConnection.html#NMConnection.property-details">
-<ANCHOR id="NMConnection--path" href="libnm-util/NMConnection.html#NMConnection--path">
-<ANCHOR id="NMConnection--scope" href="libnm-util/NMConnection.html#NMConnection--scope">
-<ANCHOR id="NMConnection.signal-details" href="libnm-util/NMConnection.html#NMConnection.signal-details">
-<ANCHOR id="NMConnection-secrets-updated" href="libnm-util/NMConnection.html#NMConnection-secrets-updated">
+<ONLINE href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/">
 <ANCHOR id="NMSetting" href="libnm-util/NMSetting.html">
 <ANCHOR id="NMSetting.synopsis" href="libnm-util/NMSetting.html#NMSetting.synopsis">
+<ANCHOR id="NMSettingError" href="libnm-util/NMSetting.html#NMSettingError">
 <ANCHOR id="NMSetting.object-hierarchy" href="libnm-util/NMSetting.html#NMSetting.object-hierarchy">
 <ANCHOR id="NMSetting.properties" href="libnm-util/NMSetting.html#NMSetting.properties">
 <ANCHOR id="NMSetting.description" href="libnm-util/NMSetting.html#NMSetting.description">
@@ -69,10 +19,19 @@
 <ANCHOR id="NM-SETTING-PARAM-SECRET:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-PARAM-SECRET:CAPS">
 <ANCHOR id="NM-SETTING-PARAM-FUZZY-IGNORE:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-PARAM-FUZZY-IGNORE:CAPS">
 <ANCHOR id="NM-SETTING-NAME:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-NAME:CAPS">
+<ANCHOR id="NMSettingSecretFlags" href="libnm-util/NMSetting.html#NMSettingSecretFlags">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-NONE:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-SECRET-FLAG-NONE:CAPS">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS">
 <ANCHOR id="NMSetting-struct" href="libnm-util/NMSetting.html#NMSetting-struct">
 <ANCHOR id="NMSettingClass" href="libnm-util/NMSetting.html#NMSettingClass">
 <ANCHOR id="NMSettingValueIterFn" href="libnm-util/NMSetting.html#NMSettingValueIterFn">
 <ANCHOR id="nm-setting-get-type" href="libnm-util/NMSetting.html#nm-setting-get-type">
+<ANCHOR id="NMSettingHashFlags" href="libnm-util/NMSetting.html#NMSettingHashFlags">
+<ANCHOR id="NM-SETTING-HASH-FLAG-ALL:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-HASH-FLAG-ALL:CAPS">
+<ANCHOR id="NM-SETTING-HASH-FLAG-NO-SECRETS:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-HASH-FLAG-NO-SECRETS:CAPS">
+<ANCHOR id="NM-SETTING-HASH-FLAG-ONLY-SECRETS:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-HASH-FLAG-ONLY-SECRETS:CAPS">
 <ANCHOR id="nm-setting-to-hash" href="libnm-util/NMSetting.html#nm-setting-to-hash">
 <ANCHOR id="nm-setting-new-from-hash" href="libnm-util/NMSetting.html#nm-setting-new-from-hash">
 <ANCHOR id="nm-setting-duplicate" href="libnm-util/NMSetting.html#nm-setting-duplicate">
@@ -94,10 +53,13 @@
 <ANCHOR id="nm-setting-clear-secrets" href="libnm-util/NMSetting.html#nm-setting-clear-secrets">
 <ANCHOR id="nm-setting-need-secrets" href="libnm-util/NMSetting.html#nm-setting-need-secrets">
 <ANCHOR id="nm-setting-update-secrets" href="libnm-util/NMSetting.html#nm-setting-update-secrets">
+<ANCHOR id="nm-setting-get-secret-flags" href="libnm-util/NMSetting.html#nm-setting-get-secret-flags">
+<ANCHOR id="nm-setting-set-secret-flags" href="libnm-util/NMSetting.html#nm-setting-set-secret-flags">
 <ANCHOR id="NMSetting.property-details" href="libnm-util/NMSetting.html#NMSetting.property-details">
 <ANCHOR id="NMSetting--name" href="libnm-util/NMSetting.html#NMSetting--name">
 <ANCHOR id="NMSettingConnection" href="libnm-util/NMSettingConnection.html">
 <ANCHOR id="NMSettingConnection.synopsis" href="libnm-util/NMSettingConnection.html#NMSettingConnection.synopsis">
+<ANCHOR id="NMSettingConnectionError" href="libnm-util/NMSettingConnection.html#NMSettingConnectionError">
 <ANCHOR id="NMSettingConnection.object-hierarchy" href="libnm-util/NMSettingConnection.html#NMSettingConnection.object-hierarchy">
 <ANCHOR id="NMSettingConnection.properties" href="libnm-util/NMSettingConnection.html#NMSettingConnection.properties">
 <ANCHOR id="NMSettingConnection.description" href="libnm-util/NMSettingConnection.html#NMSettingConnection.description">
@@ -117,6 +79,7 @@
 <ANCHOR id="NM-SETTING-CONNECTION-AUTOCONNECT:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT:CAPS">
 <ANCHOR id="NM-SETTING-CONNECTION-TIMESTAMP:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-TIMESTAMP:CAPS">
 <ANCHOR id="NM-SETTING-CONNECTION-READ-ONLY:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-READ-ONLY:CAPS">
+<ANCHOR id="NM-SETTING-CONNECTION-PERMISSIONS:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-PERMISSIONS:CAPS">
 <ANCHOR id="NMSettingConnection-struct" href="libnm-util/NMSettingConnection.html#NMSettingConnection-struct">
 <ANCHOR id="NMSettingConnectionClass" href="libnm-util/NMSettingConnection.html#NMSettingConnectionClass">
 <ANCHOR id="nm-setting-connection-get-type" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-type">
@@ -127,15 +90,22 @@
 <ANCHOR id="nm-setting-connection-get-autoconnect" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-autoconnect">
 <ANCHOR id="nm-setting-connection-get-timestamp" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-timestamp">
 <ANCHOR id="nm-setting-connection-get-read-only" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-read-only">
+<ANCHOR id="nm-setting-connection-get-num-permissions" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-num-permissions">
+<ANCHOR id="nm-setting-connection-get-permission" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-permission">
+<ANCHOR id="nm-setting-connection-permissions-user-allowed" href="libnm-util/NMSettingConnection.html#nm-setting-connection-permissions-user-allowed">
+<ANCHOR id="nm-setting-connection-add-permission" href="libnm-util/NMSettingConnection.html#nm-setting-connection-add-permission">
+<ANCHOR id="nm-setting-connection-remove-permission" href="libnm-util/NMSettingConnection.html#nm-setting-connection-remove-permission">
 <ANCHOR id="NMSettingConnection.property-details" href="libnm-util/NMSettingConnection.html#NMSettingConnection.property-details">
 <ANCHOR id="NMSettingConnection--autoconnect" href="libnm-util/NMSettingConnection.html#NMSettingConnection--autoconnect">
 <ANCHOR id="NMSettingConnection--id" href="libnm-util/NMSettingConnection.html#NMSettingConnection--id">
+<ANCHOR id="NMSettingConnection--permissions" href="libnm-util/NMSettingConnection.html#NMSettingConnection--permissions">
 <ANCHOR id="NMSettingConnection--read-only" href="libnm-util/NMSettingConnection.html#NMSettingConnection--read-only">
 <ANCHOR id="NMSettingConnection--timestamp" href="libnm-util/NMSettingConnection.html#NMSettingConnection--timestamp">
 <ANCHOR id="NMSettingConnection--type" href="libnm-util/NMSettingConnection.html#NMSettingConnection--type">
 <ANCHOR id="NMSettingConnection--uuid" href="libnm-util/NMSettingConnection.html#NMSettingConnection--uuid">
 <ANCHOR id="NMSettingWired" href="libnm-util/NMSettingWired.html">
 <ANCHOR id="NMSettingWired.synopsis" href="libnm-util/NMSettingWired.html#NMSettingWired.synopsis">
+<ANCHOR id="NMSettingWiredError" href="libnm-util/NMSettingWired.html#NMSettingWiredError">
 <ANCHOR id="NMSettingWired.object-hierarchy" href="libnm-util/NMSettingWired.html#NMSettingWired.object-hierarchy">
 <ANCHOR id="NMSettingWired.properties" href="libnm-util/NMSettingWired.html#NMSettingWired.properties">
 <ANCHOR id="NMSettingWired.description" href="libnm-util/NMSettingWired.html#NMSettingWired.description">
@@ -186,6 +156,7 @@
 <ANCHOR id="NMSettingWired--speed" href="libnm-util/NMSettingWired.html#NMSettingWired--speed">
 <ANCHOR id="NMSettingWireless" href="libnm-util/NMSettingWireless.html">
 <ANCHOR id="NMSettingWireless.synopsis" href="libnm-util/NMSettingWireless.html#NMSettingWireless.synopsis">
+<ANCHOR id="NMSettingWirelessError" href="libnm-util/NMSettingWireless.html#NMSettingWirelessError">
 <ANCHOR id="NMSettingWireless.object-hierarchy" href="libnm-util/NMSettingWireless.html#NMSettingWireless.object-hierarchy">
 <ANCHOR id="NMSettingWireless.properties" href="libnm-util/NMSettingWireless.html#NMSettingWireless.properties">
 <ANCHOR id="NMSettingWireless.description" href="libnm-util/NMSettingWireless.html#NMSettingWireless.description">
@@ -207,6 +178,8 @@
 <ANCHOR id="NM-SETTING-WIRELESS-MTU:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SEC:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-SEC:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-MODE-ADHOC:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-MODE-INFRA:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS">
 <ANCHOR id="NMSettingWireless-struct" href="libnm-util/NMSettingWireless.html#NMSettingWireless-struct">
 <ANCHOR id="NMSettingWirelessClass" href="libnm-util/NMSettingWireless.html#NMSettingWirelessClass">
 <ANCHOR id="nm-setting-wireless-get-type" href="libnm-util/NMSettingWireless.html#nm-setting-wireless-get-type">
@@ -241,6 +214,7 @@
 <ANCHOR id="NMSettingWireless--tx-power" href="libnm-util/NMSettingWireless.html#NMSettingWireless--tx-power">
 <ANCHOR id="NMSettingWirelessSecurity" href="libnm-util/NMSettingWirelessSecurity.html">
 <ANCHOR id="NMSettingWirelessSecurity.synopsis" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity.synopsis">
+<ANCHOR id="NMSettingWirelessSecurityError" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurityError">
 <ANCHOR id="NMSettingWirelessSecurity.object-hierarchy" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity.object-hierarchy">
 <ANCHOR id="NMSettingWirelessSecurity.properties" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity.properties">
 <ANCHOR id="NMSettingWirelessSecurity.description" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity.description">
@@ -262,9 +236,12 @@
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-PSK:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS">
-<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NMSettingWirelessSecurity-struct" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct">
 <ANCHOR id="NMSettingWirelessSecurityClass" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurityClass">
 <ANCHOR id="nm-setting-wireless-security-get-type" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-type">
@@ -286,22 +263,28 @@
 <ANCHOR id="nm-setting-wireless-security-remove-group" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-remove-group">
 <ANCHOR id="nm-setting-wireless-security-clear-groups" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-clear-groups">
 <ANCHOR id="nm-setting-wireless-security-get-psk" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk">
+<ANCHOR id="nm-setting-wireless-security-get-psk-flags" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk-flags">
 <ANCHOR id="nm-setting-wireless-security-get-leap-username" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-username">
 <ANCHOR id="nm-setting-wireless-security-get-leap-password" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password">
+<ANCHOR id="nm-setting-wireless-security-get-leap-password-flags" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password-flags">
 <ANCHOR id="nm-setting-wireless-security-get-wep-key" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key">
 <ANCHOR id="nm-setting-wireless-security-set-wep-key" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-set-wep-key">
 <ANCHOR id="nm-setting-wireless-security-get-wep-tx-keyidx" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-tx-keyidx">
 <ANCHOR id="nm-setting-wireless-security-get-auth-alg" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-auth-alg">
+<ANCHOR id="nm-setting-wireless-security-get-wep-key-flags" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-flags">
 <ANCHOR id="nm-setting-wireless-security-get-wep-key-type" href="libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-type">
 <ANCHOR id="NMSettingWirelessSecurity.property-details" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity.property-details">
 <ANCHOR id="NMSettingWirelessSecurity--auth-alg" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg">
 <ANCHOR id="NMSettingWirelessSecurity--group" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--group">
 <ANCHOR id="NMSettingWirelessSecurity--key-mgmt" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt">
 <ANCHOR id="NMSettingWirelessSecurity--leap-password" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password">
+<ANCHOR id="NMSettingWirelessSecurity--leap-password-flags" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password-flags">
 <ANCHOR id="NMSettingWirelessSecurity--leap-username" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username">
 <ANCHOR id="NMSettingWirelessSecurity--pairwise" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--pairwise">
 <ANCHOR id="NMSettingWirelessSecurity--proto" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--proto">
 <ANCHOR id="NMSettingWirelessSecurity--psk" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk">
+<ANCHOR id="NMSettingWirelessSecurity--psk-flags" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk-flags">
+<ANCHOR id="NMSettingWirelessSecurity--wep-key-flags" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-flags">
 <ANCHOR id="NMSettingWirelessSecurity--wep-key-type" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type">
 <ANCHOR id="NMSettingWirelessSecurity--wep-key0" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key0">
 <ANCHOR id="NMSettingWirelessSecurity--wep-key1" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key1">
@@ -310,6 +293,7 @@
 <ANCHOR id="NMSettingWirelessSecurity--wep-tx-keyidx" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-tx-keyidx">
 <ANCHOR id="NMSettingBluetooth" href="libnm-util/NMSettingBluetooth.html">
 <ANCHOR id="NMSettingBluetooth.synopsis" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetooth.synopsis">
+<ANCHOR id="NMSettingBluetoothError" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetoothError">
 <ANCHOR id="NMSettingBluetooth.object-hierarchy" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetooth.object-hierarchy">
 <ANCHOR id="NMSettingBluetooth.properties" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetooth.properties">
 <ANCHOR id="NMSettingBluetooth.description" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetooth.description">
@@ -334,6 +318,7 @@
 <ANCHOR id="NMSettingBluetooth--type" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetooth--type">
 <ANCHOR id="NMSettingSerial" href="libnm-util/NMSettingSerial.html">
 <ANCHOR id="NMSettingSerial.synopsis" href="libnm-util/NMSettingSerial.html#NMSettingSerial.synopsis">
+<ANCHOR id="NMSettingSerialError" href="libnm-util/NMSettingSerial.html#NMSettingSerialError">
 <ANCHOR id="NMSettingSerial.object-hierarchy" href="libnm-util/NMSettingSerial.html#NMSettingSerial.object-hierarchy">
 <ANCHOR id="NMSettingSerial.properties" href="libnm-util/NMSettingSerial.html#NMSettingSerial.properties">
 <ANCHOR id="NMSettingSerial.description" href="libnm-util/NMSettingSerial.html#NMSettingSerial.description">
@@ -365,6 +350,7 @@
 <ANCHOR id="NMSettingSerial--stopbits" href="libnm-util/NMSettingSerial.html#NMSettingSerial--stopbits">
 <ANCHOR id="NMSettingCdma" href="libnm-util/NMSettingCdma.html">
 <ANCHOR id="NMSettingCdma.synopsis" href="libnm-util/NMSettingCdma.html#NMSettingCdma.synopsis">
+<ANCHOR id="NMSettingCdmaError" href="libnm-util/NMSettingCdma.html#NMSettingCdmaError">
 <ANCHOR id="NMSettingCdma.object-hierarchy" href="libnm-util/NMSettingCdma.html#NMSettingCdma.object-hierarchy">
 <ANCHOR id="NMSettingCdma.properties" href="libnm-util/NMSettingCdma.html#NMSettingCdma.properties">
 <ANCHOR id="NMSettingCdma.description" href="libnm-util/NMSettingCdma.html#NMSettingCdma.description">
@@ -377,6 +363,7 @@
 <ANCHOR id="NM-SETTING-CDMA-NUMBER:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-NUMBER:CAPS">
 <ANCHOR id="NM-SETTING-CDMA-USERNAME:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-USERNAME:CAPS">
 <ANCHOR id="NM-SETTING-CDMA-PASSWORD:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD:CAPS">
+<ANCHOR id="NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NMSettingCdma-struct" href="libnm-util/NMSettingCdma.html#NMSettingCdma-struct">
 <ANCHOR id="NMSettingCdmaClass" href="libnm-util/NMSettingCdma.html#NMSettingCdmaClass">
 <ANCHOR id="nm-setting-cdma-get-type" href="libnm-util/NMSettingCdma.html#nm-setting-cdma-get-type">
@@ -384,12 +371,15 @@
 <ANCHOR id="nm-setting-cdma-get-number" href="libnm-util/NMSettingCdma.html#nm-setting-cdma-get-number">
 <ANCHOR id="nm-setting-cdma-get-username" href="libnm-util/NMSettingCdma.html#nm-setting-cdma-get-username">
 <ANCHOR id="nm-setting-cdma-get-password" href="libnm-util/NMSettingCdma.html#nm-setting-cdma-get-password">
+<ANCHOR id="nm-setting-cdma-get-password-flags" href="libnm-util/NMSettingCdma.html#nm-setting-cdma-get-password-flags">
 <ANCHOR id="NMSettingCdma.property-details" href="libnm-util/NMSettingCdma.html#NMSettingCdma.property-details">
 <ANCHOR id="NMSettingCdma--number" href="libnm-util/NMSettingCdma.html#NMSettingCdma--number">
 <ANCHOR id="NMSettingCdma--password" href="libnm-util/NMSettingCdma.html#NMSettingCdma--password">
+<ANCHOR id="NMSettingCdma--password-flags" href="libnm-util/NMSettingCdma.html#NMSettingCdma--password-flags">
 <ANCHOR id="NMSettingCdma--username" href="libnm-util/NMSettingCdma.html#NMSettingCdma--username">
 <ANCHOR id="NMSettingGsm" href="libnm-util/NMSettingGsm.html">
 <ANCHOR id="NMSettingGsm.synopsis" href="libnm-util/NMSettingGsm.html#NMSettingGsm.synopsis">
+<ANCHOR id="NMSettingGsmError" href="libnm-util/NMSettingGsm.html#NMSettingGsmError">
 <ANCHOR id="NMSettingGsm.object-hierarchy" href="libnm-util/NMSettingGsm.html#NMSettingGsm.object-hierarchy">
 <ANCHOR id="NMSettingGsm.properties" href="libnm-util/NMSettingGsm.html#NMSettingGsm.properties">
 <ANCHOR id="NMSettingGsm.description" href="libnm-util/NMSettingGsm.html#NMSettingGsm.description">
@@ -402,19 +392,14 @@
 <ANCHOR id="NM-SETTING-GSM-NUMBER:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NUMBER:CAPS">
 <ANCHOR id="NM-SETTING-GSM-USERNAME:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-USERNAME:CAPS">
 <ANCHOR id="NM-SETTING-GSM-PASSWORD:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-PASSWORD:CAPS">
+<ANCHOR id="NM-SETTING-GSM-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-GSM-APN:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-APN:CAPS">
 <ANCHOR id="NM-SETTING-GSM-NETWORK-ID:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-ID:CAPS">
 <ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE:CAPS">
 <ANCHOR id="NM-SETTING-GSM-ALLOWED-BANDS:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS">
 <ANCHOR id="NM-SETTING-GSM-PIN:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-PIN:CAPS">
+<ANCHOR id="NM-SETTING-GSM-PIN-FLAGS:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-PIN-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-GSM-HOME-ONLY:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-HOME-ONLY:CAPS">
-<ANCHOR id="NM-SETTING-GSM-PUK:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-PUK:CAPS">
-<ANCHOR id="NM-SETTING-GSM-BAND:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND:CAPS">
-<ANCHOR id="NM-GSM-NETWORK-ANY:CAPS" href="libnm-util/NMSettingGsm.html#NM-GSM-NETWORK-ANY:CAPS">
-<ANCHOR id="NM-GSM-NETWORK-UMTS-HSPA:CAPS" href="libnm-util/NMSettingGsm.html#NM-GSM-NETWORK-UMTS-HSPA:CAPS">
-<ANCHOR id="NM-GSM-NETWORK-GPRS-EDGE:CAPS" href="libnm-util/NMSettingGsm.html#NM-GSM-NETWORK-GPRS-EDGE:CAPS">
-<ANCHOR id="NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS" href="libnm-util/NMSettingGsm.html#NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS">
-<ANCHOR id="NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS" href="libnm-util/NMSettingGsm.html#NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS">
 <ANCHOR id="NMSettingGsmNetworkType" href="libnm-util/NMSettingGsm.html#NMSettingGsmNetworkType">
 <ANCHOR id="NMSettingGsmNetworkBand" href="libnm-util/NMSettingGsm.html#NMSettingGsmNetworkBand">
 <ANCHOR id="NMSettingGsm-struct" href="libnm-util/NMSettingGsm.html#NMSettingGsm-struct">
@@ -430,22 +415,23 @@
 <ANCHOR id="nm-setting-gsm-get-allowed-bands" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-allowed-bands">
 <ANCHOR id="nm-setting-gsm-get-pin" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-pin">
 <ANCHOR id="nm-setting-gsm-get-home-only" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-home-only">
-<ANCHOR id="nm-setting-gsm-get-puk" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-puk">
-<ANCHOR id="nm-setting-gsm-get-band" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-band">
+<ANCHOR id="nm-setting-gsm-get-pin-flags" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-pin-flags">
+<ANCHOR id="nm-setting-gsm-get-password-flags" href="libnm-util/NMSettingGsm.html#nm-setting-gsm-get-password-flags">
 <ANCHOR id="NMSettingGsm.property-details" href="libnm-util/NMSettingGsm.html#NMSettingGsm.property-details">
 <ANCHOR id="NMSettingGsm--allowed-bands" href="libnm-util/NMSettingGsm.html#NMSettingGsm--allowed-bands">
 <ANCHOR id="NMSettingGsm--apn" href="libnm-util/NMSettingGsm.html#NMSettingGsm--apn">
-<ANCHOR id="NMSettingGsm--band" href="libnm-util/NMSettingGsm.html#NMSettingGsm--band">
 <ANCHOR id="NMSettingGsm--home-only" href="libnm-util/NMSettingGsm.html#NMSettingGsm--home-only">
 <ANCHOR id="NMSettingGsm--network-id" href="libnm-util/NMSettingGsm.html#NMSettingGsm--network-id">
 <ANCHOR id="NMSettingGsm--network-type" href="libnm-util/NMSettingGsm.html#NMSettingGsm--network-type">
 <ANCHOR id="NMSettingGsm--number" href="libnm-util/NMSettingGsm.html#NMSettingGsm--number">
 <ANCHOR id="NMSettingGsm--password" href="libnm-util/NMSettingGsm.html#NMSettingGsm--password">
+<ANCHOR id="NMSettingGsm--password-flags" href="libnm-util/NMSettingGsm.html#NMSettingGsm--password-flags">
 <ANCHOR id="NMSettingGsm--pin" href="libnm-util/NMSettingGsm.html#NMSettingGsm--pin">
-<ANCHOR id="NMSettingGsm--puk" href="libnm-util/NMSettingGsm.html#NMSettingGsm--puk">
+<ANCHOR id="NMSettingGsm--pin-flags" href="libnm-util/NMSettingGsm.html#NMSettingGsm--pin-flags">
 <ANCHOR id="NMSettingGsm--username" href="libnm-util/NMSettingGsm.html#NMSettingGsm--username">
 <ANCHOR id="NMSettingOlpcMesh" href="libnm-util/NMSettingOlpcMesh.html">
 <ANCHOR id="NMSettingOlpcMesh.synopsis" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh.synopsis">
+<ANCHOR id="NMSettingOlpcMeshError" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMeshError">
 <ANCHOR id="NMSettingOlpcMesh.object-hierarchy" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh.object-hierarchy">
 <ANCHOR id="NMSettingOlpcMesh.properties" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh.properties">
 <ANCHOR id="NMSettingOlpcMesh.description" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh.description">
@@ -471,12 +457,20 @@
 <ANCHOR id="NMSettingOlpcMesh--ssid" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh--ssid">
 <ANCHOR id="NMSetting8021x" href="libnm-util/NMSetting8021x.html">
 <ANCHOR id="NMSetting8021x.synopsis" href="libnm-util/NMSetting8021x.html#NMSetting8021x.synopsis">
+<ANCHOR id="NMSetting8021xError" href="libnm-util/NMSetting8021x.html#NMSetting8021xError">
 <ANCHOR id="NMSetting8021x.object-hierarchy" href="libnm-util/NMSetting8021x.html#NMSetting8021x.object-hierarchy">
 <ANCHOR id="NMSetting8021x.properties" href="libnm-util/NMSetting8021x.html#NMSetting8021x.properties">
 <ANCHOR id="NMSetting8021x.description" href="libnm-util/NMSetting8021x.html#NMSetting8021x.description">
 <ANCHOR id="NMSetting8021x.details" href="libnm-util/NMSetting8021x.html#NMSetting8021x.details">
 <ANCHOR id="NMSetting8021xCKFormat" href="libnm-util/NMSetting8021x.html#NMSetting8021xCKFormat">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-X509:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-X509:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS">
 <ANCHOR id="NMSetting8021xCKScheme" href="libnm-util/NMSetting8021x.html#NMSetting8021xCKScheme">
+<ANCHOR id="NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-SETTING-NAME:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-SETTING-NAME:CAPS">
 <ANCHOR id="NMSetting8021xError" href="libnm-util/NMSetting8021x.html#NMSetting8021xError">
 <ANCHOR id="NM-TYPE-SETTING-802-1X-ERROR:CAPS" href="libnm-util/NMSetting8021x.html#NM-TYPE-SETTING-802-1X-ERROR:CAPS">
@@ -497,12 +491,15 @@
 <ANCHOR id="NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PASSWORD:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PRIVATE-KEY:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PIN:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PIN:CAPS">
-<ANCHOR id="NM-SETTING-802-1X-PSK:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PSK:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-PIN-FLAGS:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-PIN-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS">
 <ANCHOR id="NMSetting8021x-struct" href="libnm-util/NMSetting8021x.html#NMSetting8021x-struct">
 <ANCHOR id="NMSetting8021xClass" href="libnm-util/NMSetting8021x.html#NMSetting8021xClass">
@@ -540,35 +537,23 @@
 <ANCHOR id="nm-setting-802-1x-get-phase2-client-cert-path" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-path">
 <ANCHOR id="nm-setting-802-1x-set-phase2-client-cert" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert">
 <ANCHOR id="nm-setting-802-1x-get-password" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-password">
+<ANCHOR id="nm-setting-802-1x-get-password-flags" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-password-flags">
 <ANCHOR id="nm-setting-802-1x-get-pin" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-pin">
-<ANCHOR id="nm-setting-802-1x-get-psk" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-psk">
+<ANCHOR id="nm-setting-802-1x-get-pin-flags" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-pin-flags">
 <ANCHOR id="nm-setting-802-1x-get-private-key-scheme" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-scheme">
 <ANCHOR id="nm-setting-802-1x-get-private-key-blob" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob">
 <ANCHOR id="nm-setting-802-1x-get-private-key-path" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-path">
 <ANCHOR id="nm-setting-802-1x-set-private-key" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-private-key">
 <ANCHOR id="nm-setting-802-1x-get-private-key-password" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-password">
+<ANCHOR id="nm-setting-802-1x-get-private-key-password-flags" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-password-flags">
 <ANCHOR id="nm-setting-802-1x-get-private-key-format" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-format">
 <ANCHOR id="nm-setting-802-1x-get-phase2-private-key-scheme" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-scheme">
 <ANCHOR id="nm-setting-802-1x-get-phase2-private-key-blob" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob">
 <ANCHOR id="nm-setting-802-1x-get-phase2-private-key-path" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path">
 <ANCHOR id="nm-setting-802-1x-set-phase2-private-key" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key">
 <ANCHOR id="nm-setting-802-1x-get-phase2-private-key-password" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password">
+<ANCHOR id="nm-setting-802-1x-get-phase2-private-key-password-flags" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password-flags">
 <ANCHOR id="nm-setting-802-1x-get-phase2-private-key-format" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format">
-<ANCHOR id="NMSetting8021xCKType" href="libnm-util/NMSetting8021x.html#NMSetting8021xCKType">
-<ANCHOR id="nm-setting-802-1x-get-ca-cert" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-ca-cert">
-<ANCHOR id="nm-setting-802-1x-set-ca-cert-from-file" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-ca-cert-from-file">
-<ANCHOR id="nm-setting-802-1x-get-client-cert" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-client-cert">
-<ANCHOR id="nm-setting-802-1x-set-client-cert-from-file" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-client-cert-from-file">
-<ANCHOR id="nm-setting-802-1x-get-phase2-ca-cert" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert">
-<ANCHOR id="nm-setting-802-1x-set-phase2-ca-cert-from-file" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert-from-file">
-<ANCHOR id="nm-setting-802-1x-get-phase2-client-cert" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert">
-<ANCHOR id="nm-setting-802-1x-set-phase2-client-cert-from-file" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert-from-file">
-<ANCHOR id="nm-setting-802-1x-get-private-key" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key">
-<ANCHOR id="nm-setting-802-1x-set-private-key-from-file" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file">
-<ANCHOR id="nm-setting-802-1x-get-private-key-type" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-private-key-type">
-<ANCHOR id="nm-setting-802-1x-get-phase2-private-key" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key">
-<ANCHOR id="nm-setting-802-1x-set-phase2-private-key-from-file" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file">
-<ANCHOR id="nm-setting-802-1x-get-phase2-private-key-type" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-type">
 <ANCHOR id="NMSetting8021x.property-details" href="libnm-util/NMSetting8021x.html#NMSetting8021x.property-details">
 <ANCHOR id="NMSetting8021x--anonymous-identity" href="libnm-util/NMSetting8021x.html#NMSetting8021x--anonymous-identity">
 <ANCHOR id="NMSetting8021x--ca-cert" href="libnm-util/NMSetting8021x.html#NMSetting8021x--ca-cert">
@@ -577,6 +562,7 @@
 <ANCHOR id="NMSetting8021x--eap" href="libnm-util/NMSetting8021x.html#NMSetting8021x--eap">
 <ANCHOR id="NMSetting8021x--identity" href="libnm-util/NMSetting8021x.html#NMSetting8021x--identity">
 <ANCHOR id="NMSetting8021x--password" href="libnm-util/NMSetting8021x.html#NMSetting8021x--password">
+<ANCHOR id="NMSetting8021x--password-flags" href="libnm-util/NMSetting8021x.html#NMSetting8021x--password-flags">
 <ANCHOR id="NMSetting8021x--phase1-fast-provisioning" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning">
 <ANCHOR id="NMSetting8021x--phase1-peaplabel" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase1-peaplabel">
 <ANCHOR id="NMSetting8021x--phase1-peapver" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase1-peapver">
@@ -587,11 +573,16 @@
 <ANCHOR id="NMSetting8021x--phase2-client-cert" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-client-cert">
 <ANCHOR id="NMSetting8021x--phase2-private-key" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key">
 <ANCHOR id="NMSetting8021x--phase2-private-key-password" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key-password">
+<ANCHOR id="NMSetting8021x--phase2-private-key-password-flags" href="libnm-util/NMSetting8021x.html#NMSetting8021x--phase2-private-key-password-flags">
 <ANCHOR id="NMSetting8021x--private-key" href="libnm-util/NMSetting8021x.html#NMSetting8021x--private-key">
 <ANCHOR id="NMSetting8021x--private-key-password" href="libnm-util/NMSetting8021x.html#NMSetting8021x--private-key-password">
+<ANCHOR id="NMSetting8021x--private-key-password-flags" href="libnm-util/NMSetting8021x.html#NMSetting8021x--private-key-password-flags">
 <ANCHOR id="NMSetting8021x--system-ca-certs" href="libnm-util/NMSetting8021x.html#NMSetting8021x--system-ca-certs">
 <ANCHOR id="NMSettingIP4Config" href="libnm-util/NMSettingIP4Config.html">
 <ANCHOR id="NMSettingIP4Config.synopsis" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4Config.synopsis">
+<ANCHOR id="NMSettingIP4ConfigError" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4ConfigError">
+<ANCHOR id="NMIP4Address" href="libnm-util/NMSettingIP4Config.html#NMIP4Address">
+<ANCHOR id="NMIP4Route" href="libnm-util/NMSettingIP4Config.html#NMIP4Route">
 <ANCHOR id="NMSettingIP4Config.object-hierarchy" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4Config.object-hierarchy">
 <ANCHOR id="NMSettingIP4Config.properties" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4Config.properties">
 <ANCHOR id="NMSettingIP4Config.description" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4Config.description">
@@ -619,6 +610,7 @@
 <ANCHOR id="NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS" href="libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS">
 <ANCHOR id="NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS" href="libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS">
 <ANCHOR id="NMIP4Address" href="libnm-util/NMSettingIP4Config.html#NMIP4Address">
+<ANCHOR id="nm-ip4-address-get-type" href="libnm-util/NMSettingIP4Config.html#nm-ip4-address-get-type">
 <ANCHOR id="nm-ip4-address-new" href="libnm-util/NMSettingIP4Config.html#nm-ip4-address-new">
 <ANCHOR id="nm-ip4-address-dup" href="libnm-util/NMSettingIP4Config.html#nm-ip4-address-dup">
 <ANCHOR id="nm-ip4-address-ref" href="libnm-util/NMSettingIP4Config.html#nm-ip4-address-ref">
@@ -631,6 +623,7 @@
 <ANCHOR id="nm-ip4-address-get-gateway" href="libnm-util/NMSettingIP4Config.html#nm-ip4-address-get-gateway">
 <ANCHOR id="nm-ip4-address-set-gateway" href="libnm-util/NMSettingIP4Config.html#nm-ip4-address-set-gateway">
 <ANCHOR id="NMIP4Route" href="libnm-util/NMSettingIP4Config.html#NMIP4Route">
+<ANCHOR id="nm-ip4-route-get-type" href="libnm-util/NMSettingIP4Config.html#nm-ip4-route-get-type">
 <ANCHOR id="nm-ip4-route-new" href="libnm-util/NMSettingIP4Config.html#nm-ip4-route-new">
 <ANCHOR id="nm-ip4-route-dup" href="libnm-util/NMSettingIP4Config.html#nm-ip4-route-dup">
 <ANCHOR id="nm-ip4-route-ref" href="libnm-util/NMSettingIP4Config.html#nm-ip4-route-ref">
@@ -691,6 +684,9 @@
 <ANCHOR id="NMSettingIP4Config--routes" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4Config--routes">
 <ANCHOR id="NMSettingIP6Config" href="libnm-util/NMSettingIP6Config.html">
 <ANCHOR id="NMSettingIP6Config.synopsis" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config.synopsis">
+<ANCHOR id="NMSettingIP6ConfigError" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6ConfigError">
+<ANCHOR id="NMIP6Address" href="libnm-util/NMSettingIP6Config.html#NMIP6Address">
+<ANCHOR id="NMIP6Route" href="libnm-util/NMSettingIP6Config.html#NMIP6Route">
 <ANCHOR id="NMSettingIP6Config.object-hierarchy" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config.object-hierarchy">
 <ANCHOR id="NMSettingIP6Config.properties" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config.properties">
 <ANCHOR id="NMSettingIP6Config.description" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config.description">
@@ -716,6 +712,7 @@
 <ANCHOR id="NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS">
 <ANCHOR id="NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS">
 <ANCHOR id="NMIP6Address" href="libnm-util/NMSettingIP6Config.html#NMIP6Address">
+<ANCHOR id="nm-ip6-address-get-type" href="libnm-util/NMSettingIP6Config.html#nm-ip6-address-get-type">
 <ANCHOR id="nm-ip6-address-new" href="libnm-util/NMSettingIP6Config.html#nm-ip6-address-new">
 <ANCHOR id="nm-ip6-address-dup" href="libnm-util/NMSettingIP6Config.html#nm-ip6-address-dup">
 <ANCHOR id="nm-ip6-address-ref" href="libnm-util/NMSettingIP6Config.html#nm-ip6-address-ref">
@@ -728,6 +725,7 @@
 <ANCHOR id="nm-ip6-address-get-gateway" href="libnm-util/NMSettingIP6Config.html#nm-ip6-address-get-gateway">
 <ANCHOR id="nm-ip6-address-set-gateway" href="libnm-util/NMSettingIP6Config.html#nm-ip6-address-set-gateway">
 <ANCHOR id="NMIP6Route" href="libnm-util/NMSettingIP6Config.html#NMIP6Route">
+<ANCHOR id="nm-ip6-route-get-type" href="libnm-util/NMSettingIP6Config.html#nm-ip6-route-get-type">
 <ANCHOR id="nm-ip6-route-new" href="libnm-util/NMSettingIP6Config.html#nm-ip6-route-new">
 <ANCHOR id="nm-ip6-route-dup" href="libnm-util/NMSettingIP6Config.html#nm-ip6-route-dup">
 <ANCHOR id="nm-ip6-route-ref" href="libnm-util/NMSettingIP6Config.html#nm-ip6-route-ref">
@@ -782,6 +780,7 @@
 <ANCHOR id="NMSettingIP6Config--routes" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config--routes">
 <ANCHOR id="NMSettingPPP" href="libnm-util/NMSettingPPP.html">
 <ANCHOR id="NMSettingPPP.synopsis" href="libnm-util/NMSettingPPP.html#NMSettingPPP.synopsis">
+<ANCHOR id="NMSettingPPPError" href="libnm-util/NMSettingPPP.html#NMSettingPPPError">
 <ANCHOR id="NMSettingPPP.object-hierarchy" href="libnm-util/NMSettingPPP.html#NMSettingPPP.object-hierarchy">
 <ANCHOR id="NMSettingPPP.properties" href="libnm-util/NMSettingPPP.html#NMSettingPPP.properties">
 <ANCHOR id="NMSettingPPP.description" href="libnm-util/NMSettingPPP.html#NMSettingPPP.description">
@@ -852,6 +851,7 @@
 <ANCHOR id="NMSettingPPP--require-mppe-128" href="libnm-util/NMSettingPPP.html#NMSettingPPP--require-mppe-128">
 <ANCHOR id="NMSettingPPPOE" href="libnm-util/NMSettingPPPOE.html">
 <ANCHOR id="NMSettingPPPOE.synopsis" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE.synopsis">
+<ANCHOR id="NMSettingPPPOEError" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOEError">
 <ANCHOR id="NMSettingPPPOE.object-hierarchy" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE.object-hierarchy">
 <ANCHOR id="NMSettingPPPOE.properties" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE.properties">
 <ANCHOR id="NMSettingPPPOE.description" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE.description">
@@ -864,6 +864,7 @@
 <ANCHOR id="NM-SETTING-PPPOE-SERVICE:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-SERVICE:CAPS">
 <ANCHOR id="NM-SETTING-PPPOE-USERNAME:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-USERNAME:CAPS">
 <ANCHOR id="NM-SETTING-PPPOE-PASSWORD:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD:CAPS">
+<ANCHOR id="NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS">
 <ANCHOR id="NMSettingPPPOE-struct" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE-struct">
 <ANCHOR id="NMSettingPPPOEClass" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOEClass">
 <ANCHOR id="nm-setting-pppoe-get-type" href="libnm-util/NMSettingPPPOE.html#nm-setting-pppoe-get-type">
@@ -871,12 +872,15 @@
 <ANCHOR id="nm-setting-pppoe-get-service" href="libnm-util/NMSettingPPPOE.html#nm-setting-pppoe-get-service">
 <ANCHOR id="nm-setting-pppoe-get-username" href="libnm-util/NMSettingPPPOE.html#nm-setting-pppoe-get-username">
 <ANCHOR id="nm-setting-pppoe-get-password" href="libnm-util/NMSettingPPPOE.html#nm-setting-pppoe-get-password">
+<ANCHOR id="nm-setting-pppoe-get-password-flags" href="libnm-util/NMSettingPPPOE.html#nm-setting-pppoe-get-password-flags">
 <ANCHOR id="NMSettingPPPOE.property-details" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE.property-details">
 <ANCHOR id="NMSettingPPPOE--password" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE--password">
+<ANCHOR id="NMSettingPPPOE--password-flags" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE--password-flags">
 <ANCHOR id="NMSettingPPPOE--service" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE--service">
 <ANCHOR id="NMSettingPPPOE--username" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE--username">
 <ANCHOR id="NMSettingVPN" href="libnm-util/NMSettingVPN.html">
 <ANCHOR id="NMSettingVPN.synopsis" href="libnm-util/NMSettingVPN.html#NMSettingVPN.synopsis">
+<ANCHOR id="NMSettingVpnError" href="libnm-util/NMSettingVPN.html#NMSettingVpnError">
 <ANCHOR id="NMSettingVPN.object-hierarchy" href="libnm-util/NMSettingVPN.html#NMSettingVPN.object-hierarchy">
 <ANCHOR id="NMSettingVPN.properties" href="libnm-util/NMSettingVPN.html#NMSettingVPN.properties">
 <ANCHOR id="NMSettingVPN.description" href="libnm-util/NMSettingVPN.html#NMSettingVPN.description">
@@ -892,7 +896,7 @@
 <ANCHOR id="NM-SETTING-VPN-SECRETS:CAPS" href="libnm-util/NMSettingVPN.html#NM-SETTING-VPN-SECRETS:CAPS">
 <ANCHOR id="NMSettingVPN-struct" href="libnm-util/NMSettingVPN.html#NMSettingVPN-struct">
 <ANCHOR id="NMSettingVPNClass" href="libnm-util/NMSettingVPN.html#NMSettingVPNClass">
-<ANCHOR id="VPNIterFunc" href="libnm-util/NMSettingVPN.html#VPNIterFunc">
+<ANCHOR id="NMVPNIterFunc" href="libnm-util/NMSettingVPN.html#NMVPNIterFunc">
 <ANCHOR id="nm-setting-vpn-get-type" href="libnm-util/NMSettingVPN.html#nm-setting-vpn-get-type">
 <ANCHOR id="nm-setting-vpn-new" href="libnm-util/NMSettingVPN.html#nm-setting-vpn-new">
 <ANCHOR id="nm-setting-vpn-get-service-type" href="libnm-util/NMSettingVPN.html#nm-setting-vpn-get-service-type">
@@ -914,16 +918,6 @@
 <ANCHOR id="libnm-util-nm-utils.synopsis" href="libnm-util/libnm-util-nm-utils.html#libnm-util-nm-utils.synopsis">
 <ANCHOR id="libnm-util-nm-utils.description" href="libnm-util/libnm-util-nm-utils.html#libnm-util-nm-utils.description">
 <ANCHOR id="libnm-util-nm-utils.details" href="libnm-util/libnm-util-nm-utils.html#libnm-util-nm-utils.details">
-<ANCHOR id="nm-print-backtrace" href="libnm-util/libnm-util-nm-utils.html#nm-print-backtrace">
-<ANCHOR id="nm-get-timestamp" href="libnm-util/libnm-util-nm-utils.html#nm-get-timestamp">
-<ANCHOR id="nm-info" href="libnm-util/libnm-util-nm-utils.html#nm-info">
-<ANCHOR id="nm-info-str" href="libnm-util/libnm-util-nm-utils.html#nm-info-str">
-<ANCHOR id="nm-debug" href="libnm-util/libnm-util-nm-utils.html#nm-debug">
-<ANCHOR id="nm-debug-str" href="libnm-util/libnm-util-nm-utils.html#nm-debug-str">
-<ANCHOR id="nm-warning" href="libnm-util/libnm-util-nm-utils.html#nm-warning">
-<ANCHOR id="nm-warning-str" href="libnm-util/libnm-util-nm-utils.html#nm-warning-str">
-<ANCHOR id="nm-error" href="libnm-util/libnm-util-nm-utils.html#nm-error">
-<ANCHOR id="nm-error-str" href="libnm-util/libnm-util-nm-utils.html#nm-error-str">
 <ANCHOR id="nm-utils-init" href="libnm-util/libnm-util-nm-utils.html#nm-utils-init">
 <ANCHOR id="nm-utils-deinit" href="libnm-util/libnm-util-nm-utils.html#nm-utils-deinit">
 <ANCHOR id="nm-utils-is-empty-ssid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-is-empty-ssid">
@@ -954,4 +948,10 @@
 <ANCHOR id="nm-utils-wifi-channel-to-freq" href="libnm-util/libnm-util-nm-utils.html#nm-utils-wifi-channel-to-freq">
 <ANCHOR id="nm-utils-wifi-find-next-channel" href="libnm-util/libnm-util-nm-utils.html#nm-utils-wifi-find-next-channel">
 <ANCHOR id="nm-utils-wifi-is-channel-valid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-wifi-is-channel-valid">
+<ANCHOR id="annotation-glossterm-out" href="libnm-util/annotation-glossary.html#annotation-glossterm-out">
+<ANCHOR id="annotation-glossterm-allow-none" href="libnm-util/annotation-glossary.html#annotation-glossterm-allow-none">
 <ANCHOR id="annotation-glossterm-element-type" href="libnm-util/annotation-glossary.html#annotation-glossterm-element-type">
+<ANCHOR id="annotation-glossterm-transfer container" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer container">
+<ANCHOR id="annotation-glossterm-scope call" href="libnm-util/annotation-glossary.html#annotation-glossterm-scope call">
+<ANCHOR id="annotation-glossterm-transfer full" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer full">
+<ANCHOR id="annotation-glossterm-transfer none" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer none">
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index ccf9ab5e..f2650339 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingVPN.html" title="NMSettingVPN">
 <link rel="next" href="object-tree.html" title="Object Hierarchy">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,7 +26,7 @@
                   <a href="#libnm-util-nm-utils.description" class="shortcut">Description</a>
 </td></tr>
 </table>
-<div class="refentry" title="nm-utils">
+<div class="refentry">
 <a name="libnm-util-nm-utils"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -35,29 +35,11 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="libnm-util-nm-utils.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">
 #include &lt;nm-utils.h&gt;
 
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-print-backtrace" title="nm_print_backtrace">nm_print_backtrace</a>
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-get-timestamp" title="nm_get_timestamp()">nm_get_timestamp</a>                    (timestamp)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-info" title="nm_info()">nm_info</a>                             (fmt,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-info-str" title="nm_info_str()">nm_info_str</a>                         (fmt_str,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-debug" title="nm_debug()">nm_debug</a>                            (fmt,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-debug-str" title="nm_debug_str()">nm_debug_str</a>                        (fmt_str,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-warning" title="nm_warning()">nm_warning</a>                          (fmt,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-warning-str" title="nm_warning_str()">nm_warning_str</a>                      (fmt_str,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-error" title="nm_error()">nm_error</a>                            (fmt,
-                                                         args...)
-#define             <a class="link" href="libnm-util-nm-utils.html#nm-error-str" title="nm_error_str()">nm_error_str</a>                        (fmt_str,
-                                                         args...)
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-util-nm-utils.html#nm-utils-init" title="nm_utils_init ()">nm_utils_init</a>                       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libnm-util-nm-utils.html#nm-utils-deinit" title="nm_utils_deinit ()">nm_utils_deinit</a>                     (<em class="parameter"><code><span class="type">void</span></code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-util-nm-utils.html#nm-utils-is-empty-ssid" title="nm_utils_is_empty_ssid ()">nm_utils_is_empty_ssid</a>              (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *ssid</code></em>,
@@ -67,8 +49,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="libnm
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-util-nm-utils.html#nm-utils-same-ssid" title="nm_utils_same_ssid ()">nm_utils_same_ssid</a>                  (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *ssid1</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *ssid2</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> ignore_trailing_null</code></em>);
-<span class="returnvalue">char</span> *              <a class="link" href="libnm-util-nm-utils.html#nm-utils-ssid-to-utf8" title="nm_utils_ssid_to_utf8 ()">nm_utils_ssid_to_utf8</a>               (<em class="parameter"><code>const <span class="type">char</span> *ssid</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> len</code></em>);
+<span class="returnvalue">char</span> *              <a class="link" href="libnm-util-nm-utils.html#nm-utils-ssid-to-utf8" title="nm_utils_ssid_to_utf8 ()">nm_utils_ssid_to_utf8</a>               (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *ssid</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="libnm-util-nm-utils.html#nm-utils-gvalue-hash-dup" title="nm_utils_gvalue_hash_dup ()">nm_utils_gvalue_hash_dup</a>            (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libnm-util-nm-utils.html#nm-utils-slist-free" title="nm_utils_slist_free ()">nm_utils_slist_free</a>                 (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> elem_destroy_fn</code></em>);
@@ -114,216 +95,16 @@ enum                <a class="link" href="libnm-util-nm-utils.html#NMUtilsSecuri
                                                          <em class="parameter"><code>const <span class="type">char</span> *band</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="libnm-util-nm-utils.description"></a><h2>Description</h2>
 <p>
 A collection of utility functions for working SSIDs, IP addresses, WiFi
 access points and devices, among other things.
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="libnm-util-nm-utils.details"></a><h2>Details</h2>
-<div class="refsect2" title="nm_print_backtrace">
-<a name="nm-print-backtrace"></a><h3>nm_print_backtrace</h3>
-<pre class="programlisting">#define             nm_print_backtrace()</pre>
-<p>
-Prints a backtrace of the calling process to the logging location.
-</p>
-</div>
-<hr>
-<div class="refsect2" title="nm_get_timestamp()">
-<a name="nm-get-timestamp"></a><h3>nm_get_timestamp()</h3>
-<pre class="programlisting">#define             nm_get_timestamp(timestamp)</pre>
-<p>
-For debugging only.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td>
-<td>location in which to place the current timestamp
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_info()">
-<a name="nm-info"></a><h3>nm_info()</h3>
-<pre class="programlisting">#define             nm_info(fmt, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_info_str()">
-<a name="nm-info-str"></a><h3>nm_info_str()</h3>
-<pre class="programlisting">#define             nm_info_str(fmt_str, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt_str</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_debug()">
-<a name="nm-debug"></a><h3>nm_debug()</h3>
-<pre class="programlisting">#define             nm_debug(fmt, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_debug_str()">
-<a name="nm-debug-str"></a><h3>nm_debug_str()</h3>
-<pre class="programlisting">#define             nm_debug_str(fmt_str, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt_str</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_warning()">
-<a name="nm-warning"></a><h3>nm_warning()</h3>
-<pre class="programlisting">#define             nm_warning(fmt, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_warning_str()">
-<a name="nm-warning-str"></a><h3>nm_warning_str()</h3>
-<pre class="programlisting">#define             nm_warning_str(fmt_str, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt_str</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_error()">
-<a name="nm-error"></a><h3>nm_error()</h3>
-<pre class="programlisting">#define             nm_error(fmt, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_error_str()">
-<a name="nm-error-str"></a><h3>nm_error_str()</h3>
-<pre class="programlisting">#define             nm_error_str(fmt_str, args...)</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fmt_str</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>args...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="nm_utils_init ()">
+<div class="refsect2">
 <a name="nm-utils-init"></a><h3>nm_utils_init ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_utils_init                       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
@@ -342,14 +123,13 @@ libnm-util can also be done.  This function can be called more than once.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the initialization was successful, FALSE on failure.
-</td>
+<td>TRUE if the initialization was successful, FALSE on failure.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_deinit ()">
+<div class="refsect2">
 <a name="nm-utils-deinit"></a><h3>nm_utils_deinit ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_deinit                     (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -360,7 +140,7 @@ called again.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_is_empty_ssid ()">
+<div class="refsect2">
 <a name="nm-utils-is-empty-ssid"></a><h3>nm_utils_is_empty_ssid ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_utils_is_empty_ssid              (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *ssid</code></em>,
                                                          <em class="parameter"><code><span class="type">int</span> len</code></em>);</pre>
@@ -374,8 +154,7 @@ number of known SSID-cloaking methods.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ssid</code></em> :</span></p></td>
-<td>pointer to a buffer containing the SSID data
-</td>
+<td>pointer to a buffer containing the SSID data</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>len</code></em> :</span></p></td>
@@ -384,14 +163,13 @@ number of known SSID-cloaking methods.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the SSID is "empty", FALSE if it is not
-</td>
+<td>TRUE if the SSID is "empty", FALSE if it is not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_escape_ssid ()">
+<div class="refsect2">
 <a name="nm-utils-escape-ssid"></a><h3>nm_utils_escape_ssid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        nm_utils_escape_ssid                (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *ssid</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> len</code></em>);</pre>
@@ -406,8 +184,7 @@ be used for display of SSIDs.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ssid</code></em> :</span></p></td>
-<td>pointer to a buffer containing the SSID data
-</td>
+<td>pointer to a buffer containing the SSID data</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>len</code></em> :</span></p></td>
@@ -416,15 +193,14 @@ be used for display of SSIDs.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> pointer to the escaped SSID, which uses an internal static buffer
-and will be overwritten by subsequent calls to this function
-</td>
+<td>pointer to the escaped SSID, which uses an internal static buffer
+and will be overwritten by subsequent calls to this function</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_same_ssid ()">
+<div class="refsect2">
 <a name="nm-utils-same-ssid"></a><h3>nm_utils_same_ssid ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_utils_same_ssid                  (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *ssid1</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *ssid2</code></em>,
@@ -442,32 +218,27 @@ NULLs, even though that is functionally pointless.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ssid1</code></em> :</span></p></td>
-<td>first SSID data to compare
-</td>
+<td>first SSID data to compare</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ssid2</code></em> :</span></p></td>
-<td>second SSID data to compare
-</td>
+<td>second SSID data to compare</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ignore_trailing_null</code></em> :</span></p></td>
-<td>TRUE to ignore one trailing NULL byte
-</td>
+<td>TRUE to ignore one trailing NULL byte</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the SSIDs are the same, FALSE if they are not
-</td>
+<td>TRUE if the SSIDs are the same, FALSE if they are not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ssid_to_utf8 ()">
+<div class="refsect2">
 <a name="nm-utils-ssid-to-utf8"></a><h3>nm_utils_ssid_to_utf8 ()</h3>
-<pre class="programlisting"><span class="returnvalue">char</span> *              nm_utils_ssid_to_utf8               (<em class="parameter"><code>const <span class="type">char</span> *ssid</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> len</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">char</span> *              nm_utils_ssid_to_utf8               (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *ssid</code></em>);</pre>
 <p>
 WiFi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
 contain embedded NULLs and other unprintable characters.  Often it is
@@ -500,26 +271,20 @@ _only_.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ssid</code></em> :</span></p></td>
-<td>pointer to a buffer containing the SSID data
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>len</code></em> :</span></p></td>
-<td>length of the SSID data in <em class="parameter"><code>ssid</code></em>
-</td>
+<td>a byte array containing the SSID data</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> an allocated string containing a UTF-8 representation of the
-SSID, which must be freed by the caller using <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.  Returns NULL
-on errors.
+<td>an allocated string containing a UTF-8
+representation of the SSID, which must be freed by the caller using <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.
+Returns NULL on errors. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_gvalue_hash_dup ()">
+<div class="refsect2">
 <a name="nm-utils-gvalue-hash-dup"></a><h3>nm_utils_gvalue_hash_dup ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        nm_utils_gvalue_hash_dup            (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);</pre>
 <p>
@@ -530,20 +295,19 @@ Utility function to duplicate a hash table of GValues.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>hash</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping string:GValue
-</td>
+<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping string:GValue</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated duplicated <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a>, caller must free the
-returned hash with <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-unref"><code class="function">g_hash_table_unref()</code></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-destroy"><code class="function">g_hash_table_destroy()</code></a>
+<td>a newly allocated duplicated <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a>, caller must free the
+returned hash with <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-unref"><code class="function">g_hash_table_unref()</code></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-destroy"><code class="function">g_hash_table_destroy()</code></a>. <span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8 GObject.Value]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_slist_free ()">
+<div class="refsect2">
 <a name="nm-utils-slist-free"></a><h3>nm_utils_slist_free ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_slist_free                 (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> elem_destroy_fn</code></em>);</pre>
@@ -567,7 +331,7 @@ Utility function to free a <a href="http://library.gnome.org/devel/glib/unstable
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="enum NMUtilsSecurityType">
+<div class="refsect2">
 <a name="NMUtilsSecurityType"></a><h3>enum NMUtilsSecurityType</h3>
 <pre class="programlisting">typedef enum {
 	NMU_SEC_INVALID = 0,
@@ -585,7 +349,7 @@ Utility function to free a <a href="http://library.gnome.org/devel/glib/unstable
 </p>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_security_valid ()">
+<div class="refsect2">
 <a name="nm-utils-security-valid"></a><h3>nm_utils_security_valid ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_utils_security_valid             (<em class="parameter"><code><a class="link" href="libnm-util-nm-utils.html#NMUtilsSecurityType" title="enum NMUtilsSecurityType"><span class="type">NMUtilsSecurityType</span></a> type</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> wifi_caps</code></em>,
@@ -616,13 +380,11 @@ e.g. <span class="type">NMU_SEC_STATIC_WEP</span>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>have_ap</code></em> :</span></p></td>
-<td>whether the <em class="parameter"><code>ap_flags</code></em>, <em class="parameter"><code>ap_wpa</code></em>, and <em class="parameter"><code>ap_rsn</code></em> arguments are valid
-</td>
+<td>whether the <em class="parameter"><code>ap_flags</code></em>, <em class="parameter"><code>ap_wpa</code></em>, and <em class="parameter"><code>ap_rsn</code></em> arguments are valid</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>adhoc</code></em> :</span></p></td>
-<td>whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
-</td>
+<td>whether the capabilities being tested are from an Ad-Hoc AP (IBSS)</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ap_flags</code></em> :</span></p></td>
@@ -632,32 +394,29 @@ e.g. <span class="type">NMU_SEC_STATIC_WEP</span>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ap_wpa</code></em> :</span></p></td>
 <td>bitfield of AP capabilties derived from the AP's WPA beacon,
-e.g. (<span class="type">NM_802_11_AP_SEC_PAIR_TKIP</span> | <span class="type">NM_802_11_AP_SEC_KEY_MGMT_PSK</span>)
-</td>
+e.g. (<span class="type">NM_802_11_AP_SEC_PAIR_TKIP</span> | <span class="type">NM_802_11_AP_SEC_KEY_MGMT_PSK</span>)</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ap_rsn</code></em> :</span></p></td>
 <td>bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
-e.g. (<span class="type">NM_802_11_AP_SEC_PAIR_CCMP</span> | <span class="type">NM_802_11_AP_SEC_PAIR_TKIP</span>)
-</td>
+e.g. (<span class="type">NM_802_11_AP_SEC_PAIR_CCMP</span> | <span class="type">NM_802_11_AP_SEC_PAIR_TKIP</span>)</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if the device capabilities and AP capabilties intersect and are
-compatible with the desired <em class="parameter"><code>type</code></em>, FALSE if they are not
-</td>
+<td>TRUE if the device capabilities and AP capabilties intersect and are
+compatible with the desired <em class="parameter"><code>type</code></em>, FALSE if they are not</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_addresses_from_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-addresses-from-gvalue"></a><h3>nm_utils_ip4_addresses_from_gvalue ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            nm_utils_ip4_addresses_from_gvalue  (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
 Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> of <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArrays</span></a> of guint32s representing
 a list of NetworkManager IPv4 addresses (which is a tuple of address, gateway,
-and prefix) into a GSList of <a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> objects.  The specific format of
+and prefix) into a GSList of <a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> objects.  The specific format of
 this serialization is not guaranteed to be stable and the <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> may be
 extended in the future.
 </p>
@@ -666,24 +425,23 @@ extended in the future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>gvalue containing a GPtrArray of GArrays of guint32s
-</td>
+<td>gvalue containing a GPtrArray of GArrays of guint32s</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> objects
+<td>a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> objects. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.IP4Address]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_addresses_to_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-addresses-to-gvalue"></a><h3>nm_utils_ip4_addresses_to_gvalue ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_ip4_addresses_to_gvalue    (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
-Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> objects into a
+Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> objects into a
 GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 addresses (which is a tuple of address, gateway, and prefix).   The specific
 format of this serialization is not guaranteed to be stable and may be
@@ -694,27 +452,25 @@ extended in the future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
-<td>a list of <a class="link" href="NMSettingIP4Config.html#NMIP4Address" title="NMIP4Address"><span class="type">NMIP4Address</span></a> objects
-</td>
+<td>a list of <a class="link" href="NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a> objects</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
 <td>a pointer to a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.
-</td>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_routes_from_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-routes-from-gvalue"></a><h3>nm_utils_ip4_routes_from_gvalue ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            nm_utils_ip4_routes_from_gvalue     (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
 Utility function to convert a GPtrArray of GArrays of guint32s representing
 a list of NetworkManager IPv4 routes (which is a tuple of route, next hop,
-prefix, and metric) into a GSList of <a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> objects.  The specific
+prefix, and metric) into a GSList of <a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> objects.  The specific
 format of this serialization is not guaranteed to be stable and may be
 extended in the future.
 </p>
@@ -723,24 +479,23 @@ extended in the future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>gvalue containing a GPtrArray of GArrays of guint32s
-</td>
+<td>gvalue containing a GPtrArray of GArrays of guint32s</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> objects
+<td>a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> objects. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.IP4Route]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_routes_to_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-routes-to-gvalue"></a><h3>nm_utils_ip4_routes_to_gvalue ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_ip4_routes_to_gvalue       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
-Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> objects into a
+Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> objects into a
 GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 routes (which is a tuple of route, next hop, prefix, and metric).   The
 specific format of this serialization is not guaranteed to be stable and may
@@ -751,21 +506,19 @@ be extended in the future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
-<td>a list of <a class="link" href="NMSettingIP4Config.html#NMIP4Route" title="NMIP4Route"><span class="type">NMIP4Route</span></a> objects
-</td>
+<td>a list of <a class="link" href="NMSettingIP4Config.html#NMIP4Route"><span class="type">NMIP4Route</span></a> objects</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
 <td>a pointer to a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.
-</td>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_netmask_to_prefix ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-netmask-to-prefix"></a><h3>nm_utils_ip4_netmask_to_prefix ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_utils_ip4_netmask_to_prefix      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> netmask</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -773,19 +526,17 @@ which should be unset by the caller (when no longer needed) with
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>netmask</code></em> :</span></p></td>
-<td>an IPv4 netmask in network byte order
-</td>
+<td>an IPv4 netmask in network byte order</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the CIDR prefix represented by the netmask
-</td>
+<td>the CIDR prefix represented by the netmask</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_prefix_to_netmask ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-prefix-to-netmask"></a><h3>nm_utils_ip4_prefix_to_netmask ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_utils_ip4_prefix_to_netmask      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> prefix</code></em>);</pre>
 <div class="variablelist"><table border="0">
@@ -793,19 +544,17 @@ which should be unset by the caller (when no longer needed) with
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>prefix</code></em> :</span></p></td>
-<td>a CIDR prefix
-</td>
+<td>a CIDR prefix</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the netmask represented by the prefix
-</td>
+<td>the netmask represented by the prefix</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip4_get_default_prefix ()">
+<div class="refsect2">
 <a name="nm-utils-ip4-get-default-prefix"></a><h3>nm_utils_ip4_get_default_prefix ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_utils_ip4_get_default_prefix     (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> ip</code></em>);</pre>
 <p>
@@ -819,25 +568,23 @@ falls in the predefined classes.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ip</code></em> :</span></p></td>
-<td>an IPv4 address (in network byte order)
-</td>
+<td>an IPv4 address (in network byte order)</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the default class prefix for the given IP
-</td>
+<td>the default class prefix for the given IP</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip6_addresses_from_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip6-addresses-from-gvalue"></a><h3>nm_utils_ip6_addresses_from_gvalue ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            nm_utils_ip6_addresses_from_gvalue  (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
 Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> of <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Value-arrays.html#GValueArray"><span class="type">GValueArrays</span></a> of (<a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> of guchars) and guint32
 representing a list of NetworkManager IPv6 addresses (which is a tuple of address,
-prefix, and gateway), into a GSList of <a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> objects.  The specific format of
+prefix, and gateway), into a GSList of <a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> objects.  The specific format of
 this serialization is not guaranteed to be stable and the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Value-arrays.html#GValueArray"><span class="type">GValueArray</span></a> may be
 extended in the future.
 </p>
@@ -846,24 +593,23 @@ extended in the future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
-</td>
+<td>gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> objects
+<td>a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> objects. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.IP6Address]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip6_addresses_to_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip6-addresses-to-gvalue"></a><h3>nm_utils_ip6_addresses_to_gvalue ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_ip6_addresses_to_gvalue    (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
-Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> objects into a
+Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> objects into a
 GPtrArray of GValueArrays representing a list of NetworkManager IPv6 addresses
 (which is a tuple of address, prefix, and gateway). The specific format of
 this serialization is not guaranteed to be stable and may be extended in the
@@ -874,28 +620,26 @@ future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
-<td>a list of <a class="link" href="NMSettingIP6Config.html#NMIP6Address" title="NMIP6Address"><span class="type">NMIP6Address</span></a> objects
-</td>
+<td>a list of <a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="type">NMIP6Address</span></a> objects</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
 <td>a pointer to a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.
-</td>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip6_routes_from_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip6-routes-from-gvalue"></a><h3>nm_utils_ip6_routes_from_gvalue ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            nm_utils_ip6_routes_from_gvalue     (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
 Utility function GPtrArray of GValueArrays of (GArray or guchars), guint32,
 (GArray of guchars), and guint32 representing a list of NetworkManager IPv6
 routes (which is a tuple of destination, prefix, next hop, and metric)
-into a GSList of <a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> objects.  The specific format of this serialization
+into a GSList of <a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> objects.  The specific format of this serialization
 is not guaranteed to be stable and may be extended in the future.
 </p>
 <div class="variablelist"><table border="0">
@@ -904,24 +648,23 @@ is not guaranteed to be stable and may be extended in the future.
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
 <td>gvalue containing a GPtrArray of GValueArrays of (GArray or guchars), guint32,
-(GArray of guchars), and guint32
-</td>
+(GArray of guchars), and guint32</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> objects
+<td>a newly allocated <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> objects. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NetworkManager.IP6Route]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip6_routes_to_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip6-routes-to-gvalue"></a><h3>nm_utils_ip6_routes_to_gvalue ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_ip6_routes_to_gvalue       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
-Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> objects into a GPtrArray of
+Utility function to convert a <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of <a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> objects into a GPtrArray of
 GValueArrays of (GArray or guchars), guint32, (GArray of guchars), and guint32
 representing a list of NetworkManager IPv6 routes (which is a tuple of destination,
 prefix, next hop, and metric).  The specific format of this serialization is not 
@@ -932,80 +675,48 @@ guaranteed to be stable and may be extended in the future.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
-<td>a list of <a class="link" href="NMSettingIP6Config.html#NMIP6Route" title="NMIP6Route"><span class="type">NMIP6Route</span></a> objects
-</td>
+<td>a list of <a class="link" href="NMSettingIP6Config.html#NMIP6Route"><span class="type">NMIP6Route</span></a> objects</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
 <td>a pointer to a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.
-</td>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a>.</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip6_dns_from_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip6-dns-from-gvalue"></a><h3>nm_utils_ip6_dns_from_gvalue ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            nm_utils_ip6_dns_from_gvalue        (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_ip6_dns_to_gvalue ()">
+<div class="refsect2">
 <a name="nm-utils-ip6-dns-to-gvalue"></a><h3>nm_utils_ip6_dns_to_gvalue ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_utils_ip6_dns_to_gvalue          (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_uuid_generate ()">
+<div class="refsect2">
 <a name="nm-utils-uuid-generate"></a><h3>nm_utils_uuid_generate ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *              nm_utils_uuid_generate              (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated UUID suitable for use as the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+<td>a newly allocated UUID suitable for use as the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
 object's <a class="link" href="NMSettingConnection.html#NMSettingConnection--id" title='The "id" property'><span class="type">"id"</span></a>: property.  Should be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>
 </td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_uuid_generate_from_string ()">
+<div class="refsect2">
 <a name="nm-utils-uuid-generate-from-string"></a><h3>nm_utils_uuid_generate_from_string ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *              nm_utils_uuid_generate_from_string  (<em class="parameter"><code>const <span class="type">char</span> *s</code></em>);</pre>
 <p>
@@ -1016,20 +727,18 @@ For a given <em class="parameter"><code>s</code></em>, this function will always
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>s</code></em> :</span></p></td>
-<td>a string to use as the seed for the UUID
-</td>
+<td>a string to use as the seed for the UUID</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated UUID suitable for use as the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
-object's <a class="link" href="NMSettingConnection.html#NMSettingConnection--id" title='The "id" property'><span class="type">"id"</span></a>: property
-</td>
+<td>a newly allocated UUID suitable for use as the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+object's <a class="link" href="NMSettingConnection.html#NMSettingConnection--id" title='The "id" property'><span class="type">"id"</span></a>: property</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_rsa_key_encrypt ()">
+<div class="refsect2">
 <a name="nm-utils-rsa-key-encrypt"></a><h3>nm_utils_rsa_key_encrypt ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *        nm_utils_rsa_key_encrypt            (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *data</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *in_password</code></em>,
@@ -1045,36 +754,34 @@ suitable for writing to a file.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
-<td>RSA private key data to be encrypted
-</td>
+<td>RSA private key data to be encrypted</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>in_password</code></em> :</span></p></td>
-<td>existing password to use, if any
+<td>existing password to use, if any. <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><p><span class="term"><em class="parameter"><code>out_password</code></em> :</span></p></td>
 <td>if <em class="parameter"><code>in_password</code></em> was NULL, a random password will be generated
- and returned in this argument
+and returned in this argument. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>detailed error information on return, if an error occurred
-</td>
+<td>detailed error information on return, if an error occurred</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> on success, PEM-formatted data suitable for writing to a PEM-formatted
-certificate/private key file.
+<td>on success, PEM-formatted data suitable for writing to a PEM-formatted
+certificate/private key file. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_wifi_freq_to_channel ()">
+<div class="refsect2">
 <a name="nm-utils-wifi-freq-to-channel"></a><h3>nm_utils_wifi_freq_to_channel ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_utils_wifi_freq_to_channel       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> freq</code></em>);</pre>
 <p>
@@ -1085,19 +792,17 @@ Utility function to translate a WiFi frequency to its corresponding channel.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>freq</code></em> :</span></p></td>
-<td>frequency
-</td>
+<td>frequency</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the channel represented by the frequency or 0
-</td>
+<td>the channel represented by the frequency or 0</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_wifi_channel_to_freq ()">
+<div class="refsect2">
 <a name="nm-utils-wifi-channel-to-freq"></a><h3>nm_utils_wifi_channel_to_freq ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_utils_wifi_channel_to_freq       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> channel</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *band</code></em>);</pre>
@@ -1109,26 +814,23 @@ Utility function to translate a WiFi channel to its corresponding frequency.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>channel</code></em> :</span></p></td>
-<td>channel
-</td>
+<td>channel</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>band</code></em> :</span></p></td>
-<td>frequency band for wireless ("a" or "bg")
-</td>
+<td>frequency band for wireless ("a" or "bg")</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the frequency represented by the channel of the band,
-         or -1 when the freq is invalid, or 0 when the band
-         is invalid
-</td>
+<td>the frequency represented by the channel of the band,
+or -1 when the freq is invalid, or 0 when the band
+is invalid</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_wifi_find_next_channel ()">
+<div class="refsect2">
 <a name="nm-utils-wifi-find-next-channel"></a><h3>nm_utils_wifi_find_next_channel ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             nm_utils_wifi_find_next_channel     (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> channel</code></em>,
                                                          <em class="parameter"><code><span class="type">int</span> direction</code></em>,
@@ -1141,29 +843,25 @@ Utility function to find out next/previous WiFi channel for a channel.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>channel</code></em> :</span></p></td>
-<td>current channel
-</td>
+<td>current channel</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>direction</code></em> :</span></p></td>
-<td>whether going downward (0 or less) or upward (1 or more)
-</td>
+<td>whether going downward (0 or less) or upward (1 or more)</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>band</code></em> :</span></p></td>
-<td>frequency band for wireless ("a" or "bg")
-</td>
+<td>frequency band for wireless ("a" or "bg")</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the next channel in the specified direction or 0
-</td>
+<td>the next channel in the specified direction or 0</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="nm_utils_wifi_is_channel_valid ()">
+<div class="refsect2">
 <a name="nm-utils-wifi-is-channel-valid"></a><h3>nm_utils_wifi_is_channel_valid ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_utils_wifi_is_channel_valid      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> channel</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *band</code></em>);</pre>
@@ -1175,18 +873,15 @@ Utility function to verify WiFi channel validity.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>channel</code></em> :</span></p></td>
-<td>channel
-</td>
+<td>channel</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>band</code></em> :</span></p></td>
-<td>frequency band for wireless ("a" or "bg")
-</td>
+<td>frequency band for wireless ("a" or "bg")</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE or FALSE
-</td>
+<td>TRUE or FALSE</td>
 </tr>
 </tbody>
 </table></div>
@@ -1195,6 +890,6 @@ Utility function to verify WiFi channel validity.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util.devhelp b/docs/libnm-util/html/libnm-util.devhelp
index 91d080b9..3fa339f1 100644
--- a/docs/libnm-util/html/libnm-util.devhelp
+++ b/docs/libnm-util/html/libnm-util.devhelp
@@ -3,7 +3,6 @@
 <book xmlns="http://www.devhelp.net/book" title="libnm-util Reference Manual" link="index.html" author="" name="libnm-util">
   <chapters>
     <sub name="libnm-util API Reference" link="ch01.html">
-      <sub name="NMConnection" link="NMConnection.html"/>
       <sub name="NMSetting" link="NMSetting.html"/>
       <sub name="NMSettingConnection" link="NMSettingConnection.html"/>
       <sub name="NMSettingWired" link="NMSettingWired.html"/>
@@ -27,43 +26,6 @@
     <sub name="Annotation Glossary" link="annotation-glossary.html"/>
   </chapters>
   <functions>
-    <function name="enum NMConnectionScope" link="NMConnection.html#NMConnectionScope"/>
-    <function name="enum NMConnectionError" link="NMConnection.html#NMConnectionError"/>
-    <function name="NM_TYPE_CONNECTION_ERROR" link="NMConnection.html#NM-TYPE-CONNECTION-ERROR:CAPS"/>
-    <function name="NM_CONNECTION_ERROR" link="NMConnection.html#NM-CONNECTION-ERROR:CAPS"/>
-    <function name="nm_connection_error_quark ()" link="NMConnection.html#nm-connection-error-quark"/>
-    <function name="NM_CONNECTION_SCOPE" link="NMConnection.html#NM-CONNECTION-SCOPE:CAPS"/>
-    <function name="NM_CONNECTION_PATH" link="NMConnection.html#NM-CONNECTION-PATH:CAPS"/>
-    <function name="NMConnection" link="NMConnection.html#NMConnection-struct"/>
-    <function name="NMConnectionClass" link="NMConnection.html#NMConnectionClass"/>
-    <function name="nm_connection_get_type ()" link="NMConnection.html#nm-connection-get-type"/>
-    <function name="nm_connection_new ()" link="NMConnection.html#nm-connection-new"/>
-    <function name="nm_connection_new_from_hash ()" link="NMConnection.html#nm-connection-new-from-hash"/>
-    <function name="nm_connection_duplicate ()" link="NMConnection.html#nm-connection-duplicate"/>
-    <function name="nm_connection_add_setting ()" link="NMConnection.html#nm-connection-add-setting"/>
-    <function name="nm_connection_remove_setting ()" link="NMConnection.html#nm-connection-remove-setting"/>
-    <function name="nm_connection_get_setting ()" link="NMConnection.html#nm-connection-get-setting"/>
-    <function name="nm_connection_get_setting_by_name ()" link="NMConnection.html#nm-connection-get-setting-by-name"/>
-    <function name="nm_connection_replace_settings ()" link="NMConnection.html#nm-connection-replace-settings"/>
-    <function name="nm_connection_compare ()" link="NMConnection.html#nm-connection-compare"/>
-    <function name="nm_connection_diff ()" link="NMConnection.html#nm-connection-diff"/>
-    <function name="nm_connection_verify ()" link="NMConnection.html#nm-connection-verify"/>
-    <function name="nm_connection_need_secrets ()" link="NMConnection.html#nm-connection-need-secrets"/>
-    <function name="nm_connection_clear_secrets ()" link="NMConnection.html#nm-connection-clear-secrets"/>
-    <function name="nm_connection_update_secrets ()" link="NMConnection.html#nm-connection-update-secrets"/>
-    <function name="nm_connection_set_scope ()" link="NMConnection.html#nm-connection-set-scope"/>
-    <function name="nm_connection_get_scope ()" link="NMConnection.html#nm-connection-get-scope"/>
-    <function name="nm_connection_set_path ()" link="NMConnection.html#nm-connection-set-path"/>
-    <function name="nm_connection_get_path ()" link="NMConnection.html#nm-connection-get-path"/>
-    <function name="nm_connection_for_each_setting_value ()" link="NMConnection.html#nm-connection-for-each-setting-value"/>
-    <function name="nm_connection_to_hash ()" link="NMConnection.html#nm-connection-to-hash"/>
-    <function name="nm_connection_dump ()" link="NMConnection.html#nm-connection-dump"/>
-    <function name="nm_connection_create_setting ()" link="NMConnection.html#nm-connection-create-setting"/>
-    <function name="nm_connection_lookup_setting_type ()" link="NMConnection.html#nm-connection-lookup-setting-type"/>
-    <function name="nm_connection_lookup_setting_type_by_quark ()" link="NMConnection.html#nm-connection-lookup-setting-type-by-quark"/>
-    <function name="The &quot;path&quot; property" link="NMConnection.html#NMConnection--path"/>
-    <function name="The &quot;scope&quot; property" link="NMConnection.html#NMConnection--scope"/>
-    <function name="The &quot;secrets-updated&quot; signal" link="NMConnection.html#NMConnection-secrets-updated"/>
     <function name="enum NMSettingError" link="NMSetting.html#NMSettingError"/>
     <function name="NM_TYPE_SETTING_ERROR" link="NMSetting.html#NM-TYPE-SETTING-ERROR:CAPS"/>
     <function name="NM_SETTING_ERROR" link="NMSetting.html#NM-SETTING-ERROR:CAPS"/>
@@ -73,10 +35,12 @@
     <function name="NM_SETTING_PARAM_SECRET" link="NMSetting.html#NM-SETTING-PARAM-SECRET:CAPS"/>
     <function name="NM_SETTING_PARAM_FUZZY_IGNORE" link="NMSetting.html#NM-SETTING-PARAM-FUZZY-IGNORE:CAPS"/>
     <function name="NM_SETTING_NAME" link="NMSetting.html#NM-SETTING-NAME:CAPS"/>
+    <function name="enum NMSettingSecretFlags" link="NMSetting.html#NMSettingSecretFlags"/>
     <function name="NMSetting" link="NMSetting.html#NMSetting-struct"/>
     <function name="NMSettingClass" link="NMSetting.html#NMSettingClass"/>
     <function name="NMSettingValueIterFn ()" link="NMSetting.html#NMSettingValueIterFn"/>
     <function name="nm_setting_get_type ()" link="NMSetting.html#nm-setting-get-type"/>
+    <function name="enum NMSettingHashFlags" link="NMSetting.html#NMSettingHashFlags"/>
     <function name="nm_setting_to_hash ()" link="NMSetting.html#nm-setting-to-hash"/>
     <function name="nm_setting_new_from_hash ()" link="NMSetting.html#nm-setting-new-from-hash"/>
     <function name="nm_setting_duplicate ()" link="NMSetting.html#nm-setting-duplicate"/>
@@ -91,6 +55,8 @@
     <function name="nm_setting_clear_secrets ()" link="NMSetting.html#nm-setting-clear-secrets"/>
     <function name="nm_setting_need_secrets ()" link="NMSetting.html#nm-setting-need-secrets"/>
     <function name="nm_setting_update_secrets ()" link="NMSetting.html#nm-setting-update-secrets"/>
+    <function name="nm_setting_get_secret_flags ()" link="NMSetting.html#nm-setting-get-secret-flags"/>
+    <function name="nm_setting_set_secret_flags ()" link="NMSetting.html#nm-setting-set-secret-flags"/>
     <function name="The &quot;name&quot; property" link="NMSetting.html#NMSetting--name"/>
     <function name="NM_SETTING_CONNECTION_SETTING_NAME" link="NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS"/>
     <function name="enum NMSettingConnectionError" link="NMSettingConnection.html#NMSettingConnectionError"/>
@@ -103,6 +69,7 @@
     <function name="NM_SETTING_CONNECTION_AUTOCONNECT" link="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT:CAPS"/>
     <function name="NM_SETTING_CONNECTION_TIMESTAMP" link="NMSettingConnection.html#NM-SETTING-CONNECTION-TIMESTAMP:CAPS"/>
     <function name="NM_SETTING_CONNECTION_READ_ONLY" link="NMSettingConnection.html#NM-SETTING-CONNECTION-READ-ONLY:CAPS"/>
+    <function name="NM_SETTING_CONNECTION_PERMISSIONS" link="NMSettingConnection.html#NM-SETTING-CONNECTION-PERMISSIONS:CAPS"/>
     <function name="NMSettingConnection" link="NMSettingConnection.html#NMSettingConnection-struct"/>
     <function name="NMSettingConnectionClass" link="NMSettingConnection.html#NMSettingConnectionClass"/>
     <function name="nm_setting_connection_get_type ()" link="NMSettingConnection.html#nm-setting-connection-get-type"/>
@@ -113,8 +80,14 @@
     <function name="nm_setting_connection_get_autoconnect ()" link="NMSettingConnection.html#nm-setting-connection-get-autoconnect"/>
     <function name="nm_setting_connection_get_timestamp ()" link="NMSettingConnection.html#nm-setting-connection-get-timestamp"/>
     <function name="nm_setting_connection_get_read_only ()" link="NMSettingConnection.html#nm-setting-connection-get-read-only"/>
+    <function name="nm_setting_connection_get_num_permissions ()" link="NMSettingConnection.html#nm-setting-connection-get-num-permissions"/>
+    <function name="nm_setting_connection_get_permission ()" link="NMSettingConnection.html#nm-setting-connection-get-permission"/>
+    <function name="nm_setting_connection_permissions_user_allowed ()" link="NMSettingConnection.html#nm-setting-connection-permissions-user-allowed"/>
+    <function name="nm_setting_connection_add_permission ()" link="NMSettingConnection.html#nm-setting-connection-add-permission"/>
+    <function name="nm_setting_connection_remove_permission ()" link="NMSettingConnection.html#nm-setting-connection-remove-permission"/>
     <function name="The &quot;autoconnect&quot; property" link="NMSettingConnection.html#NMSettingConnection--autoconnect"/>
     <function name="The &quot;id&quot; property" link="NMSettingConnection.html#NMSettingConnection--id"/>
+    <function name="The &quot;permissions&quot; property" link="NMSettingConnection.html#NMSettingConnection--permissions"/>
     <function name="The &quot;read-only&quot; property" link="NMSettingConnection.html#NMSettingConnection--read-only"/>
     <function name="The &quot;timestamp&quot; property" link="NMSettingConnection.html#NMSettingConnection--timestamp"/>
     <function name="The &quot;type&quot; property" link="NMSettingConnection.html#NMSettingConnection--type"/>
@@ -179,6 +152,8 @@
     <function name="NM_SETTING_WIRELESS_MTU" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS"/>
     <function name="NM_SETTING_WIRELESS_SEEN_BSSIDS" link="NMSettingWireless.html#NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS"/>
     <function name="NM_SETTING_WIRELESS_SEC" link="NMSettingWireless.html#NM-SETTING-WIRELESS-SEC:CAPS"/>
+    <function name="NM_SETTING_WIRELESS_MODE_ADHOC" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS"/>
+    <function name="NM_SETTING_WIRELESS_MODE_INFRA" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS"/>
     <function name="NMSettingWireless" link="NMSettingWireless.html#NMSettingWireless-struct"/>
     <function name="NMSettingWirelessClass" link="NMSettingWireless.html#NMSettingWirelessClass"/>
     <function name="nm_setting_wireless_get_type ()" link="NMSettingWireless.html#nm-setting-wireless-get-type"/>
@@ -227,9 +202,12 @@
     <function name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY1" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS"/>
     <function name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY2" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS"/>
     <function name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY3" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS"/>
+    <function name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS"/>
+    <function name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"/>
     <function name="NM_SETTING_WIRELESS_SECURITY_PSK" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS"/>
+    <function name="NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS"/>
     <function name="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS"/>
-    <function name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"/>
+    <function name="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS"/>
     <function name="NMSettingWirelessSecurity" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct"/>
     <function name="NMSettingWirelessSecurityClass" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityClass"/>
     <function name="nm_setting_wireless_security_get_type ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-type"/>
@@ -251,21 +229,27 @@
     <function name="nm_setting_wireless_security_remove_group ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-remove-group"/>
     <function name="nm_setting_wireless_security_clear_groups ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-clear-groups"/>
     <function name="nm_setting_wireless_security_get_psk ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk"/>
+    <function name="nm_setting_wireless_security_get_psk_flags ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk-flags"/>
     <function name="nm_setting_wireless_security_get_leap_username ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-username"/>
     <function name="nm_setting_wireless_security_get_leap_password ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password"/>
+    <function name="nm_setting_wireless_security_get_leap_password_flags ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password-flags"/>
     <function name="nm_setting_wireless_security_get_wep_key ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key"/>
     <function name="nm_setting_wireless_security_set_wep_key ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-set-wep-key"/>
     <function name="nm_setting_wireless_security_get_wep_tx_keyidx ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-tx-keyidx"/>
     <function name="nm_setting_wireless_security_get_auth_alg ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-auth-alg"/>
+    <function name="nm_setting_wireless_security_get_wep_key_flags ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-flags"/>
     <function name="nm_setting_wireless_security_get_wep_key_type ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-type"/>
     <function name="The &quot;auth-alg&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg"/>
     <function name="The &quot;group&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--group"/>
     <function name="The &quot;key-mgmt&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt"/>
     <function name="The &quot;leap-password&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password"/>
+    <function name="The &quot;leap-password-flags&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password-flags"/>
     <function name="The &quot;leap-username&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username"/>
     <function name="The &quot;pairwise&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--pairwise"/>
     <function name="The &quot;proto&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--proto"/>
     <function name="The &quot;psk&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk"/>
+    <function name="The &quot;psk-flags&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk-flags"/>
+    <function name="The &quot;wep-key-flags&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-flags"/>
     <function name="The &quot;wep-key-type&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type"/>
     <function name="The &quot;wep-key0&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key0"/>
     <function name="The &quot;wep-key1&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key1"/>
@@ -321,6 +305,7 @@
     <function name="NM_SETTING_CDMA_NUMBER" link="NMSettingCdma.html#NM-SETTING-CDMA-NUMBER:CAPS"/>
     <function name="NM_SETTING_CDMA_USERNAME" link="NMSettingCdma.html#NM-SETTING-CDMA-USERNAME:CAPS"/>
     <function name="NM_SETTING_CDMA_PASSWORD" link="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD:CAPS"/>
+    <function name="NM_SETTING_CDMA_PASSWORD_FLAGS" link="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS"/>
     <function name="NMSettingCdma" link="NMSettingCdma.html#NMSettingCdma-struct"/>
     <function name="NMSettingCdmaClass" link="NMSettingCdma.html#NMSettingCdmaClass"/>
     <function name="nm_setting_cdma_get_type ()" link="NMSettingCdma.html#nm-setting-cdma-get-type"/>
@@ -328,8 +313,10 @@
     <function name="nm_setting_cdma_get_number ()" link="NMSettingCdma.html#nm-setting-cdma-get-number"/>
     <function name="nm_setting_cdma_get_username ()" link="NMSettingCdma.html#nm-setting-cdma-get-username"/>
     <function name="nm_setting_cdma_get_password ()" link="NMSettingCdma.html#nm-setting-cdma-get-password"/>
+    <function name="nm_setting_cdma_get_password_flags ()" link="NMSettingCdma.html#nm-setting-cdma-get-password-flags"/>
     <function name="The &quot;number&quot; property" link="NMSettingCdma.html#NMSettingCdma--number"/>
     <function name="The &quot;password&quot; property" link="NMSettingCdma.html#NMSettingCdma--password"/>
+    <function name="The &quot;password-flags&quot; property" link="NMSettingCdma.html#NMSettingCdma--password-flags"/>
     <function name="The &quot;username&quot; property" link="NMSettingCdma.html#NMSettingCdma--username"/>
     <function name="NM_SETTING_GSM_SETTING_NAME" link="NMSettingGsm.html#NM-SETTING-GSM-SETTING-NAME:CAPS"/>
     <function name="enum NMSettingGsmError" link="NMSettingGsm.html#NMSettingGsmError"/>
@@ -339,19 +326,14 @@
     <function name="NM_SETTING_GSM_NUMBER" link="NMSettingGsm.html#NM-SETTING-GSM-NUMBER:CAPS"/>
     <function name="NM_SETTING_GSM_USERNAME" link="NMSettingGsm.html#NM-SETTING-GSM-USERNAME:CAPS"/>
     <function name="NM_SETTING_GSM_PASSWORD" link="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD:CAPS"/>
+    <function name="NM_SETTING_GSM_PASSWORD_FLAGS" link="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD-FLAGS:CAPS"/>
     <function name="NM_SETTING_GSM_APN" link="NMSettingGsm.html#NM-SETTING-GSM-APN:CAPS"/>
     <function name="NM_SETTING_GSM_NETWORK_ID" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-ID:CAPS"/>
     <function name="NM_SETTING_GSM_NETWORK_TYPE" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE:CAPS"/>
     <function name="NM_SETTING_GSM_ALLOWED_BANDS" link="NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS"/>
     <function name="NM_SETTING_GSM_PIN" link="NMSettingGsm.html#NM-SETTING-GSM-PIN:CAPS"/>
+    <function name="NM_SETTING_GSM_PIN_FLAGS" link="NMSettingGsm.html#NM-SETTING-GSM-PIN-FLAGS:CAPS"/>
     <function name="NM_SETTING_GSM_HOME_ONLY" link="NMSettingGsm.html#NM-SETTING-GSM-HOME-ONLY:CAPS"/>
-    <function name="NM_SETTING_GSM_PUK" link="NMSettingGsm.html#NM-SETTING-GSM-PUK:CAPS"/>
-    <function name="NM_SETTING_GSM_BAND" link="NMSettingGsm.html#NM-SETTING-GSM-BAND:CAPS"/>
-    <function name="NM_GSM_NETWORK_ANY" link="NMSettingGsm.html#NM-GSM-NETWORK-ANY:CAPS"/>
-    <function name="NM_GSM_NETWORK_UMTS_HSPA" link="NMSettingGsm.html#NM-GSM-NETWORK-UMTS-HSPA:CAPS"/>
-    <function name="NM_GSM_NETWORK_GPRS_EDGE" link="NMSettingGsm.html#NM-GSM-NETWORK-GPRS-EDGE:CAPS"/>
-    <function name="NM_GSM_NETWORK_PREFER_UMTS_HSPA" link="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS"/>
-    <function name="NM_GSM_NETWORK_PREFER_GPRS_EDGE" link="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS"/>
     <function name="enum NMSettingGsmNetworkType" link="NMSettingGsm.html#NMSettingGsmNetworkType"/>
     <function name="enum NMSettingGsmNetworkBand" link="NMSettingGsm.html#NMSettingGsmNetworkBand"/>
     <function name="NMSettingGsm" link="NMSettingGsm.html#NMSettingGsm-struct"/>
@@ -367,18 +349,18 @@
     <function name="nm_setting_gsm_get_allowed_bands ()" link="NMSettingGsm.html#nm-setting-gsm-get-allowed-bands"/>
     <function name="nm_setting_gsm_get_pin ()" link="NMSettingGsm.html#nm-setting-gsm-get-pin"/>
     <function name="nm_setting_gsm_get_home_only ()" link="NMSettingGsm.html#nm-setting-gsm-get-home-only"/>
-    <function name="nm_setting_gsm_get_puk ()" link="NMSettingGsm.html#nm-setting-gsm-get-puk"/>
-    <function name="nm_setting_gsm_get_band ()" link="NMSettingGsm.html#nm-setting-gsm-get-band"/>
+    <function name="nm_setting_gsm_get_pin_flags ()" link="NMSettingGsm.html#nm-setting-gsm-get-pin-flags"/>
+    <function name="nm_setting_gsm_get_password_flags ()" link="NMSettingGsm.html#nm-setting-gsm-get-password-flags"/>
     <function name="The &quot;allowed-bands&quot; property" link="NMSettingGsm.html#NMSettingGsm--allowed-bands"/>
     <function name="The &quot;apn&quot; property" link="NMSettingGsm.html#NMSettingGsm--apn"/>
-    <function name="The &quot;band&quot; property" link="NMSettingGsm.html#NMSettingGsm--band"/>
     <function name="The &quot;home-only&quot; property" link="NMSettingGsm.html#NMSettingGsm--home-only"/>
     <function name="The &quot;network-id&quot; property" link="NMSettingGsm.html#NMSettingGsm--network-id"/>
     <function name="The &quot;network-type&quot; property" link="NMSettingGsm.html#NMSettingGsm--network-type"/>
     <function name="The &quot;number&quot; property" link="NMSettingGsm.html#NMSettingGsm--number"/>
     <function name="The &quot;password&quot; property" link="NMSettingGsm.html#NMSettingGsm--password"/>
+    <function name="The &quot;password-flags&quot; property" link="NMSettingGsm.html#NMSettingGsm--password-flags"/>
     <function name="The &quot;pin&quot; property" link="NMSettingGsm.html#NMSettingGsm--pin"/>
-    <function name="The &quot;puk&quot; property" link="NMSettingGsm.html#NMSettingGsm--puk"/>
+    <function name="The &quot;pin-flags&quot; property" link="NMSettingGsm.html#NMSettingGsm--pin-flags"/>
     <function name="The &quot;username&quot; property" link="NMSettingGsm.html#NMSettingGsm--username"/>
     <function name="NM_SETTING_OLPC_MESH_SETTING_NAME" link="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS"/>
     <function name="enum NMSettingOlpcMeshError" link="NMSettingOlpcMesh.html#NMSettingOlpcMeshError"/>
@@ -420,12 +402,15 @@
     <function name="NM_SETTING_802_1X_PHASE2_CA_PATH" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS"/>
     <function name="NM_SETTING_802_1X_PHASE2_CLIENT_CERT" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS"/>
     <function name="NM_SETTING_802_1X_PASSWORD" link="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD:CAPS"/>
+    <function name="NM_SETTING_802_1X_PASSWORD_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS"/>
     <function name="NM_SETTING_802_1X_PRIVATE_KEY" link="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY:CAPS"/>
     <function name="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD" link="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS"/>
+    <function name="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"/>
     <function name="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS"/>
     <function name="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS"/>
+    <function name="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"/>
     <function name="NM_SETTING_802_1X_PIN" link="NMSetting8021x.html#NM-SETTING-802-1X-PIN:CAPS"/>
-    <function name="NM_SETTING_802_1X_PSK" link="NMSetting8021x.html#NM-SETTING-802-1X-PSK:CAPS"/>
+    <function name="NM_SETTING_802_1X_PIN_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PIN-FLAGS:CAPS"/>
     <function name="NM_SETTING_802_1X_SYSTEM_CA_CERTS" link="NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS"/>
     <function name="NMSetting8021x" link="NMSetting8021x.html#NMSetting8021x-struct"/>
     <function name="NMSetting8021xClass" link="NMSetting8021x.html#NMSetting8021xClass"/>
@@ -463,35 +448,23 @@
     <function name="nm_setting_802_1x_get_phase2_client_cert_path ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-path"/>
     <function name="nm_setting_802_1x_set_phase2_client_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert"/>
     <function name="nm_setting_802_1x_get_password ()" link="NMSetting8021x.html#nm-setting-802-1x-get-password"/>
+    <function name="nm_setting_802_1x_get_password_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-password-flags"/>
     <function name="nm_setting_802_1x_get_pin ()" link="NMSetting8021x.html#nm-setting-802-1x-get-pin"/>
-    <function name="nm_setting_802_1x_get_psk ()" link="NMSetting8021x.html#nm-setting-802-1x-get-psk"/>
+    <function name="nm_setting_802_1x_get_pin_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-pin-flags"/>
     <function name="nm_setting_802_1x_get_private_key_scheme ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-scheme"/>
     <function name="nm_setting_802_1x_get_private_key_blob ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob"/>
     <function name="nm_setting_802_1x_get_private_key_path ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path"/>
     <function name="nm_setting_802_1x_set_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-set-private-key"/>
     <function name="nm_setting_802_1x_get_private_key_password ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password"/>
+    <function name="nm_setting_802_1x_get_private_key_password_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password-flags"/>
     <function name="nm_setting_802_1x_get_private_key_format ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-format"/>
     <function name="nm_setting_802_1x_get_phase2_private_key_scheme ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-scheme"/>
     <function name="nm_setting_802_1x_get_phase2_private_key_blob ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob"/>
     <function name="nm_setting_802_1x_get_phase2_private_key_path ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path"/>
     <function name="nm_setting_802_1x_set_phase2_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key"/>
     <function name="nm_setting_802_1x_get_phase2_private_key_password ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password"/>
+    <function name="nm_setting_802_1x_get_phase2_private_key_password_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password-flags"/>
     <function name="nm_setting_802_1x_get_phase2_private_key_format ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format"/>
-    <function name="enum NMSetting8021xCKType" link="NMSetting8021x.html#NMSetting8021xCKType"/>
-    <function name="nm_setting_802_1x_get_ca_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert"/>
-    <function name="nm_setting_802_1x_set_ca_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert-from-file"/>
-    <function name="nm_setting_802_1x_get_client_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-client-cert"/>
-    <function name="nm_setting_802_1x_set_client_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-client-cert-from-file"/>
-    <function name="nm_setting_802_1x_get_phase2_ca_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert"/>
-    <function name="nm_setting_802_1x_set_phase2_ca_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert-from-file"/>
-    <function name="nm_setting_802_1x_get_phase2_client_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert"/>
-    <function name="nm_setting_802_1x_set_phase2_client_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert-from-file"/>
-    <function name="nm_setting_802_1x_get_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key"/>
-    <function name="nm_setting_802_1x_set_private_key_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file"/>
-    <function name="nm_setting_802_1x_get_private_key_type ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-type"/>
-    <function name="nm_setting_802_1x_get_phase2_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key"/>
-    <function name="nm_setting_802_1x_set_phase2_private_key_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file"/>
-    <function name="nm_setting_802_1x_get_phase2_private_key_type ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-type"/>
     <function name="The &quot;anonymous-identity&quot; property" link="NMSetting8021x.html#NMSetting8021x--anonymous-identity"/>
     <function name="The &quot;ca-cert&quot; property" link="NMSetting8021x.html#NMSetting8021x--ca-cert"/>
     <function name="The &quot;ca-path&quot; property" link="NMSetting8021x.html#NMSetting8021x--ca-path"/>
@@ -499,6 +472,7 @@
     <function name="The &quot;eap&quot; property" link="NMSetting8021x.html#NMSetting8021x--eap"/>
     <function name="The &quot;identity&quot; property" link="NMSetting8021x.html#NMSetting8021x--identity"/>
     <function name="The &quot;password&quot; property" link="NMSetting8021x.html#NMSetting8021x--password"/>
+    <function name="The &quot;password-flags&quot; property" link="NMSetting8021x.html#NMSetting8021x--password-flags"/>
     <function name="The &quot;phase1-fast-provisioning&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning"/>
     <function name="The &quot;phase1-peaplabel&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel"/>
     <function name="The &quot;phase1-peapver&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase1-peapver"/>
@@ -509,8 +483,10 @@
     <function name="The &quot;phase2-client-cert&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-client-cert"/>
     <function name="The &quot;phase2-private-key&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-private-key"/>
     <function name="The &quot;phase2-private-key-password&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password"/>
+    <function name="The &quot;phase2-private-key-password-flags&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password-flags"/>
     <function name="The &quot;private-key&quot; property" link="NMSetting8021x.html#NMSetting8021x--private-key"/>
     <function name="The &quot;private-key-password&quot; property" link="NMSetting8021x.html#NMSetting8021x--private-key-password"/>
+    <function name="The &quot;private-key-password-flags&quot; property" link="NMSetting8021x.html#NMSetting8021x--private-key-password-flags"/>
     <function name="The &quot;system-ca-certs&quot; property" link="NMSetting8021x.html#NMSetting8021x--system-ca-certs"/>
     <function name="NM_SETTING_IP4_CONFIG_SETTING_NAME" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS"/>
     <function name="enum NMSettingIP4ConfigError" link="NMSettingIP4Config.html#NMSettingIP4ConfigError"/>
@@ -535,6 +511,7 @@
     <function name="NM_SETTING_IP4_CONFIG_METHOD_SHARED" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS"/>
     <function name="NM_SETTING_IP4_CONFIG_METHOD_DISABLED" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS"/>
     <function name="NMIP4Address" link="NMSettingIP4Config.html#NMIP4Address"/>
+    <function name="nm_ip4_address_get_type ()" link="NMSettingIP4Config.html#nm-ip4-address-get-type"/>
     <function name="nm_ip4_address_new ()" link="NMSettingIP4Config.html#nm-ip4-address-new"/>
     <function name="nm_ip4_address_dup ()" link="NMSettingIP4Config.html#nm-ip4-address-dup"/>
     <function name="nm_ip4_address_ref ()" link="NMSettingIP4Config.html#nm-ip4-address-ref"/>
@@ -547,6 +524,7 @@
     <function name="nm_ip4_address_get_gateway ()" link="NMSettingIP4Config.html#nm-ip4-address-get-gateway"/>
     <function name="nm_ip4_address_set_gateway ()" link="NMSettingIP4Config.html#nm-ip4-address-set-gateway"/>
     <function name="NMIP4Route" link="NMSettingIP4Config.html#NMIP4Route"/>
+    <function name="nm_ip4_route_get_type ()" link="NMSettingIP4Config.html#nm-ip4-route-get-type"/>
     <function name="nm_ip4_route_new ()" link="NMSettingIP4Config.html#nm-ip4-route-new"/>
     <function name="nm_ip4_route_dup ()" link="NMSettingIP4Config.html#nm-ip4-route-dup"/>
     <function name="nm_ip4_route_ref ()" link="NMSettingIP4Config.html#nm-ip4-route-ref"/>
@@ -625,6 +603,7 @@
     <function name="NM_SETTING_IP6_CONFIG_METHOD_MANUAL" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS"/>
     <function name="NM_SETTING_IP6_CONFIG_METHOD_SHARED" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS"/>
     <function name="NMIP6Address" link="NMSettingIP6Config.html#NMIP6Address"/>
+    <function name="nm_ip6_address_get_type ()" link="NMSettingIP6Config.html#nm-ip6-address-get-type"/>
     <function name="nm_ip6_address_new ()" link="NMSettingIP6Config.html#nm-ip6-address-new"/>
     <function name="nm_ip6_address_dup ()" link="NMSettingIP6Config.html#nm-ip6-address-dup"/>
     <function name="nm_ip6_address_ref ()" link="NMSettingIP6Config.html#nm-ip6-address-ref"/>
@@ -637,6 +616,7 @@
     <function name="nm_ip6_address_get_gateway ()" link="NMSettingIP6Config.html#nm-ip6-address-get-gateway"/>
     <function name="nm_ip6_address_set_gateway ()" link="NMSettingIP6Config.html#nm-ip6-address-set-gateway"/>
     <function name="NMIP6Route" link="NMSettingIP6Config.html#NMIP6Route"/>
+    <function name="nm_ip6_route_get_type ()" link="NMSettingIP6Config.html#nm-ip6-route-get-type"/>
     <function name="nm_ip6_route_new ()" link="NMSettingIP6Config.html#nm-ip6-route-new"/>
     <function name="nm_ip6_route_dup ()" link="NMSettingIP6Config.html#nm-ip6-route-dup"/>
     <function name="nm_ip6_route_ref ()" link="NMSettingIP6Config.html#nm-ip6-route-ref"/>
@@ -759,6 +739,7 @@
     <function name="NM_SETTING_PPPOE_SERVICE" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-SERVICE:CAPS"/>
     <function name="NM_SETTING_PPPOE_USERNAME" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-USERNAME:CAPS"/>
     <function name="NM_SETTING_PPPOE_PASSWORD" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD:CAPS"/>
+    <function name="NM_SETTING_PPPOE_PASSWORD_FLAGS" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS"/>
     <function name="NMSettingPPPOE" link="NMSettingPPPOE.html#NMSettingPPPOE-struct"/>
     <function name="NMSettingPPPOEClass" link="NMSettingPPPOE.html#NMSettingPPPOEClass"/>
     <function name="nm_setting_pppoe_get_type ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-type"/>
@@ -766,7 +747,9 @@
     <function name="nm_setting_pppoe_get_service ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-service"/>
     <function name="nm_setting_pppoe_get_username ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-username"/>
     <function name="nm_setting_pppoe_get_password ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-password"/>
+    <function name="nm_setting_pppoe_get_password_flags ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-password-flags"/>
     <function name="The &quot;password&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--password"/>
+    <function name="The &quot;password-flags&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--password-flags"/>
     <function name="The &quot;service&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--service"/>
     <function name="The &quot;username&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--username"/>
     <function name="NM_SETTING_VPN_SETTING_NAME" link="NMSettingVPN.html#NM-SETTING-VPN-SETTING-NAME:CAPS"/>
@@ -780,7 +763,7 @@
     <function name="NM_SETTING_VPN_SECRETS" link="NMSettingVPN.html#NM-SETTING-VPN-SECRETS:CAPS"/>
     <function name="NMSettingVPN" link="NMSettingVPN.html#NMSettingVPN-struct"/>
     <function name="NMSettingVPNClass" link="NMSettingVPN.html#NMSettingVPNClass"/>
-    <function name="VPNIterFunc ()" link="NMSettingVPN.html#VPNIterFunc"/>
+    <function name="NMVPNIterFunc ()" link="NMSettingVPN.html#NMVPNIterFunc"/>
     <function name="nm_setting_vpn_get_type ()" link="NMSettingVPN.html#nm-setting-vpn-get-type"/>
     <function name="nm_setting_vpn_new ()" link="NMSettingVPN.html#nm-setting-vpn-new"/>
     <function name="nm_setting_vpn_get_service_type ()" link="NMSettingVPN.html#nm-setting-vpn-get-service-type"/>
@@ -797,16 +780,6 @@
     <function name="The &quot;secrets&quot; property" link="NMSettingVPN.html#NMSettingVPN--secrets"/>
     <function name="The &quot;service-type&quot; property" link="NMSettingVPN.html#NMSettingVPN--service-type"/>
     <function name="The &quot;user-name&quot; property" link="NMSettingVPN.html#NMSettingVPN--user-name"/>
-    <function name="nm_print_backtrace" link="libnm-util-nm-utils.html#nm-print-backtrace"/>
-    <function name="nm_get_timestamp()" link="libnm-util-nm-utils.html#nm-get-timestamp"/>
-    <function name="nm_info()" link="libnm-util-nm-utils.html#nm-info"/>
-    <function name="nm_info_str()" link="libnm-util-nm-utils.html#nm-info-str"/>
-    <function name="nm_debug()" link="libnm-util-nm-utils.html#nm-debug"/>
-    <function name="nm_debug_str()" link="libnm-util-nm-utils.html#nm-debug-str"/>
-    <function name="nm_warning()" link="libnm-util-nm-utils.html#nm-warning"/>
-    <function name="nm_warning_str()" link="libnm-util-nm-utils.html#nm-warning-str"/>
-    <function name="nm_error()" link="libnm-util-nm-utils.html#nm-error"/>
-    <function name="nm_error_str()" link="libnm-util-nm-utils.html#nm-error-str"/>
     <function name="nm_utils_init ()" link="libnm-util-nm-utils.html#nm-utils-init"/>
     <function name="nm_utils_deinit ()" link="libnm-util-nm-utils.html#nm-utils-deinit"/>
     <function name="nm_utils_is_empty_ssid ()" link="libnm-util-nm-utils.html#nm-utils-is-empty-ssid"/>
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 3f68f0ec..9cb466dd 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -3,7 +3,6 @@
 <book xmlns="http://www.devhelp.net/book" title="libnm-util Reference Manual" link="index.html" author="" name="libnm-util" version="2" language="c">
   <chapters>
     <sub name="libnm-util API Reference" link="ch01.html">
-      <sub name="NMConnection" link="NMConnection.html"/>
       <sub name="NMSetting" link="NMSetting.html"/>
       <sub name="NMSettingConnection" link="NMSettingConnection.html"/>
       <sub name="NMSettingWired" link="NMSettingWired.html"/>
@@ -27,43 +26,6 @@
     <sub name="Annotation Glossary" link="annotation-glossary.html"/>
   </chapters>
   <functions>
-    <keyword type="enum" name="enum NMConnectionScope" link="NMConnection.html#NMConnectionScope"/>
-    <keyword type="enum" name="enum NMConnectionError" link="NMConnection.html#NMConnectionError"/>
-    <keyword type="macro" name="NM_TYPE_CONNECTION_ERROR" link="NMConnection.html#NM-TYPE-CONNECTION-ERROR:CAPS"/>
-    <keyword type="macro" name="NM_CONNECTION_ERROR" link="NMConnection.html#NM-CONNECTION-ERROR:CAPS"/>
-    <keyword type="function" name="nm_connection_error_quark ()" link="NMConnection.html#nm-connection-error-quark"/>
-    <keyword type="macro" name="NM_CONNECTION_SCOPE" link="NMConnection.html#NM-CONNECTION-SCOPE:CAPS"/>
-    <keyword type="macro" name="NM_CONNECTION_PATH" link="NMConnection.html#NM-CONNECTION-PATH:CAPS"/>
-    <keyword type="struct" name="NMConnection" link="NMConnection.html#NMConnection-struct"/>
-    <keyword type="struct" name="NMConnectionClass" link="NMConnection.html#NMConnectionClass"/>
-    <keyword type="function" name="nm_connection_get_type ()" link="NMConnection.html#nm-connection-get-type"/>
-    <keyword type="function" name="nm_connection_new ()" link="NMConnection.html#nm-connection-new"/>
-    <keyword type="function" name="nm_connection_new_from_hash ()" link="NMConnection.html#nm-connection-new-from-hash"/>
-    <keyword type="function" name="nm_connection_duplicate ()" link="NMConnection.html#nm-connection-duplicate"/>
-    <keyword type="function" name="nm_connection_add_setting ()" link="NMConnection.html#nm-connection-add-setting"/>
-    <keyword type="function" name="nm_connection_remove_setting ()" link="NMConnection.html#nm-connection-remove-setting"/>
-    <keyword type="function" name="nm_connection_get_setting ()" link="NMConnection.html#nm-connection-get-setting"/>
-    <keyword type="function" name="nm_connection_get_setting_by_name ()" link="NMConnection.html#nm-connection-get-setting-by-name"/>
-    <keyword type="function" name="nm_connection_replace_settings ()" link="NMConnection.html#nm-connection-replace-settings"/>
-    <keyword type="function" name="nm_connection_compare ()" link="NMConnection.html#nm-connection-compare"/>
-    <keyword type="function" name="nm_connection_diff ()" link="NMConnection.html#nm-connection-diff"/>
-    <keyword type="function" name="nm_connection_verify ()" link="NMConnection.html#nm-connection-verify"/>
-    <keyword type="function" name="nm_connection_need_secrets ()" link="NMConnection.html#nm-connection-need-secrets"/>
-    <keyword type="function" name="nm_connection_clear_secrets ()" link="NMConnection.html#nm-connection-clear-secrets"/>
-    <keyword type="function" name="nm_connection_update_secrets ()" link="NMConnection.html#nm-connection-update-secrets"/>
-    <keyword type="function" name="nm_connection_set_scope ()" link="NMConnection.html#nm-connection-set-scope"/>
-    <keyword type="function" name="nm_connection_get_scope ()" link="NMConnection.html#nm-connection-get-scope"/>
-    <keyword type="function" name="nm_connection_set_path ()" link="NMConnection.html#nm-connection-set-path"/>
-    <keyword type="function" name="nm_connection_get_path ()" link="NMConnection.html#nm-connection-get-path"/>
-    <keyword type="function" name="nm_connection_for_each_setting_value ()" link="NMConnection.html#nm-connection-for-each-setting-value"/>
-    <keyword type="function" name="nm_connection_to_hash ()" link="NMConnection.html#nm-connection-to-hash"/>
-    <keyword type="function" name="nm_connection_dump ()" link="NMConnection.html#nm-connection-dump"/>
-    <keyword type="function" name="nm_connection_create_setting ()" link="NMConnection.html#nm-connection-create-setting"/>
-    <keyword type="function" name="nm_connection_lookup_setting_type ()" link="NMConnection.html#nm-connection-lookup-setting-type"/>
-    <keyword type="function" name="nm_connection_lookup_setting_type_by_quark ()" link="NMConnection.html#nm-connection-lookup-setting-type-by-quark"/>
-    <keyword type="property" name="The &quot;path&quot; property" link="NMConnection.html#NMConnection--path"/>
-    <keyword type="property" name="The &quot;scope&quot; property" link="NMConnection.html#NMConnection--scope"/>
-    <keyword type="signal" name="The &quot;secrets-updated&quot; signal" link="NMConnection.html#NMConnection-secrets-updated"/>
     <keyword type="enum" name="enum NMSettingError" link="NMSetting.html#NMSettingError"/>
     <keyword type="macro" name="NM_TYPE_SETTING_ERROR" link="NMSetting.html#NM-TYPE-SETTING-ERROR:CAPS"/>
     <keyword type="macro" name="NM_SETTING_ERROR" link="NMSetting.html#NM-SETTING-ERROR:CAPS"/>
@@ -73,10 +35,12 @@
     <keyword type="macro" name="NM_SETTING_PARAM_SECRET" link="NMSetting.html#NM-SETTING-PARAM-SECRET:CAPS"/>
     <keyword type="macro" name="NM_SETTING_PARAM_FUZZY_IGNORE" link="NMSetting.html#NM-SETTING-PARAM-FUZZY-IGNORE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_NAME" link="NMSetting.html#NM-SETTING-NAME:CAPS"/>
+    <keyword type="enum" name="enum NMSettingSecretFlags" link="NMSetting.html#NMSettingSecretFlags"/>
     <keyword type="struct" name="NMSetting" link="NMSetting.html#NMSetting-struct"/>
     <keyword type="struct" name="NMSettingClass" link="NMSetting.html#NMSettingClass"/>
     <keyword type="function" name="NMSettingValueIterFn ()" link="NMSetting.html#NMSettingValueIterFn"/>
     <keyword type="function" name="nm_setting_get_type ()" link="NMSetting.html#nm-setting-get-type"/>
+    <keyword type="enum" name="enum NMSettingHashFlags" link="NMSetting.html#NMSettingHashFlags"/>
     <keyword type="function" name="nm_setting_to_hash ()" link="NMSetting.html#nm-setting-to-hash"/>
     <keyword type="function" name="nm_setting_new_from_hash ()" link="NMSetting.html#nm-setting-new-from-hash"/>
     <keyword type="function" name="nm_setting_duplicate ()" link="NMSetting.html#nm-setting-duplicate"/>
@@ -91,6 +55,8 @@
     <keyword type="function" name="nm_setting_clear_secrets ()" link="NMSetting.html#nm-setting-clear-secrets"/>
     <keyword type="function" name="nm_setting_need_secrets ()" link="NMSetting.html#nm-setting-need-secrets"/>
     <keyword type="function" name="nm_setting_update_secrets ()" link="NMSetting.html#nm-setting-update-secrets"/>
+    <keyword type="function" name="nm_setting_get_secret_flags ()" link="NMSetting.html#nm-setting-get-secret-flags"/>
+    <keyword type="function" name="nm_setting_set_secret_flags ()" link="NMSetting.html#nm-setting-set-secret-flags"/>
     <keyword type="property" name="The &quot;name&quot; property" link="NMSetting.html#NMSetting--name"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_SETTING_NAME" link="NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS"/>
     <keyword type="enum" name="enum NMSettingConnectionError" link="NMSettingConnection.html#NMSettingConnectionError"/>
@@ -103,6 +69,7 @@
     <keyword type="macro" name="NM_SETTING_CONNECTION_AUTOCONNECT" link="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_TIMESTAMP" link="NMSettingConnection.html#NM-SETTING-CONNECTION-TIMESTAMP:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_READ_ONLY" link="NMSettingConnection.html#NM-SETTING-CONNECTION-READ-ONLY:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_CONNECTION_PERMISSIONS" link="NMSettingConnection.html#NM-SETTING-CONNECTION-PERMISSIONS:CAPS"/>
     <keyword type="struct" name="NMSettingConnection" link="NMSettingConnection.html#NMSettingConnection-struct"/>
     <keyword type="struct" name="NMSettingConnectionClass" link="NMSettingConnection.html#NMSettingConnectionClass"/>
     <keyword type="function" name="nm_setting_connection_get_type ()" link="NMSettingConnection.html#nm-setting-connection-get-type"/>
@@ -113,8 +80,14 @@
     <keyword type="function" name="nm_setting_connection_get_autoconnect ()" link="NMSettingConnection.html#nm-setting-connection-get-autoconnect"/>
     <keyword type="function" name="nm_setting_connection_get_timestamp ()" link="NMSettingConnection.html#nm-setting-connection-get-timestamp"/>
     <keyword type="function" name="nm_setting_connection_get_read_only ()" link="NMSettingConnection.html#nm-setting-connection-get-read-only"/>
+    <keyword type="function" name="nm_setting_connection_get_num_permissions ()" link="NMSettingConnection.html#nm-setting-connection-get-num-permissions"/>
+    <keyword type="function" name="nm_setting_connection_get_permission ()" link="NMSettingConnection.html#nm-setting-connection-get-permission"/>
+    <keyword type="function" name="nm_setting_connection_permissions_user_allowed ()" link="NMSettingConnection.html#nm-setting-connection-permissions-user-allowed"/>
+    <keyword type="function" name="nm_setting_connection_add_permission ()" link="NMSettingConnection.html#nm-setting-connection-add-permission"/>
+    <keyword type="function" name="nm_setting_connection_remove_permission ()" link="NMSettingConnection.html#nm-setting-connection-remove-permission"/>
     <keyword type="property" name="The &quot;autoconnect&quot; property" link="NMSettingConnection.html#NMSettingConnection--autoconnect"/>
     <keyword type="property" name="The &quot;id&quot; property" link="NMSettingConnection.html#NMSettingConnection--id"/>
+    <keyword type="property" name="The &quot;permissions&quot; property" link="NMSettingConnection.html#NMSettingConnection--permissions"/>
     <keyword type="property" name="The &quot;read-only&quot; property" link="NMSettingConnection.html#NMSettingConnection--read-only"/>
     <keyword type="property" name="The &quot;timestamp&quot; property" link="NMSettingConnection.html#NMSettingConnection--timestamp"/>
     <keyword type="property" name="The &quot;type&quot; property" link="NMSettingConnection.html#NMSettingConnection--type"/>
@@ -179,6 +152,8 @@
     <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_SEC" link="NMSettingWireless.html#NM-SETTING-WIRELESS-SEC: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_INFRA" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS"/>
     <keyword type="struct" name="NMSettingWireless" link="NMSettingWireless.html#NMSettingWireless-struct"/>
     <keyword type="struct" name="NMSettingWirelessClass" link="NMSettingWireless.html#NMSettingWirelessClass"/>
     <keyword type="function" name="nm_setting_wireless_get_type ()" link="NMSettingWireless.html#nm-setting-wireless-get-type"/>
@@ -227,9 +202,12 @@
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY1" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY2" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY3" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_PSK" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS"/>
     <keyword type="struct" name="NMSettingWirelessSecurity" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct"/>
     <keyword type="struct" name="NMSettingWirelessSecurityClass" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityClass"/>
     <keyword type="function" name="nm_setting_wireless_security_get_type ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-type"/>
@@ -251,21 +229,27 @@
     <keyword type="function" name="nm_setting_wireless_security_remove_group ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-remove-group"/>
     <keyword type="function" name="nm_setting_wireless_security_clear_groups ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-clear-groups"/>
     <keyword type="function" name="nm_setting_wireless_security_get_psk ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk"/>
+    <keyword type="function" name="nm_setting_wireless_security_get_psk_flags ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-psk-flags"/>
     <keyword type="function" name="nm_setting_wireless_security_get_leap_username ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-username"/>
     <keyword type="function" name="nm_setting_wireless_security_get_leap_password ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password"/>
+    <keyword type="function" name="nm_setting_wireless_security_get_leap_password_flags ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-leap-password-flags"/>
     <keyword type="function" name="nm_setting_wireless_security_get_wep_key ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key"/>
     <keyword type="function" name="nm_setting_wireless_security_set_wep_key ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-set-wep-key"/>
     <keyword type="function" name="nm_setting_wireless_security_get_wep_tx_keyidx ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-tx-keyidx"/>
     <keyword type="function" name="nm_setting_wireless_security_get_auth_alg ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-auth-alg"/>
+    <keyword type="function" name="nm_setting_wireless_security_get_wep_key_flags ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-flags"/>
     <keyword type="function" name="nm_setting_wireless_security_get_wep_key_type ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wep-key-type"/>
     <keyword type="property" name="The &quot;auth-alg&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg"/>
     <keyword type="property" name="The &quot;group&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--group"/>
     <keyword type="property" name="The &quot;key-mgmt&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt"/>
     <keyword type="property" name="The &quot;leap-password&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password"/>
+    <keyword type="property" name="The &quot;leap-password-flags&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password-flags"/>
     <keyword type="property" name="The &quot;leap-username&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username"/>
     <keyword type="property" name="The &quot;pairwise&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--pairwise"/>
     <keyword type="property" name="The &quot;proto&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--proto"/>
     <keyword type="property" name="The &quot;psk&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk"/>
+    <keyword type="property" name="The &quot;psk-flags&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk-flags"/>
+    <keyword type="property" name="The &quot;wep-key-flags&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-flags"/>
     <keyword type="property" name="The &quot;wep-key-type&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type"/>
     <keyword type="property" name="The &quot;wep-key0&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key0"/>
     <keyword type="property" name="The &quot;wep-key1&quot; property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key1"/>
@@ -321,6 +305,7 @@
     <keyword type="macro" name="NM_SETTING_CDMA_NUMBER" link="NMSettingCdma.html#NM-SETTING-CDMA-NUMBER:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CDMA_USERNAME" link="NMSettingCdma.html#NM-SETTING-CDMA-USERNAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CDMA_PASSWORD" link="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_CDMA_PASSWORD_FLAGS" link="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS"/>
     <keyword type="struct" name="NMSettingCdma" link="NMSettingCdma.html#NMSettingCdma-struct"/>
     <keyword type="struct" name="NMSettingCdmaClass" link="NMSettingCdma.html#NMSettingCdmaClass"/>
     <keyword type="function" name="nm_setting_cdma_get_type ()" link="NMSettingCdma.html#nm-setting-cdma-get-type"/>
@@ -328,8 +313,10 @@
     <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"/>
     <keyword type="function" name="nm_setting_cdma_get_password ()" link="NMSettingCdma.html#nm-setting-cdma-get-password"/>
+    <keyword type="function" name="nm_setting_cdma_get_password_flags ()" link="NMSettingCdma.html#nm-setting-cdma-get-password-flags"/>
     <keyword type="property" name="The &quot;number&quot; property" link="NMSettingCdma.html#NMSettingCdma--number"/>
     <keyword type="property" name="The &quot;password&quot; property" link="NMSettingCdma.html#NMSettingCdma--password"/>
+    <keyword type="property" name="The &quot;password-flags&quot; property" link="NMSettingCdma.html#NMSettingCdma--password-flags"/>
     <keyword type="property" name="The &quot;username&quot; property" link="NMSettingCdma.html#NMSettingCdma--username"/>
     <keyword type="macro" name="NM_SETTING_GSM_SETTING_NAME" link="NMSettingGsm.html#NM-SETTING-GSM-SETTING-NAME:CAPS"/>
     <keyword type="enum" name="enum NMSettingGsmError" link="NMSettingGsm.html#NMSettingGsmError"/>
@@ -339,19 +326,14 @@
     <keyword type="macro" name="NM_SETTING_GSM_NUMBER" link="NMSettingGsm.html#NM-SETTING-GSM-NUMBER:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_USERNAME" link="NMSettingGsm.html#NM-SETTING-GSM-USERNAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_PASSWORD" link="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_GSM_PASSWORD_FLAGS" link="NMSettingGsm.html#NM-SETTING-GSM-PASSWORD-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_APN" link="NMSettingGsm.html#NM-SETTING-GSM-APN:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_NETWORK_ID" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-ID:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_NETWORK_TYPE" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_ALLOWED_BANDS" link="NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_PIN" link="NMSettingGsm.html#NM-SETTING-GSM-PIN:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_GSM_PIN_FLAGS" link="NMSettingGsm.html#NM-SETTING-GSM-PIN-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_HOME_ONLY" link="NMSettingGsm.html#NM-SETTING-GSM-HOME-ONLY:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_GSM_PUK" link="NMSettingGsm.html#NM-SETTING-GSM-PUK:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_GSM_BAND" link="NMSettingGsm.html#NM-SETTING-GSM-BAND:CAPS"/>
-    <keyword type="macro" name="NM_GSM_NETWORK_ANY" link="NMSettingGsm.html#NM-GSM-NETWORK-ANY:CAPS"/>
-    <keyword type="macro" name="NM_GSM_NETWORK_UMTS_HSPA" link="NMSettingGsm.html#NM-GSM-NETWORK-UMTS-HSPA:CAPS"/>
-    <keyword type="macro" name="NM_GSM_NETWORK_GPRS_EDGE" link="NMSettingGsm.html#NM-GSM-NETWORK-GPRS-EDGE:CAPS"/>
-    <keyword type="macro" name="NM_GSM_NETWORK_PREFER_UMTS_HSPA" link="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-UMTS-HSPA:CAPS"/>
-    <keyword type="macro" name="NM_GSM_NETWORK_PREFER_GPRS_EDGE" link="NMSettingGsm.html#NM-GSM-NETWORK-PREFER-GPRS-EDGE:CAPS"/>
     <keyword type="enum" name="enum NMSettingGsmNetworkType" link="NMSettingGsm.html#NMSettingGsmNetworkType"/>
     <keyword type="enum" name="enum NMSettingGsmNetworkBand" link="NMSettingGsm.html#NMSettingGsmNetworkBand"/>
     <keyword type="struct" name="NMSettingGsm" link="NMSettingGsm.html#NMSettingGsm-struct"/>
@@ -367,18 +349,18 @@
     <keyword type="function" name="nm_setting_gsm_get_allowed_bands ()" link="NMSettingGsm.html#nm-setting-gsm-get-allowed-bands"/>
     <keyword type="function" name="nm_setting_gsm_get_pin ()" link="NMSettingGsm.html#nm-setting-gsm-get-pin"/>
     <keyword type="function" name="nm_setting_gsm_get_home_only ()" link="NMSettingGsm.html#nm-setting-gsm-get-home-only"/>
-    <keyword type="function" name="nm_setting_gsm_get_puk ()" link="NMSettingGsm.html#nm-setting-gsm-get-puk"/>
-    <keyword type="function" name="nm_setting_gsm_get_band ()" link="NMSettingGsm.html#nm-setting-gsm-get-band"/>
+    <keyword type="function" name="nm_setting_gsm_get_pin_flags ()" link="NMSettingGsm.html#nm-setting-gsm-get-pin-flags"/>
+    <keyword type="function" name="nm_setting_gsm_get_password_flags ()" link="NMSettingGsm.html#nm-setting-gsm-get-password-flags"/>
     <keyword type="property" name="The &quot;allowed-bands&quot; property" link="NMSettingGsm.html#NMSettingGsm--allowed-bands"/>
     <keyword type="property" name="The &quot;apn&quot; property" link="NMSettingGsm.html#NMSettingGsm--apn"/>
-    <keyword type="property" name="The &quot;band&quot; property" link="NMSettingGsm.html#NMSettingGsm--band"/>
     <keyword type="property" name="The &quot;home-only&quot; property" link="NMSettingGsm.html#NMSettingGsm--home-only"/>
     <keyword type="property" name="The &quot;network-id&quot; property" link="NMSettingGsm.html#NMSettingGsm--network-id"/>
     <keyword type="property" name="The &quot;network-type&quot; property" link="NMSettingGsm.html#NMSettingGsm--network-type"/>
     <keyword type="property" name="The &quot;number&quot; property" link="NMSettingGsm.html#NMSettingGsm--number"/>
     <keyword type="property" name="The &quot;password&quot; property" link="NMSettingGsm.html#NMSettingGsm--password"/>
+    <keyword type="property" name="The &quot;password-flags&quot; property" link="NMSettingGsm.html#NMSettingGsm--password-flags"/>
     <keyword type="property" name="The &quot;pin&quot; property" link="NMSettingGsm.html#NMSettingGsm--pin"/>
-    <keyword type="property" name="The &quot;puk&quot; property" link="NMSettingGsm.html#NMSettingGsm--puk"/>
+    <keyword type="property" name="The &quot;pin-flags&quot; property" link="NMSettingGsm.html#NMSettingGsm--pin-flags"/>
     <keyword type="property" name="The &quot;username&quot; property" link="NMSettingGsm.html#NMSettingGsm--username"/>
     <keyword type="macro" name="NM_SETTING_OLPC_MESH_SETTING_NAME" link="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS"/>
     <keyword type="enum" name="enum NMSettingOlpcMeshError" link="NMSettingOlpcMesh.html#NMSettingOlpcMeshError"/>
@@ -420,12 +402,15 @@
     <keyword type="macro" name="NM_SETTING_802_1X_PHASE2_CA_PATH" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PHASE2_CLIENT_CERT" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PASSWORD" link="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_802_1X_PASSWORD_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PRIVATE_KEY" link="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD" link="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PIN" link="NMSetting8021x.html#NM-SETTING-802-1X-PIN:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_802_1X_PSK" link="NMSetting8021x.html#NM-SETTING-802-1X-PSK:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_802_1X_PIN_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PIN-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_SYSTEM_CA_CERTS" link="NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS"/>
     <keyword type="struct" name="NMSetting8021x" link="NMSetting8021x.html#NMSetting8021x-struct"/>
     <keyword type="struct" name="NMSetting8021xClass" link="NMSetting8021x.html#NMSetting8021xClass"/>
@@ -463,35 +448,23 @@
     <keyword type="function" name="nm_setting_802_1x_get_phase2_client_cert_path ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert-path"/>
     <keyword type="function" name="nm_setting_802_1x_set_phase2_client_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert"/>
     <keyword type="function" name="nm_setting_802_1x_get_password ()" link="NMSetting8021x.html#nm-setting-802-1x-get-password"/>
+    <keyword type="function" name="nm_setting_802_1x_get_password_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-password-flags"/>
     <keyword type="function" name="nm_setting_802_1x_get_pin ()" link="NMSetting8021x.html#nm-setting-802-1x-get-pin"/>
-    <keyword type="function" name="nm_setting_802_1x_get_psk ()" link="NMSetting8021x.html#nm-setting-802-1x-get-psk"/>
+    <keyword type="function" name="nm_setting_802_1x_get_pin_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-pin-flags"/>
     <keyword type="function" name="nm_setting_802_1x_get_private_key_scheme ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-scheme"/>
     <keyword type="function" name="nm_setting_802_1x_get_private_key_blob ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-blob"/>
     <keyword type="function" name="nm_setting_802_1x_get_private_key_path ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-path"/>
     <keyword type="function" name="nm_setting_802_1x_set_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-set-private-key"/>
     <keyword type="function" name="nm_setting_802_1x_get_private_key_password ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password"/>
+    <keyword type="function" name="nm_setting_802_1x_get_private_key_password_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-password-flags"/>
     <keyword type="function" name="nm_setting_802_1x_get_private_key_format ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-format"/>
     <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_scheme ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-scheme"/>
     <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_blob ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-blob"/>
     <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_path ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-path"/>
     <keyword type="function" name="nm_setting_802_1x_set_phase2_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key"/>
     <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_password ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password"/>
+    <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_password_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password-flags"/>
     <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_format ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format"/>
-    <keyword type="enum" name="enum NMSetting8021xCKType" link="NMSetting8021x.html#NMSetting8021xCKType"/>
-    <keyword type="function" name="nm_setting_802_1x_get_ca_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_set_ca_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert-from-file" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_client_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-client-cert" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_set_client_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-client-cert-from-file" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_phase2_ca_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-ca-cert" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_set_phase2_ca_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert-from-file" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_phase2_client_cert ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-client-cert" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_set_phase2_client_cert_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert-from-file" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_set_private_key_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-private-key-from-file" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_private_key_type ()" link="NMSetting8021x.html#nm-setting-802-1x-get-private-key-type" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_set_phase2_private_key_from_file ()" link="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key-from-file" deprecated=""/>
-    <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_type ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-type" deprecated=""/>
     <keyword type="property" name="The &quot;anonymous-identity&quot; property" link="NMSetting8021x.html#NMSetting8021x--anonymous-identity"/>
     <keyword type="property" name="The &quot;ca-cert&quot; property" link="NMSetting8021x.html#NMSetting8021x--ca-cert"/>
     <keyword type="property" name="The &quot;ca-path&quot; property" link="NMSetting8021x.html#NMSetting8021x--ca-path"/>
@@ -499,6 +472,7 @@
     <keyword type="property" name="The &quot;eap&quot; property" link="NMSetting8021x.html#NMSetting8021x--eap"/>
     <keyword type="property" name="The &quot;identity&quot; property" link="NMSetting8021x.html#NMSetting8021x--identity"/>
     <keyword type="property" name="The &quot;password&quot; property" link="NMSetting8021x.html#NMSetting8021x--password"/>
+    <keyword type="property" name="The &quot;password-flags&quot; property" link="NMSetting8021x.html#NMSetting8021x--password-flags"/>
     <keyword type="property" name="The &quot;phase1-fast-provisioning&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning"/>
     <keyword type="property" name="The &quot;phase1-peaplabel&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel"/>
     <keyword type="property" name="The &quot;phase1-peapver&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase1-peapver"/>
@@ -509,8 +483,10 @@
     <keyword type="property" name="The &quot;phase2-client-cert&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-client-cert"/>
     <keyword type="property" name="The &quot;phase2-private-key&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-private-key"/>
     <keyword type="property" name="The &quot;phase2-private-key-password&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password"/>
+    <keyword type="property" name="The &quot;phase2-private-key-password-flags&quot; property" link="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password-flags"/>
     <keyword type="property" name="The &quot;private-key&quot; property" link="NMSetting8021x.html#NMSetting8021x--private-key"/>
     <keyword type="property" name="The &quot;private-key-password&quot; property" link="NMSetting8021x.html#NMSetting8021x--private-key-password"/>
+    <keyword type="property" name="The &quot;private-key-password-flags&quot; property" link="NMSetting8021x.html#NMSetting8021x--private-key-password-flags"/>
     <keyword type="property" name="The &quot;system-ca-certs&quot; property" link="NMSetting8021x.html#NMSetting8021x--system-ca-certs"/>
     <keyword type="macro" name="NM_SETTING_IP4_CONFIG_SETTING_NAME" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS"/>
     <keyword type="enum" name="enum NMSettingIP4ConfigError" link="NMSettingIP4Config.html#NMSettingIP4ConfigError"/>
@@ -535,6 +511,7 @@
     <keyword type="macro" name="NM_SETTING_IP4_CONFIG_METHOD_SHARED" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP4_CONFIG_METHOD_DISABLED" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS"/>
     <keyword type="typedef" name="NMIP4Address" link="NMSettingIP4Config.html#NMIP4Address"/>
+    <keyword type="function" name="nm_ip4_address_get_type ()" link="NMSettingIP4Config.html#nm-ip4-address-get-type"/>
     <keyword type="function" name="nm_ip4_address_new ()" link="NMSettingIP4Config.html#nm-ip4-address-new"/>
     <keyword type="function" name="nm_ip4_address_dup ()" link="NMSettingIP4Config.html#nm-ip4-address-dup"/>
     <keyword type="function" name="nm_ip4_address_ref ()" link="NMSettingIP4Config.html#nm-ip4-address-ref"/>
@@ -547,6 +524,7 @@
     <keyword type="function" name="nm_ip4_address_get_gateway ()" link="NMSettingIP4Config.html#nm-ip4-address-get-gateway"/>
     <keyword type="function" name="nm_ip4_address_set_gateway ()" link="NMSettingIP4Config.html#nm-ip4-address-set-gateway"/>
     <keyword type="typedef" name="NMIP4Route" link="NMSettingIP4Config.html#NMIP4Route"/>
+    <keyword type="function" name="nm_ip4_route_get_type ()" link="NMSettingIP4Config.html#nm-ip4-route-get-type"/>
     <keyword type="function" name="nm_ip4_route_new ()" link="NMSettingIP4Config.html#nm-ip4-route-new"/>
     <keyword type="function" name="nm_ip4_route_dup ()" link="NMSettingIP4Config.html#nm-ip4-route-dup"/>
     <keyword type="function" name="nm_ip4_route_ref ()" link="NMSettingIP4Config.html#nm-ip4-route-ref"/>
@@ -625,6 +603,7 @@
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_METHOD_MANUAL" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_METHOD_SHARED" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS"/>
     <keyword type="typedef" name="NMIP6Address" link="NMSettingIP6Config.html#NMIP6Address"/>
+    <keyword type="function" name="nm_ip6_address_get_type ()" link="NMSettingIP6Config.html#nm-ip6-address-get-type"/>
     <keyword type="function" name="nm_ip6_address_new ()" link="NMSettingIP6Config.html#nm-ip6-address-new"/>
     <keyword type="function" name="nm_ip6_address_dup ()" link="NMSettingIP6Config.html#nm-ip6-address-dup"/>
     <keyword type="function" name="nm_ip6_address_ref ()" link="NMSettingIP6Config.html#nm-ip6-address-ref"/>
@@ -637,6 +616,7 @@
     <keyword type="function" name="nm_ip6_address_get_gateway ()" link="NMSettingIP6Config.html#nm-ip6-address-get-gateway"/>
     <keyword type="function" name="nm_ip6_address_set_gateway ()" link="NMSettingIP6Config.html#nm-ip6-address-set-gateway"/>
     <keyword type="typedef" name="NMIP6Route" link="NMSettingIP6Config.html#NMIP6Route"/>
+    <keyword type="function" name="nm_ip6_route_get_type ()" link="NMSettingIP6Config.html#nm-ip6-route-get-type"/>
     <keyword type="function" name="nm_ip6_route_new ()" link="NMSettingIP6Config.html#nm-ip6-route-new"/>
     <keyword type="function" name="nm_ip6_route_dup ()" link="NMSettingIP6Config.html#nm-ip6-route-dup"/>
     <keyword type="function" name="nm_ip6_route_ref ()" link="NMSettingIP6Config.html#nm-ip6-route-ref"/>
@@ -759,6 +739,7 @@
     <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="struct" name="NMSettingPPPOEClass" link="NMSettingPPPOE.html#NMSettingPPPOEClass"/>
     <keyword type="function" name="nm_setting_pppoe_get_type ()" link="NMSettingPPPOE.html#nm-setting-pppoe-get-type"/>
@@ -766,7 +747,9 @@
     <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="property" name="The &quot;password&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--password"/>
+    <keyword type="property" name="The &quot;password-flags&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--password-flags"/>
     <keyword type="property" name="The &quot;service&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--service"/>
     <keyword type="property" name="The &quot;username&quot; property" link="NMSettingPPPOE.html#NMSettingPPPOE--username"/>
     <keyword type="macro" name="NM_SETTING_VPN_SETTING_NAME" link="NMSettingVPN.html#NM-SETTING-VPN-SETTING-NAME:CAPS"/>
@@ -780,7 +763,7 @@
     <keyword type="macro" name="NM_SETTING_VPN_SECRETS" link="NMSettingVPN.html#NM-SETTING-VPN-SECRETS:CAPS"/>
     <keyword type="struct" name="NMSettingVPN" link="NMSettingVPN.html#NMSettingVPN-struct"/>
     <keyword type="struct" name="NMSettingVPNClass" link="NMSettingVPN.html#NMSettingVPNClass"/>
-    <keyword type="function" name="VPNIterFunc ()" link="NMSettingVPN.html#VPNIterFunc"/>
+    <keyword type="function" name="NMVPNIterFunc ()" link="NMSettingVPN.html#NMVPNIterFunc"/>
     <keyword type="function" name="nm_setting_vpn_get_type ()" link="NMSettingVPN.html#nm-setting-vpn-get-type"/>
     <keyword type="function" name="nm_setting_vpn_new ()" link="NMSettingVPN.html#nm-setting-vpn-new"/>
     <keyword type="function" name="nm_setting_vpn_get_service_type ()" link="NMSettingVPN.html#nm-setting-vpn-get-service-type"/>
@@ -797,16 +780,6 @@
     <keyword type="property" name="The &quot;secrets&quot; property" link="NMSettingVPN.html#NMSettingVPN--secrets"/>
     <keyword type="property" name="The &quot;service-type&quot; property" link="NMSettingVPN.html#NMSettingVPN--service-type"/>
     <keyword type="property" name="The &quot;user-name&quot; property" link="NMSettingVPN.html#NMSettingVPN--user-name"/>
-    <keyword type="macro" name="nm_print_backtrace" link="libnm-util-nm-utils.html#nm-print-backtrace"/>
-    <keyword type="macro" name="nm_get_timestamp()" link="libnm-util-nm-utils.html#nm-get-timestamp"/>
-    <keyword type="macro" name="nm_info()" link="libnm-util-nm-utils.html#nm-info"/>
-    <keyword type="macro" name="nm_info_str()" link="libnm-util-nm-utils.html#nm-info-str"/>
-    <keyword type="macro" name="nm_debug()" link="libnm-util-nm-utils.html#nm-debug"/>
-    <keyword type="macro" name="nm_debug_str()" link="libnm-util-nm-utils.html#nm-debug-str"/>
-    <keyword type="macro" name="nm_warning()" link="libnm-util-nm-utils.html#nm-warning"/>
-    <keyword type="macro" name="nm_warning_str()" link="libnm-util-nm-utils.html#nm-warning-str"/>
-    <keyword type="macro" name="nm_error()" link="libnm-util-nm-utils.html#nm-error"/>
-    <keyword type="macro" name="nm_error_str()" link="libnm-util-nm-utils.html#nm-error-str"/>
     <keyword type="function" name="nm_utils_init ()" link="libnm-util-nm-utils.html#nm-utils-init"/>
     <keyword type="function" name="nm_utils_deinit ()" link="libnm-util-nm-utils.html#nm-utils-deinit"/>
     <keyword type="function" name="nm_utils_is_empty_ssid ()" link="libnm-util-nm-utils.html#nm-utils-is-empty-ssid"/>
@@ -837,15 +810,17 @@
     <keyword type="function" name="nm_utils_wifi_channel_to_freq ()" link="libnm-util-nm-utils.html#nm-utils-wifi-channel-to-freq"/>
     <keyword type="function" name="nm_utils_wifi_find_next_channel ()" link="libnm-util-nm-utils.html#nm-utils-wifi-find-next-channel"/>
     <keyword type="function" name="nm_utils_wifi_is_channel_valid ()" link="libnm-util-nm-utils.html#nm-utils-wifi-is-channel-valid"/>
-    <keyword type="constant" name="NM_CONNECTION_SCOPE_UNKNOWN" link="NMConnection.html#NM-CONNECTION-SCOPE-UNKNOWN:CAPS"/>
-    <keyword type="constant" name="NM_CONNECTION_SCOPE_SYSTEM" link="NMConnection.html#NM-CONNECTION-SCOPE-SYSTEM:CAPS"/>
-    <keyword type="constant" name="NM_CONNECTION_SCOPE_USER" link="NMConnection.html#NM-CONNECTION-SCOPE-USER:CAPS"/>
-    <keyword type="constant" name="NM_CONNECTION_ERROR_UNKNOWN" link="NMConnection.html#NM-CONNECTION-ERROR-UNKNOWN:CAPS"/>
-    <keyword type="constant" name="NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND" link="NMConnection.html#NM-CONNECTION-ERROR-CONNECTION-SETTING-NOT-FOUND:CAPS"/>
     <keyword type="constant" name="NM_SETTING_ERROR_UNKNOWN" link="NMSetting.html#NM-SETTING-ERROR-UNKNOWN:CAPS"/>
     <keyword type="constant" name="NM_SETTING_ERROR_PROPERTY_NOT_FOUND" link="NMSetting.html#NM-SETTING-ERROR-PROPERTY-NOT-FOUND:CAPS"/>
     <keyword type="constant" name="NM_SETTING_ERROR_PROPERTY_NOT_SECRET" link="NMSetting.html#NM-SETTING-ERROR-PROPERTY-NOT-SECRET:CAPS"/>
     <keyword type="constant" name="NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH" link="NMSetting.html#NM-SETTING-ERROR-PROPERTY-TYPE-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NONE" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_AGENT_OWNED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NOT_SAVED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NOT_REQUIRED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_HASH_FLAG_ALL" link="NMSetting.html#NM-SETTING-HASH-FLAG-ALL:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_HASH_FLAG_NO_SECRETS" link="NMSetting.html#NM-SETTING-HASH-FLAG-NO-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_HASH_FLAG_ONLY_SECRETS" link="NMSetting.html#NM-SETTING-HASH-FLAG-ONLY-SECRETS:CAPS"/>
     <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_EXACT" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-EXACT:CAPS"/>
     <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_FUZZY" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-FUZZY:CAPS"/>
     <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_IGNORE_ID" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-ID:CAPS"/>
@@ -857,5 +832,12 @@
     <keyword type="constant" name="NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-INVALID-PROPERTY:CAPS"/>
     <keyword type="constant" name="NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-MISSING-PROPERTY:CAPS"/>
     <keyword type="constant" name="NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-TYPE-SETTING-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_UNKNOWN" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_X509" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-X509:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_RAW_KEY" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_PKCS12" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_SCHEME_UNKNOWN" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_SCHEME_BLOB" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_SCHEME_PATH" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"/>
   </functions>
 </book>
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index 11904962..bbe2a6d2 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="libnm-util-nm-utils.html" title="nm-utils">
 <link rel="next" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -19,12 +19,12 @@
 <th width="100%" align="center">libnm-util Reference Manual</th>
 <td><a accesskey="n" href="api-index-full.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
-<div class="chapter" title="Object Hierarchy">
+<div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
 <a name="object-tree"></a>Object Hierarchy</h2></div></div></div>
 <pre class="screen">
     <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
-        <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+        NMConnection
         <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
             <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
             <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth">NMSettingBluetooth</a>
@@ -38,13 +38,38 @@
             <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
             <a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
             <a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
+            NMSettingWimax
             <a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
             <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
             <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+    GEnum
+        NMConnectionError
+        <a class="link" href="NMSetting8021x.html#NMSetting8021xError">NMSetting8021xError</a>
+        <a class="link" href="NMSettingBluetooth.html#NMSettingBluetoothError">NMSettingBluetoothError</a>
+        <a class="link" href="NMSettingCdma.html#NMSettingCdmaError">NMSettingCdmaError</a>
+        <a class="link" href="NMSettingConnection.html#NMSettingConnectionError">NMSettingConnectionError</a>
+        <a class="link" href="NMSetting.html#NMSettingError">NMSettingError</a>
+        <a class="link" href="NMSettingGsm.html#NMSettingGsmError">NMSettingGsmError</a>
+        <a class="link" href="NMSettingIP4Config.html#NMSettingIP4ConfigError">NMSettingIP4ConfigError</a>
+        <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigError">NMSettingIP6ConfigError</a>
+        <a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMeshError">NMSettingOlpcMeshError</a>
+        <a class="link" href="NMSettingPPP.html#NMSettingPPPError">NMSettingPPPError</a>
+        <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOEError">NMSettingPPPOEError</a>
+        <a class="link" href="NMSettingSerial.html#NMSettingSerialError">NMSettingSerialError</a>
+        <a class="link" href="NMSettingVPN.html#NMSettingVpnError">NMSettingVpnError</a>
+        NMSettingWimaxError
+        <a class="link" href="NMSettingWired.html#NMSettingWiredError">NMSettingWiredError</a>
+        <a class="link" href="NMSettingWireless.html#NMSettingWirelessError">NMSettingWirelessError</a>
+        <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityError">NMSettingWirelessSecurityError</a>
+    GBoxed
+        <a class="link" href="NMSettingIP4Config.html#NMIP4Address">NMIP4Address</a>
+        <a class="link" href="NMSettingIP4Config.html#NMIP4Route">NMIP4Route</a>
+        <a class="link" href="NMSettingIP6Config.html#NMIP6Address">NMIP6Address</a>
+        <a class="link" href="NMSettingIP6Config.html#NMIP6Route">NMIP6Route</a>
 </pre>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/style.css b/docs/libnm-util/html/style.css
index d544a2c2..d6f6c26e 100644
--- a/docs/libnm-util/html/style.css
+++ b/docs/libnm-util/html/style.css
@@ -32,8 +32,9 @@
   /* this is needed so that the local anchors are displayed below the naviagtion */
   div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
   {
+    display: inline-block;
     position: relative;
-    padding-top:4.5em;
+    top:-5em;
   }
   /* this seems to be a bug in the xsl style sheets when generating indexes */
   div.index div.index
author	Michael Biebl <biebl@debian.org>	2011-05-04 21:35:41 +0200
committer	Michael Biebl <biebl@debian.org>	2011-05-04 21:35:41 +0200
commit	9f806e97a24bba61417ae312fcc0da40914266fb (patch)
tree	4a25723414ceac11b4cba0558aa16f6f4b459f4b /docs/libnm-util/html
parent	8baa1aca8dfd35e3190d7d5655eb83b5b901e263 (diff)