Imported Upstream version 0.9.1.95upstream/0.9.1.95

10 files changed, 231 insertions, 419 deletions

diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index 0b90a06e1..43d198aa0 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -159,8 +159,16 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
+LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
+LIBNL1_LIBS = @LIBNL1_LIBS@
+LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
+LIBNL2_LIBS = @LIBNL2_LIBS@
+LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
+LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
+LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
+LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index c700c0d9b..3eb0788a9 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -82,6 +82,10 @@ enum                <a class="link" href="NMConnection.html#NMConnectionError">N
 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>);
+<span class="returnvalue">void</span>                <a class="link" href="NMConnection.html#nm-connection-clear-secrets-with-flags" title="nm_connection_clear_secrets_with_flags ()">nm_connection_clear_secrets_with_flags</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#NMSettingClearSecretsWithFlagsFn" title="NMSettingClearSecretsWithFlagsFn ()"><span class="type">NMSettingClearSecretsWithFlagsFn</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-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> *secrets</code></em>,
@@ -89,6 +93,8 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMCon
 <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>);
+<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-is-type" title="nm_connection_is_type ()">nm_connection_is_type</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> *type</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>,
@@ -153,6 +159,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="NMCon
 <div class="refsect1">
 <a name="NMConnection.signals"></a><h2>Signals</h2>
 <pre class="synopsis">
+  "<a class="link" href="NMConnection.html#NMConnection-secrets-cleared" title='The "secrets-cleared" signal'>secrets-cleared</a>"                                : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
   "<a class="link" href="NMConnection.html#NMConnection-secrets-updated" title='The "secrets-updated" signal'>secrets-updated</a>"                                : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a>
 </pre>
 </div>
@@ -700,6 +707,38 @@ keeping secret data in memory when not needed.
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-connection-clear-secrets-with-flags"></a><h3>nm_connection_clear_secrets_with_flags ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_clear_secrets_with_flags
+                                                        (<em class="parameter"><code><a 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#NMSettingClearSecretsWithFlagsFn" title="NMSettingClearSecretsWithFlagsFn ()"><span class="type">NMSettingClearSecretsWithFlagsFn</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>
+Clears and frees secrets determined by <em class="parameter"><code>func</code></em>.
+</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>function to be called to determine whether a
+specific secret should be cleared or not. <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>caller-supplied data passed to <em class="parameter"><code>func</code></em>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
 <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>,
@@ -796,6 +835,37 @@ Returns the connection's D-Bus path.
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-connection-is-type"></a><h3>nm_connection_is_type ()</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_is_type               (<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> *type</code></em>);</pre>
+<p>
+A convenience function to check if the given <em class="parameter"><code>connection</code></em> is a particular
+type (ie wired, wifi, ppp, etc). Checks the <a class="link" href="NMSettingConnection.html#NMSettingConnection--type" title='The "type" property'><span class="type">"type"</span></a>
+property of the connection and matches that against <em class="parameter"><code>type</code></em>.
+</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>type</code></em> :</span></p></td>
+<td>a setting name to check the connection's type against (like
+<a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-SETTING-NAME:CAPS" title="NM_SETTING_WIRELESS_SETTING_NAME"><code class="literal">NM_SETTING_WIRELESS_SETTING_NAME</code></a> or <a class="link" href="NMSettingWired.html#NM-SETTING-WIRED-SETTING-NAME:CAPS" title="NM_SETTING_WIRED_SETTING_NAME"><code class="literal">NM_SETTING_WIRED_SETTING_NAME</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 of the given <em class="parameter"><code>type</code></em>, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if not</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-connection-for-each-setting-value"></a><h3>nm_connection_for_each_setting_value ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                nm_connection_for_each_setting_value
                                                         (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
@@ -1344,6 +1414,29 @@ of the D-Bus path of the connection as provided by a settings service.
 <div class="refsect1">
 <a name="NMConnection.signal-details"></a><h2>Signal Details</h2>
 <div class="refsect2">
+<a name="NMConnection-secrets-cleared"></a><h3>The <code class="literal">"secrets-cleared"</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#gpointer"><span class="type">gpointer</span></a>      user_data)       : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre>
+<p>
+The ::secrets-cleared signal is emitted when the secrets of a connection
+are cleared.
+</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>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
 <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,
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 0cc1fd036..eec159733 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -56,6 +56,10 @@ enum                <a class="link" href="NMSetting.html#NMSettingError">NMSetti
 enum                <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags">NMSettingSecretFlags</a>;
 enum                <a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags">NMSettingCompareFlags</a>;
                     <a class="link" href="NMSetting.html#NMSetting-struct" title="NMSetting">NMSetting</a>;
+<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#NMSettingClearSecretsWithFlagsFn" title="NMSettingClearSecretsWithFlagsFn ()">*NMSettingClearSecretsWithFlagsFn</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</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-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
                     <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>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
@@ -87,6 +91,9 @@ enum                <a class="link" href="NMSetting.html#NMSettingDiffResult" ti
                                                          <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">char</span> *              <a class="link" href="NMSetting.html#nm-setting-to-string" title="nm_setting_to_string ()">nm_setting_to_string</a>                (<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="NMSetting.html#nm-setting-clear-secrets" title="nm_setting_clear_secrets ()">nm_setting_clear_secrets</a>            (<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="NMSetting.html#nm-setting-clear-secrets-with-flags" title="nm_setting_clear_secrets_with_flags ()">nm_setting_clear_secrets_with_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><a class="link" href="NMSetting.html#NMSettingClearSecretsWithFlagsFn" title="NMSettingClearSecretsWithFlagsFn ()"><span class="type">NMSettingClearSecretsWithFlagsFn</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-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *         <a class="link" href="NMSetting.html#nm-setting-need-secrets" title="nm_setting_need_secrets ()">nm_setting_need_secrets</a>             (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</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="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>,
@@ -380,6 +387,42 @@ It should only be accessed through the functions described below.
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMSettingClearSecretsWithFlagsFn"></a><h3>NMSettingClearSecretsWithFlagsFn ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            (*NMSettingClearSecretsWithFlagsFn) (<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</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-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</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 setting for which secrets are being iterated</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>secret</code></em> :</span></p></td>
+<td>The secret's name</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
+<td>The secret's flags, eg <a class="link" href="NMSetting.html#NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS"><code class="literal">NM_SETTING_SECRET_FLAG_AGENT_OWNED</code></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>User data passed to <a class="link" href="NMConnection.html#nm-connection-clear-secrets-with-flags" title="nm_connection_clear_secrets_with_flags ()"><code class="function">nm_connection_clear_secrets_with_flags()</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> to clear the secret, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> to not clear the secret</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingClass"></a><h3>NMSettingClass</h3>
 <pre class="programlisting">typedef struct {
 	GObjectClass parent;
@@ -414,10 +457,14 @@ It should only be accessed through the functions described below.
 	                                  const GParamSpec *prop_spec,
 	                                  NMSettingCompareFlags flags);
 
+	void        (*clear_secrets_with_flags) (NMSetting *setting,
+	                                         GParamSpec *pspec,
+	                                         NMSettingClearSecretsWithFlagsFn func,
+	                                         gpointer user_data);
+
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
 	void (*_reserved2) (void);
-	void (*_reserved3) (void);
 } NMSettingClass;
 </pre>
 <p>
@@ -635,8 +682,9 @@ failed validation, and in what way that property failed validation.
 </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>
+<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. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMSetting]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
@@ -851,6 +899,37 @@ leakage of information.
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-setting-clear-secrets-with-flags"></a><h3>nm_setting_clear_secrets_with_flags ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                nm_setting_clear_secrets_with_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><a class="link" href="NMSetting.html#NMSettingClearSecretsWithFlagsFn" title="NMSettingClearSecretsWithFlagsFn ()"><span class="type">NMSettingClearSecretsWithFlagsFn</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>
+Clears and frees secrets determined by <em class="parameter"><code>func</code></em>.
+</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>func</code></em> :</span></p></td>
+<td>function to be called to determine whether a
+specific secret should be cleared or not. <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>caller-supplied data passed to <em class="parameter"><code>func</code></em>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<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>
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index f47ea2c9d..d2b7bdbe1 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -21,20 +21,10 @@
 <td><a accesskey="n" href="annotation-glossary.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
-<a class="shortcut" href="#idx8">8</a>
-                      | 
-                   <a class="shortcut" href="#idxA">A</a>
-                      | 
-                   <a class="shortcut" href="#idxB">B</a>
-                      | 
-                   <a class="shortcut" href="#idxC">C</a>
-                      | 
-                   <a class="shortcut" href="#idxD">D</a>
+<a class="shortcut" href="#idxC">C</a>
                       | 
                    <a class="shortcut" href="#idxI">I</a>
                       | 
-                   <a class="shortcut" href="#idxM">M</a>
-                      | 
                    <a class="shortcut" href="#idxS">S</a>
                       | 
                    <a class="shortcut" href="#idxT">T</a>
@@ -49,36 +39,13 @@
 <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="idx8"></a><h3 class="title">8</h3>
-<dt>
-NM80211ApFlags, enum in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM80211ApSecurityFlags, enum in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM80211Mode, enum in NetworkManager
-</dt>
-<dd></dd>
-<a name="idxA"></a><h3 class="title">A</h3>
-<dt>
-NMActiveConnectionState, enum in NetworkManager
-</dt>
-<dd></dd>
-<a name="idxB"></a><h3 class="title">B</h3>
-<dt>
-NMBluetoothCapabilities, enum in NetworkManager
-</dt>
-<dd></dd>
-<a name="idxC"></a><h3 class="title">C</h3>
+<a name="idx"></a><a name="idxC"></a><h3 class="title">C</h3>
 <dt>
-NM_CHECK_VERSION, macro in nm-version
+<a class="link" href="NMConnection.html#NMConnection-struct" title="NMConnection">NMConnection</a>, struct in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <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>
+<a class="link" href="NMConnection.html#NMConnection-secrets-cleared" title='The "secrets-cleared" signal'>NMConnection::secrets-cleared</a>, object signal in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
@@ -106,6 +73,10 @@ NM_CHECK_VERSION, macro in nm-version
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMConnection.html#nm-connection-clear-secrets-with-flags" title="nm_connection_clear_secrets_with_flags ()">nm_connection_clear_secrets_with_flags</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+</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>
 </dt>
 <dd></dd>
@@ -222,6 +193,10 @@ NM_CHECK_VERSION, macro in nm-version
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMConnection.html#nm-connection-is-type" title="nm_connection_is_type ()">nm_connection_is_type</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+</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>
 </dt>
 <dd></dd>
@@ -269,275 +244,6 @@ NM_CHECK_VERSION, macro in nm-version
 <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>
 </dt>
 <dd></dd>
-<a name="idxD"></a><h3 class="title">D</h3>
-<dt>
-NM_DBUS_IFACE_SETTINGS, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_IFACE_SETTINGS_CONNECTION, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_ACCESS_POINT, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_ACTIVE_CONNECTION, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_AGENT_MANAGER, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_DEVICE, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_DEVICE_BLUETOOTH, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_DEVICE_MODEM, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_DEVICE_WIMAX, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_DEVICE_WIRED, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_DEVICE_WIRELESS, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_DHCP4_CONFIG, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_DHCP6_CONFIG, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_IP4_CONFIG, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_IP6_CONFIG, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_SECRET_AGENT, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_VPN, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_VPN_CONNECTION, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INTERFACE_WIMAX_NSP, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_INVALID_VPN_CONNECTION, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_NO_ACTIVE_VPN_CONNECTION, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_NO_VPN_CONNECTIONS, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_PATH, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_PATH_ACCESS_POINT, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_PATH_AGENT_MANAGER, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_PATH_SECRET_AGENT, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_PATH_SETTINGS, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_PATH_SETTINGS_CONNECTION, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_PATH_VPN, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_PATH_VPN_CONNECTION, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_PATH_WIMAX_NSP, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_SERVICE, macro in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR, macro in nm-dbus-glib-types
-</dt>
-<dd></dd>
-<dt>
-DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT, macro in nm-dbus-glib-types
-</dt>
-<dd></dd>
-<dt>
-DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, macro in nm-dbus-glib-types
-</dt>
-<dd></dd>
-<dt>
-DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE, macro in nm-dbus-glib-types
-</dt>
-<dd></dd>
-<dt>
-DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH, macro in nm-dbus-glib-types
-</dt>
-<dd></dd>
-<dt>
-DBUS_TYPE_G_ARRAY_OF_STRING, macro in nm-dbus-glib-types
-</dt>
-<dd></dd>
-<dt>
-DBUS_TYPE_G_ARRAY_OF_UINT, macro in nm-dbus-glib-types
-</dt>
-<dd></dd>
-<dt>
-DBUS_TYPE_G_IP6_ADDRESS, macro in nm-dbus-glib-types
-</dt>
-<dd></dd>
-<dt>
-DBUS_TYPE_G_IP6_ROUTE, macro in nm-dbus-glib-types
-</dt>
-<dd></dd>
-<dt>
-DBUS_TYPE_G_LIST_OF_STRING, macro in nm-dbus-glib-types
-</dt>
-<dd></dd>
-<dt>
-DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, macro in nm-dbus-glib-types
-</dt>
-<dd></dd>
-<dt>
-DBUS_TYPE_G_MAP_OF_STRING, macro in nm-dbus-glib-types
-</dt>
-<dd></dd>
-<dt>
-DBUS_TYPE_G_MAP_OF_VARIANT, macro in nm-dbus-glib-types
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_ALREADY_STARTED, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_ALREADY_STOPPED, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_BAD_ARGUMENTS, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_SIGNAL_CONNECT_FAILED, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_SIGNAL_IP4_CONFIG, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_SIGNAL_LOGIN_BANNER, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_SIGNAL_LOGIN_FAILED, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_SIGNAL_STATE_CHANGE, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_STARTING_IN_PROGRESS, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_STOPPING_IN_PROGRESS, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_DBUS_VPN_WRONG_STATE, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NMDeviceCapabilities, enum in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NMDeviceModemCapabilities, enum in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NMDeviceState, enum in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NMDeviceStateReason, enum in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NMDeviceType, enum in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NMDeviceWifiCapabilities, enum in NetworkManager
-</dt>
-<dd></dd>
 <a name="idxI"></a><h3 class="title">I</h3>
 <dt>
 <a class="link" href="NMSettingIP4Config.html#NMIP4Address">NMIP4Address</a>, typedef in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
@@ -763,19 +469,6 @@ NMDeviceWifiCapabilities, enum in NetworkManager
 <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="idxM"></a><h3 class="title">M</h3>
-<dt>
-NM_MAJOR_VERSION, macro in nm-version
-</dt>
-<dd></dd>
-<dt>
-NM_MICRO_VERSION, macro in nm-version
-</dt>
-<dd></dd>
-<dt>
-NM_MINOR_VERSION, macro in nm-version
-</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>
@@ -966,6 +659,10 @@ NM_MINOR_VERSION, macro in nm-version
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting.html#NMSettingClearSecretsWithFlagsFn" title="NMSettingClearSecretsWithFlagsFn ()">NMSettingClearSecretsWithFlagsFn</a>, user_function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags">NMSettingCompareFlags</a>, enum in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
@@ -2098,6 +1795,10 @@ NM_MINOR_VERSION, macro in nm-version
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting.html#nm-setting-clear-secrets-with-flags" title="nm_setting_clear_secrets_with_flags ()">nm_setting_clear_secrets_with_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-compare" title="nm_setting_compare ()">nm_setting_compare</a>, function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
@@ -3661,14 +3362,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-TX-POWER:CAPS" title="NM_SETTING_WIRELESS_TX_POWER">NM_SETTING_WIRELESS_TX_POWER</a>, macro in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
 </dt>
 <dd></dd>
-<dt>
-NMState, enum in NetworkManager
-</dt>
-<dd></dd>
-<dt>
-NM_STATE_CONNECTED, macro in NetworkManager
-</dt>
-<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>
@@ -3865,93 +3558,9 @@ NM_STATE_CONNECTED, macro in NetworkManager
 <dd></dd>
 <a name="idxV"></a><h3 class="title">V</h3>
 <dt>
-NMVPNConnectionState, enum in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NMVPNConnectionStateReason, enum in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
 <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>
-<dt>
-NMVPNPluginFailure, enum in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NMVPNServiceState, enum in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_DBUS_PLUGIN_INTERFACE, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_DBUS_PLUGIN_PATH, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_BANNER, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_DNS, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_MSS, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_MTU, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_NBNS, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_PTP, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
-<dt>
-NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, macro in NetworkManagerVPN
-</dt>
-<dd></dd>
 <a name="idxW"></a><h3 class="title">W</h3>
 <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>
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index d97a89395..e21c769e2 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id503033"></a>libnm-util API Reference</h2></div></div></div>
+<a name="id408143"></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>
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index eda2a542e..306a2efde 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -33,9 +33,11 @@
 <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-clear-secrets-with-flags" href="libnm-util/NMConnection.html#nm-connection-clear-secrets-with-flags">
 <ANCHOR id="nm-connection-update-secrets" href="libnm-util/NMConnection.html#nm-connection-update-secrets">
 <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-is-type" href="libnm-util/NMConnection.html#nm-connection-is-type">
 <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">
@@ -61,6 +63,7 @@
 <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.signal-details" href="libnm-util/NMConnection.html#NMConnection.signal-details">
+<ANCHOR id="NMConnection-secrets-cleared" href="libnm-util/NMConnection.html#NMConnection-secrets-cleared">
 <ANCHOR id="NMConnection-secrets-updated" href="libnm-util/NMConnection.html#NMConnection-secrets-updated">
 <ANCHOR id="NMSetting" href="libnm-util/NMSetting.html">
 <ANCHOR id="NMSetting.synopsis" href="libnm-util/NMSetting.html#NMSetting.synopsis">
@@ -95,6 +98,7 @@
 <ANCHOR id="NM-SETTING-COMPARE-FLAG-IGNORE-AGENT-OWNED-SECRETS:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-AGENT-OWNED-SECRETS:CAPS">
 <ANCHOR id="NM-SETTING-COMPARE-FLAG-IGNORE-NOT-SAVED-SECRETS:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-NOT-SAVED-SECRETS:CAPS">
 <ANCHOR id="NMSetting-struct" href="libnm-util/NMSetting.html#NMSetting-struct">
+<ANCHOR id="NMSettingClearSecretsWithFlagsFn" href="libnm-util/NMSetting.html#NMSettingClearSecretsWithFlagsFn">
 <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">
@@ -116,6 +120,7 @@
 <ANCHOR id="nm-setting-enumerate-values" href="libnm-util/NMSetting.html#nm-setting-enumerate-values">
 <ANCHOR id="nm-setting-to-string" href="libnm-util/NMSetting.html#nm-setting-to-string">
 <ANCHOR id="nm-setting-clear-secrets" href="libnm-util/NMSetting.html#nm-setting-clear-secrets">
+<ANCHOR id="nm-setting-clear-secrets-with-flags" href="libnm-util/NMSetting.html#nm-setting-clear-secrets-with-flags">
 <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">
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 00c111267..d4440e8dd 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -507,7 +507,8 @@ 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"><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. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMIP4Address]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
@@ -561,7 +562,8 @@ 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"><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. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMIP4Route]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
@@ -675,7 +677,8 @@ 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"><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. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMIP6Address]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
@@ -730,7 +733,8 @@ 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"><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. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMIP6Route]</span>
+</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
diff --git a/docs/libnm-util/html/libnm-util.devhelp b/docs/libnm-util/html/libnm-util.devhelp
index 21ba39f23..7e48f8179 100644
--- a/docs/libnm-util/html/libnm-util.devhelp
+++ b/docs/libnm-util/html/libnm-util.devhelp
@@ -50,9 +50,11 @@
     <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_clear_secrets_with_flags ()" link="NMConnection.html#nm-connection-clear-secrets-with-flags"/>
     <function name="nm_connection_update_secrets ()" link="NMConnection.html#nm-connection-update-secrets"/>
     <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_is_type ()" link="NMConnection.html#nm-connection-is-type"/>
     <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"/>
@@ -76,6 +78,7 @@
     <function name="nm_connection_get_setting_wireless ()" link="NMConnection.html#nm-connection-get-setting-wireless"/>
     <function name="nm_connection_get_setting_wireless_security ()" link="NMConnection.html#nm-connection-get-setting-wireless-security"/>
     <function name="The &quot;path&quot; property" link="NMConnection.html#NMConnection--path"/>
+    <function name="The &quot;secrets-cleared&quot; signal" link="NMConnection.html#NMConnection-secrets-cleared"/>
     <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"/>
@@ -89,6 +92,7 @@
     <function name="enum NMSettingSecretFlags" link="NMSetting.html#NMSettingSecretFlags"/>
     <function name="enum NMSettingCompareFlags" link="NMSetting.html#NMSettingCompareFlags"/>
     <function name="NMSetting" link="NMSetting.html#NMSetting-struct"/>
+    <function name="NMSettingClearSecretsWithFlagsFn ()" link="NMSetting.html#NMSettingClearSecretsWithFlagsFn"/>
     <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"/>
@@ -104,6 +108,7 @@
     <function name="nm_setting_enumerate_values ()" link="NMSetting.html#nm-setting-enumerate-values"/>
     <function name="nm_setting_to_string ()" link="NMSetting.html#nm-setting-to-string"/>
     <function name="nm_setting_clear_secrets ()" link="NMSetting.html#nm-setting-clear-secrets"/>
+    <function name="nm_setting_clear_secrets_with_flags ()" link="NMSetting.html#nm-setting-clear-secrets-with-flags"/>
     <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"/>
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index a6544dddb..3c4ec11b2 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -50,9 +50,11 @@
     <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_clear_secrets_with_flags ()" link="NMConnection.html#nm-connection-clear-secrets-with-flags"/>
     <keyword type="function" name="nm_connection_update_secrets ()" link="NMConnection.html#nm-connection-update-secrets"/>
     <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_is_type ()" link="NMConnection.html#nm-connection-is-type"/>
     <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"/>
@@ -76,6 +78,7 @@
     <keyword type="function" name="nm_connection_get_setting_wireless ()" link="NMConnection.html#nm-connection-get-setting-wireless"/>
     <keyword type="function" name="nm_connection_get_setting_wireless_security ()" link="NMConnection.html#nm-connection-get-setting-wireless-security"/>
     <keyword type="property" name="The &quot;path&quot; property" link="NMConnection.html#NMConnection--path"/>
+    <keyword type="signal" name="The &quot;secrets-cleared&quot; signal" link="NMConnection.html#NMConnection-secrets-cleared"/>
     <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"/>
@@ -89,6 +92,7 @@
     <keyword type="enum" name="enum NMSettingSecretFlags" link="NMSetting.html#NMSettingSecretFlags"/>
     <keyword type="enum" name="enum NMSettingCompareFlags" link="NMSetting.html#NMSettingCompareFlags"/>
     <keyword type="struct" name="NMSetting" link="NMSetting.html#NMSetting-struct"/>
+    <keyword type="function" name="NMSettingClearSecretsWithFlagsFn ()" link="NMSetting.html#NMSettingClearSecretsWithFlagsFn"/>
     <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"/>
@@ -104,6 +108,7 @@
     <keyword type="function" name="nm_setting_enumerate_values ()" link="NMSetting.html#nm-setting-enumerate-values"/>
     <keyword type="function" name="nm_setting_to_string ()" link="NMSetting.html#nm-setting-to-string"/>
     <keyword type="function" name="nm_setting_clear_secrets ()" link="NMSetting.html#nm-setting-clear-secrets"/>
+    <keyword type="function" name="nm_setting_clear_secrets_with_flags ()" link="NMSetting.html#nm-setting-clear-secrets-with-flags"/>
     <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"/>
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index 06bd0d325..8a3cf261e 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -657,6 +657,7 @@ NM_SETTING_NAME
 NMSettingSecretFlags
 NMSettingCompareFlags
 NMSetting
+NMSettingClearSecretsWithFlagsFn
 NMSettingClass
 NMSettingValueIterFn
 nm_setting_get_type
@@ -672,6 +673,7 @@ nm_setting_diff
 nm_setting_enumerate_values
 nm_setting_to_string
 nm_setting_clear_secrets
+nm_setting_clear_secrets_with_flags
 nm_setting_need_secrets
 nm_setting_update_secrets
 nm_setting_get_secret_flags
@@ -769,9 +771,11 @@ nm_connection_diff
 nm_connection_verify
 nm_connection_need_secrets
 nm_connection_clear_secrets
+nm_connection_clear_secrets_with_flags
 nm_connection_update_secrets
 nm_connection_set_path
 nm_connection_get_path
+nm_connection_is_type
 nm_connection_for_each_setting_value
 nm_connection_to_hash
 nm_connection_dump