New upstream version 1.10.8 upstream/1.10.8

44 files changed, 391 insertions, 1828 deletions

diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am
index c2bcff1b..3e0eca49 100644
--- a/docs/libnm/Makefile.am
+++ b/docs/libnm/Makefile.am
@@ -19,6 +19,9 @@ DOC_SOURCE_DIR= \
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS=--rebuild-types --rebuild-sections
 
+# Extra options to supply to gtkdoc-scangobj.
+SCANGOBJ_OPTIONS=--type-init-func 'g_type_init();'
+
 # Extra options to supply to gtkdoc-mkdb.
 MKDB_OPTIONS=--sgml-mode --output-format=xml
 
@@ -66,25 +69,24 @@ extra_files = libnm.png
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS = \
-	-I$(top_srcdir)/libnm-core \
-	-I$(top_builddir)/libnm-core \
-	-I$(top_srcdir)/libnm \
-	-I$(top_builddir)/libnm \
+GTKDOC_CFLAGS =				\
+	-I$(top_srcdir)/libnm-core	\
+	-I$(top_builddir)/libnm-core	\
+	-I$(top_srcdir)/libnm		\
+	-I$(top_builddir)/libnm		\
+	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
-	$(GLIB_CFLAGS) \
-	$(SANITIZER_EXEC_CFLAGS)
+	$(GLIB_CFLAGS)
 
-GTKDOC_LIBS = \
+GTKDOC_LIBS =  \
 	$(top_builddir)/libnm/libnm.la \
-	$(GLIB_LIBS) \
-	$(SANITIZER_EXEC_LDFLAGS)
+	$(GLIB_LIBS)
 
 
 # include common portion ...
 include $(top_srcdir)/gtk-doc.make
 
-EXTRA_DIST += version.xml.in meson.build
+EXTRA_DIST += version.xml.in
 
 CLEANFILES += \
 	libnm-sections.txt \
diff --git a/docs/libnm/Makefile.in b/docs/libnm/Makefile.in
index 124bcc61..ff314e0e 100644
--- a/docs/libnm/Makefile.in
+++ b/docs/libnm/Makefile.in
@@ -209,7 +209,7 @@ GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
@@ -263,13 +263,14 @@ LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBNDP_CFLAGS = @LIBNDP_CFLAGS@
 LIBNDP_LIBS = @LIBNDP_LIBS@
+LIBNL_CFLAGS = @LIBNL_CFLAGS@
+LIBNL_LIBS = @LIBNL_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBPSL_CFLAGS = @LIBPSL_CFLAGS@
 LIBPSL_LIBS = @LIBPSL_LIBS@
 LIBS = @LIBS@
 LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@
 LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@
-LIBSYSTEMD_NM_CFLAGS = @LIBSYSTEMD_NM_CFLAGS@
 LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@
 LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
@@ -340,11 +341,8 @@ QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READELF = @READELF@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
 SANITIZER_ENV = @SANITIZER_ENV@
-SANITIZER_EXEC_CFLAGS = @SANITIZER_EXEC_CFLAGS@
-SANITIZER_EXEC_LDFLAGS = @SANITIZER_EXEC_LDFLAGS@
-SANITIZER_LIB_CFLAGS = @SANITIZER_LIB_CFLAGS@
-SANITIZER_LIB_LDFLAGS = @SANITIZER_LIB_LDFLAGS@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -469,6 +467,9 @@ DOC_SOURCE_DIR = \
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS = --rebuild-types --rebuild-sections
 
+# Extra options to supply to gtkdoc-scangobj.
+SCANGOBJ_OPTIONS = --type-init-func 'g_type_init();'
+
 # Extra options to supply to gtkdoc-mkdb.
 MKDB_OPTIONS = --sgml-mode --output-format=xml
 
@@ -517,18 +518,17 @@ extra_files = libnm.png
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
-	-I$(top_srcdir)/libnm-core \
-	-I$(top_builddir)/libnm-core \
-	-I$(top_srcdir)/libnm \
-	-I$(top_builddir)/libnm \
+	-I$(top_srcdir)/libnm-core	\
+	-I$(top_builddir)/libnm-core	\
+	-I$(top_srcdir)/libnm		\
+	-I$(top_builddir)/libnm		\
+	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
-	$(GLIB_CFLAGS) \
-	$(SANITIZER_EXEC_CFLAGS)
+	$(GLIB_CFLAGS)
 
 GTKDOC_LIBS = \
 	$(top_builddir)/libnm/libnm.la \
-	$(GLIB_LIBS) \
-	$(SANITIZER_EXEC_LDFLAGS)
+	$(GLIB_LIBS)
 
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -553,7 +553,7 @@ SETUP_FILES = \
 
 
 # include common portion ...
-EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in meson.build
+EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in
 DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
 	sgml.stamp html.stamp pdf.stamp
diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index 866b4737..1543554d 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -1001,7 +1001,7 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <a name="NMActiveConnection--devices"></a><h3>The <code class="literal">“devices”</code> property</h3>
 <pre class="programlisting">  “devices”                  <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>The devices of the active connection.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p>
+<p>Element-type: NMDevice</p>
 <p>Flags: Read</p>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html
index 2af3621c..6015f726 100644
--- a/docs/libnm/html/NMClient.html
+++ b/docs/libnm/html/NMClient.html
@@ -568,77 +568,6 @@
 <a class="link" href="NMClient.html#nm-client-get-dns-configuration" title="nm_client_get_dns_configuration ()">nm_client_get_dns_configuration</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
-<tr>
-<td class="function_type">const <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *
-</td>
-<td class="function_name">
-<a class="link" href="NMClient.html#nm-client-get-checkpoints" title="nm_client_get_checkpoints ()">nm_client_get_checkpoints</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
-<tr>
-<td class="function_type">
-<span class="returnvalue">void</span>
-</td>
-<td class="function_name">
-<a class="link" href="NMClient.html#nm-client-checkpoint-create" title="nm_client_checkpoint_create ()">nm_client_checkpoint_create</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
-<tr>
-<td class="function_type">
-<span class="returnvalue">NMCheckpoint</span> *
-</td>
-<td class="function_name">
-<a class="link" href="NMClient.html#nm-client-checkpoint-create-finish" title="nm_client_checkpoint_create_finish ()">nm_client_checkpoint_create_finish</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
-<tr>
-<td class="function_type">
-<span class="returnvalue">void</span>
-</td>
-<td class="function_name">
-<a class="link" href="NMClient.html#nm-client-checkpoint-destroy" title="nm_client_checkpoint_destroy ()">nm_client_checkpoint_destroy</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
-<tr>
-<td class="function_type">
-<a href="../glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-</td>
-<td class="function_name">
-<a class="link" href="NMClient.html#nm-client-checkpoint-destroy-finish" title="nm_client_checkpoint_destroy_finish ()">nm_client_checkpoint_destroy_finish</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
-<tr>
-<td class="function_type">
-<span class="returnvalue">void</span>
-</td>
-<td class="function_name">
-<a class="link" href="NMClient.html#nm-client-checkpoint-rollback" title="nm_client_checkpoint_rollback ()">nm_client_checkpoint_rollback</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
-<tr>
-<td class="function_type">
-<a href="../glib/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *
-</td>
-<td class="function_name">
-<a class="link" href="NMClient.html#nm-client-checkpoint-rollback-finish" title="nm_client_checkpoint_rollback_finish ()">nm_client_checkpoint_rollback_finish</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
-<tr>
-<td class="function_type">
-<span class="returnvalue">void</span>
-</td>
-<td class="function_name">
-<a class="link" href="NMClient.html#nm-client-checkpoint-adjust-rollback-timeout" title="nm_client_checkpoint_adjust_rollback_timeout ()">nm_client_checkpoint_adjust_rollback_timeout</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
-<tr>
-<td class="function_type">
-<a href="../glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-</td>
-<td class="function_name">
-<a class="link" href="NMClient.html#nm-client-checkpoint-adjust-rollback-timeout-finish" title="nm_client_checkpoint_adjust_rollback_timeout_finish ()">nm_client_checkpoint_adjust_rollback_timeout_finish</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
 </tbody>
 </table></div>
 </div>
@@ -677,12 +606,6 @@
 <tr>
 <td class="property_type">
 <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</td>
-<td class="property_name"><a class="link" href="NMClient.html#NMClient--checkpoints" title="The “checkpoints” property">checkpoints</a></td>
-<td class="property_flags">Read</td>
-</tr>
-<tr>
-<td class="property_type">
-<a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</td>
 <td class="property_name"><a class="link" href="NMClient.html#NMClient--connections" title="The “connections” property">connections</a></td>
 <td class="property_flags">Read</td>
 </tr>
@@ -3547,438 +3470,6 @@ and should not be modified. </p>
 </div>
 <p class="since">Since: 1.6</p>
 </div>
-<hr>
-<div class="refsect2">
-<a name="nm-client-get-checkpoints"></a><h3>nm_client_get_checkpoints ()</h3>
-<pre class="programlisting">const <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *
-nm_client_get_checkpoints (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
-<p>Gets all the active checkpoints.</p>
-<div class="refsect3">
-<a name="nm-client-get-checkpoints.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody><tr>
-<td class="parameter_name"><p>client</p></td>
-<td class="parameter_description"><p>a <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr></tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="nm-client-get-checkpoints.returns"></a><h4>Returns</h4>
-<p>a <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a>
-containing all the <span class="type">NMCheckpoint</span>.  The returned array is owned by the
-<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> object and should not be modified. </p>
-<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMCheckpoint]</span></p>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="nm-client-checkpoint-create"></a><h3>nm_client_checkpoint_create ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_client_checkpoint_create (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                             <em class="parameter"><code>const <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *devices</code></em>,
-                             <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> rollback_timeout</code></em>,
-                             <em class="parameter"><code><a class="link" href="libnm-nm-dbus-interface.html#NMCheckpointCreateFlags" title="enum NMCheckpointCreateFlags"><span class="type">NMCheckpointCreateFlags</span></a> flags</code></em>,
-                             <em class="parameter"><code><a href="../gio/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a> *cancellable</code></em>,
-                             <em class="parameter"><code><a href="../gio/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> callback</code></em>,
-                             <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>Creates a checkpoint of the current networking configuration
-for given interfaces. An empty <em class="parameter"><code>devices</code></em>
- argument means all
-devices. If <em class="parameter"><code>rollback_timeout</code></em>
- is not zero, a rollback is
-automatically performed after the given timeout.</p>
-<div class="refsect3">
-<a name="nm-client-checkpoint-create.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>client</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMClient.html" title="NMClient"><code class="literal">NMClient</code></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>devices</p></td>
-<td class="parameter_description"><p>a list of devices for which a
-checkpoint should be created. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></td>
-</tr>
-<tr>
-<td class="parameter_name"><p>rollback_timeout</p></td>
-<td class="parameter_description"><p>the rollback timeout in seconds</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>flags</p></td>
-<td class="parameter_description"><p>creation flags</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>cancellable</p></td>
-<td class="parameter_description"><p>a <a href="../gio/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>callback</p></td>
-<td class="parameter_description"><p>callback to be called when the add operation completes. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span></td>
-</tr>
-<tr>
-<td class="parameter_name"><p>user_data</p></td>
-<td class="parameter_description"><p>caller-specific data passed to <em class="parameter"><code>callback</code></em>
-. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="nm-client-checkpoint-create-finish"></a><h3>nm_client_checkpoint_create_finish ()</h3>
-<pre class="programlisting"><span class="returnvalue">NMCheckpoint</span> *
-nm_client_checkpoint_create_finish (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                    <em class="parameter"><code><a href="../gio/GAsyncResult.html#GAsyncResult-struct"><span class="type">GAsyncResult</span></a> *result</code></em>,
-                                    <em class="parameter"><code><a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Gets the result of a call to <a class="link" href="NMClient.html#nm-client-checkpoint-create" title="nm_client_checkpoint_create ()"><code class="function">nm_client_checkpoint_create()</code></a>.</p>
-<div class="refsect3">
-<a name="nm-client-checkpoint-create-finish.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>client</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>result</p></td>
-<td class="parameter_description"><p>the result passed to the <a href="../gio/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>location for a <a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="nm-client-checkpoint-create-finish.returns"></a><h4>Returns</h4>
-<p>the new <span class="type">NMCheckpoint</span> on success, <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on
-failure, in which case <em class="parameter"><code>error</code></em>
-will be set. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="nm-client-checkpoint-destroy"></a><h3>nm_client_checkpoint_destroy ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_client_checkpoint_destroy (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                              <em class="parameter"><code>const <span class="type">char</span> *checkpoint_path</code></em>,
-                              <em class="parameter"><code><a href="../gio/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a> *cancellable</code></em>,
-                              <em class="parameter"><code><a href="../gio/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> callback</code></em>,
-                              <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>Destroys an existing checkpoint without performing a rollback.</p>
-<div class="refsect3">
-<a name="nm-client-checkpoint-destroy.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>client</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMClient.html" title="NMClient"><code class="literal">NMClient</code></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>checkpoint_path</p></td>
-<td class="parameter_description"><p>the D-Bus path for the checkpoint</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>cancellable</p></td>
-<td class="parameter_description"><p>a <a href="../gio/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>callback</p></td>
-<td class="parameter_description"><p>callback to be called when the add operation completes. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span></td>
-</tr>
-<tr>
-<td class="parameter_name"><p>user_data</p></td>
-<td class="parameter_description"><p>caller-specific data passed to <em class="parameter"><code>callback</code></em>
-. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="nm-client-checkpoint-destroy-finish"></a><h3>nm_client_checkpoint_destroy_finish ()</h3>
-<pre class="programlisting"><a href="../glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-nm_client_checkpoint_destroy_finish (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                     <em class="parameter"><code><a href="../gio/GAsyncResult.html#GAsyncResult-struct"><span class="type">GAsyncResult</span></a> *result</code></em>,
-                                     <em class="parameter"><code><a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Gets the result of a call to <a class="link" href="NMClient.html#nm-client-checkpoint-destroy" title="nm_client_checkpoint_destroy ()"><code class="function">nm_client_checkpoint_destroy()</code></a>.</p>
-<div class="refsect3">
-<a name="nm-client-checkpoint-destroy-finish.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>client</p></td>
-<td class="parameter_description"><p>an <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>result</p></td>
-<td class="parameter_description"><p>the result passed to the <a href="../gio/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>location for a <a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="nm-client-checkpoint-destroy-finish.returns"></a><h4>Returns</h4>
-<p> <a href="../glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success or <a href="../glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure, in which case
-<em class="parameter"><code>error</code></em>
-will be set.</p>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="nm-client-checkpoint-rollback"></a><h3>nm_client_checkpoint_rollback ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_client_checkpoint_rollback (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                               <em class="parameter"><code>const <span class="type">char</span> *checkpoint_path</code></em>,
-                               <em class="parameter"><code><a href="../gio/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a> *cancellable</code></em>,
-                               <em class="parameter"><code><a href="../gio/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> callback</code></em>,
-                               <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>Performs the rollback of a checkpoint before the timeout is reached.</p>
-<div class="refsect3">
-<a name="nm-client-checkpoint-rollback.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>client</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMClient.html" title="NMClient"><code class="literal">NMClient</code></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>checkpoint_path</p></td>
-<td class="parameter_description"><p>the D-Bus path to the checkpoint</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>cancellable</p></td>
-<td class="parameter_description"><p>a <a href="../gio/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>callback</p></td>
-<td class="parameter_description"><p>callback to be called when the add operation completes. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span></td>
-</tr>
-<tr>
-<td class="parameter_name"><p>user_data</p></td>
-<td class="parameter_description"><p>caller-specific data passed to <em class="parameter"><code>callback</code></em>
-. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="nm-client-checkpoint-rollback-finish"></a><h3>nm_client_checkpoint_rollback_finish ()</h3>
-<pre class="programlisting"><a href="../glib/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *
-nm_client_checkpoint_rollback_finish (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                      <em class="parameter"><code><a href="../gio/GAsyncResult.html#GAsyncResult-struct"><span class="type">GAsyncResult</span></a> *result</code></em>,
-                                      <em class="parameter"><code><a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Gets the result of a call to <a class="link" href="NMClient.html#nm-client-checkpoint-rollback" title="nm_client_checkpoint_rollback ()"><code class="function">nm_client_checkpoint_rollback()</code></a>.</p>
-<div class="refsect3">
-<a name="nm-client-checkpoint-rollback-finish.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>client</p></td>
-<td class="parameter_description"><p>an <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>result</p></td>
-<td class="parameter_description"><p>the result passed to the <a href="../gio/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>location for a <a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="nm-client-checkpoint-rollback-finish.returns"></a><h4>Returns</h4>
-<p>an hash table of
-devices and results. Devices are represented by their original
-D-Bus path; each result is a <a class="link" href="libnm-nm-dbus-interface.html#NMRollbackResult" title="enum NMRollbackResult"><span class="type">NMRollbackResult</span></a>. </p>
-<p><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 guint32]</span></p>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="nm-client-checkpoint-adjust-rollback-timeout"></a><h3>nm_client_checkpoint_adjust_rollback_timeout ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_client_checkpoint_adjust_rollback_timeout
-                               (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                <em class="parameter"><code>const <span class="type">char</span> *checkpoint_path</code></em>,
-                                <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> add_timeout</code></em>,
-                                <em class="parameter"><code><a href="../gio/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a> *cancellable</code></em>,
-                                <em class="parameter"><code><a href="../gio/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> callback</code></em>,
-                                <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>Resets the timeout for the checkpoint with path <em class="parameter"><code>checkpoint_path</code></em>
-
-to <em class="parameter"><code>timeout_add</code></em>
-.</p>
-<div class="refsect3">
-<a name="nm-client-checkpoint-adjust-rollback-timeout.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>client</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMClient.html" title="NMClient"><code class="literal">NMClient</code></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>checkpoint_path</p></td>
-<td class="parameter_description"><p>a D-Bus path to a checkpoint</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>add_timeout</p></td>
-<td class="parameter_description"><p>the timeout in seconds counting from now.
-Set to zero, to disable the timeout.</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>cancellable</p></td>
-<td class="parameter_description"><p>a <a href="../gio/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>callback</p></td>
-<td class="parameter_description"><p>callback to be called when the add operation completes. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span></td>
-</tr>
-<tr>
-<td class="parameter_name"><p>user_data</p></td>
-<td class="parameter_description"><p>caller-specific data passed to <em class="parameter"><code>callback</code></em>
-. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="nm-client-checkpoint-adjust-rollback-timeout-finish"></a><h3>nm_client_checkpoint_adjust_rollback_timeout_finish ()</h3>
-<pre class="programlisting"><a href="../glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-nm_client_checkpoint_adjust_rollback_timeout_finish
-                               (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                <em class="parameter"><code><a href="../gio/GAsyncResult.html#GAsyncResult-struct"><span class="type">GAsyncResult</span></a> *result</code></em>,
-                                <em class="parameter"><code><a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Gets the result of a call to <a class="link" href="NMClient.html#nm-client-checkpoint-adjust-rollback-timeout" title="nm_client_checkpoint_adjust_rollback_timeout ()"><code class="function">nm_client_checkpoint_adjust_rollback_timeout()</code></a>.</p>
-<div class="refsect3">
-<a name="nm-client-checkpoint-adjust-rollback-timeout-finish.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>client</p></td>
-<td class="parameter_description"><p>an <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>result</p></td>
-<td class="parameter_description"><p>the result passed to the <a href="../gio/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>location for a <a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="nm-client-checkpoint-adjust-rollback-timeout-finish.returns"></a><h4>Returns</h4>
-<p> <a href="../glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success or <a href="../glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure.</p>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
 </div>
 <div class="refsect1">
 <a name="NMClient.other_details"></a><h2>Types and Values</h2>
@@ -4467,7 +3958,7 @@ likely to become the new <a class="link" href="NMClient.html#NMClient--primary-c
 <a name="NMClient--active-connections"></a><h3>The <code class="literal">“active-connections”</code> property</h3>
 <pre class="programlisting">  “active-connections”       <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>The active connections.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMActiveConnection)]</span></p>
+<p>Element-type: NMActiveConnection</p>
 <p>Flags: Read</p>
 </div>
 <hr>
@@ -4475,7 +3966,7 @@ likely to become the new <a class="link" href="NMClient.html#NMClient--primary-c
 <a name="NMClient--all-devices"></a><h3>The <code class="literal">“all-devices”</code> property</h3>
 <pre class="programlisting">  “all-devices”              <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>List of both real devices and device placeholders.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p>
+<p>Element-type: NMDevice</p>
 <p>Flags: Read</p>
 <p class="since">Since: 1.2</p>
 </div>
@@ -4489,22 +3980,13 @@ likely to become the new <a class="link" href="NMClient.html#NMClient--primary-c
 </div>
 <hr>
 <div class="refsect2">
-<a name="NMClient--checkpoints"></a><h3>The <code class="literal">“checkpoints”</code> property</h3>
-<pre class="programlisting">  “checkpoints”              <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
-<p>The list of active checkpoints.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMCheckpoint)]</span></p>
-<p>Flags: Read</p>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NMClient--connections"></a><h3>The <code class="literal">“connections”</code> property</h3>
 <pre class="programlisting">  “connections”              <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>The list of configured connections that are available to the user. (Note
 that this differs from the underlying D-Bus property, which may also
 contain the object paths of connections that the user does not have
 permission to read the details of.)</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMRemoteConnection)]</span></p>
+<p>Element-type: NMRemoteConnection</p>
 <p>Flags: Read</p>
 </div>
 <hr>
@@ -4534,7 +4016,7 @@ permission to read the details of.)</p>
 <a name="NMClient--devices"></a><h3>The <code class="literal">“devices”</code> property</h3>
 <pre class="programlisting">  “devices”                  <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>List of real network devices.  Does not include placeholder devices.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p>
+<p>Element-type: NMDevice</p>
 <p>Flags: Read</p>
 </div>
 <hr>
@@ -4548,7 +4030,6 @@ dictionaries.  Each dictionary has the "nameservers",
 relative priority, "interface" the interface on which these
 servers are contacted, "vpn" a boolean telling whether the
 configuration was obtained from a VPN connection.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(GVariant)]</span></p>
 <p>Flags: Read</p>
 <p class="since">Since: 1.6</p>
 </div>
diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html
index 67bfae88..ef3b0136 100644
--- a/docs/libnm/html/NMConnection.html
+++ b/docs/libnm/html/NMConnection.html
@@ -1123,7 +1123,7 @@ cannot be normalized, the connection will not be modified.</p>
 <td class="parameter_description"><p>a <a href="../glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> with
 normalization parameters to allow customization of the normalization by providing
 specific arguments. Unknown arguments will be ignored and the default will be
-used. The keys must be strings compared with <a href="../glib/glib-Hash-Tables.html#g-str-equal"><code class="function">g_str_equal()</code></a> function.
+used. The keys must be strings, hashed by <a href="../glib/glib-Hash-Tables.html#g-str-hash"><code class="function">g_str_hash()</code></a> and <a href="../glib/glib-Hash-Tables.html#g-str-equal"><code class="function">g_str_equal()</code></a> functions.
 The values are opaque and depend on the parameter name. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8 gpointer]</span></td>
 </tr>
@@ -2482,7 +2482,7 @@ nm_connection_get_setting_tc_config (<em class="parameter"><code><a class="link"
 <p>an <span class="type">NMSettingTCConfig</span> if the connection contains one, otherwise <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index 2de3b948..b58fcda5 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -2962,7 +2962,7 @@ nm_lldp_neighbor_get_attr_type (<em class="parameter"><code><a class="link" href
 <a name="NMDevice--available-connections"></a><h3>The <code class="literal">“available-connections”</code> property</h3>
 <pre class="programlisting">  “available-connections”    <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>The available connections of the device</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMRemoteConnection)]</span></p>
+<p>Element-type: NMRemoteConnection</p>
 <p>Flags: Read</p>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html
index 872e2358..e0f5cd27 100644
--- a/docs/libnm/html/NMDeviceBond.html
+++ b/docs/libnm/html/NMDeviceBond.html
@@ -273,7 +273,7 @@ copy used by the device, and must not be modified. </p>
 <a name="NMDeviceBond--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>The devices slaved to the bond device.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p>
+<p>Element-type: NMDevice</p>
 <p>Flags: Read</p>
 </div>
 </div>
diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html
index 5d366ac6..6936ca89 100644
--- a/docs/libnm/html/NMDeviceBridge.html
+++ b/docs/libnm/html/NMDeviceBridge.html
@@ -273,7 +273,7 @@ copy used by the device, and must not be modified. </p>
 <a name="NMDeviceBridge--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>The devices slaved to the bridge device.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p>
+<p>Element-type: NMDevice</p>
 <p>Flags: Read</p>
 </div>
 </div>
diff --git a/docs/libnm/html/NMDeviceIPTunnel.html b/docs/libnm/html/NMDeviceIPTunnel.html
index 83e6348a..c8807ffe 100644
--- a/docs/libnm/html/NMDeviceIPTunnel.html
+++ b/docs/libnm/html/NMDeviceIPTunnel.html
@@ -126,14 +126,6 @@
 <a class="link" href="NMDeviceIPTunnel.html#nm-device-ip-tunnel-get-flow-label" title="nm_device_ip_tunnel_get_flow_label ()">nm_device_ip_tunnel_get_flow_label</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
-<tr>
-<td class="function_type">
-<a class="link" href="NMSettingIPTunnel.html#NMIPTunnelFlags" title="enum NMIPTunnelFlags"><span class="returnvalue">NMIPTunnelFlags</span></a>
-</td>
-<td class="function_name">
-<a class="link" href="NMDeviceIPTunnel.html#nm-device-ip-tunnel-get-flags" title="nm_device_ip_tunnel_get_flags ()">nm_device_ip_tunnel_get_flags</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
 </tbody>
 </table></div>
 </div>
@@ -153,11 +145,6 @@
 </tr>
 <tr>
 <td class="property_type"><a href="../glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a></td>
-<td class="property_name"><a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--flags" title="The “flags” property">flags</a></td>
-<td class="property_flags">Read</td>
-</tr>
-<tr>
-<td class="property_type"><a href="../glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a></td>
 <td class="property_name"><a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--flow-label" title="The “flow-label” property">flow-label</a></td>
 <td class="property_flags">Read</td>
 </tr>
@@ -267,10 +254,6 @@
 <td class="function_name"><a class="link" href="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-FLOW-LABEL:CAPS" title="NM_DEVICE_IP_TUNNEL_FLOW_LABEL">NM_DEVICE_IP_TUNNEL_FLOW_LABEL</a></td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-FLAGS:CAPS" title="NM_DEVICE_IP_TUNNEL_FLAGS">NM_DEVICE_IP_TUNNEL_FLAGS</a></td>
-</tr>
-<tr>
 <td class="datatype_keyword"> </td>
 <td class="function_name"><a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel-struct" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a></td>
 </tr>
@@ -585,32 +568,6 @@ nm_device_ip_tunnel_get_flow_label (<em class="parameter"><code><a class="link"
 </div>
 <p class="since">Since: 1.2</p>
 </div>
-<hr>
-<div class="refsect2">
-<a name="nm-device-ip-tunnel-get-flags"></a><h3>nm_device_ip_tunnel_get_flags ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIPTunnel.html#NMIPTunnelFlags" title="enum NMIPTunnelFlags"><span class="returnvalue">NMIPTunnelFlags</span></a>
-nm_device_ip_tunnel_get_flags (<em class="parameter"><code><a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel"><span class="type">NMDeviceIPTunnel</span></a> *device</code></em>);</pre>
-<div class="refsect3">
-<a name="nm-device-ip-tunnel-get-flags.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody><tr>
-<td class="parameter_name"><p>device</p></td>
-<td class="parameter_description"><p>a <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel"><span class="type">NMDeviceIPTunnel</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr></tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="nm-device-ip-tunnel-get-flags.returns"></a><h4>Returns</h4>
-<p> the tunnel flags</p>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceIPTunnel.other_details"></a><h2>Types and Values</h2>
@@ -681,12 +638,6 @@ nm_device_ip_tunnel_get_flags (<em class="parameter"><code><a class="link" href=
 </div>
 <hr>
 <div class="refsect2">
-<a name="NM-DEVICE-IP-TUNNEL-FLAGS:CAPS"></a><h3>NM_DEVICE_IP_TUNNEL_FLAGS</h3>
-<pre class="programlisting">#define NM_DEVICE_IP_TUNNEL_FLAGS               "flags"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NMDeviceIPTunnel-struct"></a><h3>NMDeviceIPTunnel</h3>
 <pre class="programlisting">typedef struct _NMDeviceIPTunnel NMDeviceIPTunnel;</pre>
 </div>
@@ -705,15 +656,6 @@ tunnels.</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NMDeviceIPTunnel--flags"></a><h3>The <code class="literal">“flags”</code> property</h3>
-<pre class="programlisting">  “flags”                    <a href="../glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a></pre>
-<p>Tunnel flags.</p>
-<p>Flags: Read</p>
-<p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NMDeviceIPTunnel--flow-label"></a><h3>The <code class="literal">“flow-label”</code> property</h3>
 <pre class="programlisting">  “flow-label”               <a href="../glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a></pre>
 <p>The flow label to assign to tunnel packets. This property
diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html
index ccd6e47a..d4b1a6e4 100644
--- a/docs/libnm/html/NMDeviceTeam.html
+++ b/docs/libnm/html/NMDeviceTeam.html
@@ -333,7 +333,7 @@ device, and must not be modified.</p>
 <a name="NMDeviceTeam--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>The devices enslaved to the team device.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p>
+<p>Element-type: NMDevice</p>
 <p>Flags: Read</p>
 </div>
 </div>
diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html
index 252037e9..eacae65f 100644
--- a/docs/libnm/html/NMDeviceWifi.html
+++ b/docs/libnm/html/NMDeviceWifi.html
@@ -816,7 +816,7 @@ set.</p>
 <a name="NMDeviceWifi--access-points"></a><h3>The <code class="literal">“access-points”</code> property</h3>
 <pre class="programlisting">  “access-points”            <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>List of all Wi-Fi access points the device can see.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMAccessPoint)]</span></p>
+<p>Element-type: NMAccessPoint</p>
 <p>Flags: Read</p>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMDeviceWimax.html b/docs/libnm/html/NMDeviceWimax.html
index 6799ddd6..2cb66cbe 100644
--- a/docs/libnm/html/NMDeviceWimax.html
+++ b/docs/libnm/html/NMDeviceWimax.html
@@ -677,7 +677,7 @@ meaning when the device is not connected.</p>
 <a name="NMDeviceWimax--nsps"></a><h3>The <code class="literal">“nsps”</code> property</h3>
 <pre class="programlisting">  “nsps”                     <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>List of all WiMAX Network Service Providers the device can see.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMWimaxNsp)]</span></p>
+<p>Element-type: NMWimaxNsp</p>
 <p>Flags: Read</p>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMDhcpConfig.html b/docs/libnm/html/NMDhcpConfig.html
index 16794a9a..495070c0 100644
--- a/docs/libnm/html/NMDhcpConfig.html
+++ b/docs/libnm/html/NMDhcpConfig.html
@@ -257,6 +257,8 @@ configuration, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMDhcpConfig--options"></a><h3>The <code class="literal">“options”</code> property</h3>
 <pre class="programlisting">  “options”                  <a href="../glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *</pre>
+<p>The <a href="../glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> containing options of the configuration.</p>
+<p>Type: GLib.HashTable(utf8,utf8)</p>
 <p>Flags: Read</p>
 </div>
 </div>
diff --git a/docs/libnm/html/NMIPConfig.html b/docs/libnm/html/NMIPConfig.html
index 5948b14c..b62bc639 100644
--- a/docs/libnm/html/NMIPConfig.html
+++ b/docs/libnm/html/NMIPConfig.html
@@ -549,7 +549,6 @@ nm_ip_config_get_wins_servers (<em class="parameter"><code><a class="link" href=
 <a name="NMIPConfig--routes"></a><h3>The <code class="literal">“routes”</code> property</h3>
 <pre class="programlisting">  “routes”                   <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>A <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the routes (<a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a>) of the configuration.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMIPRoute)]</span></p>
 <p>Flags: Read</p>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMObject.html b/docs/libnm/html/NMObject.html
index b901f314..e8a18ec8 100644
--- a/docs/libnm/html/NMObject.html
+++ b/docs/libnm/html/NMObject.html
@@ -119,7 +119,6 @@
     <span class="lineart">╰──</span> NMObject
         <span class="lineart">├──</span> <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
         <span class="lineart">├──</span> <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
-        <span class="lineart">├──</span> NMCheckpoint
         <span class="lineart">├──</span> <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
         <span class="lineart">├──</span> <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig">NMDhcpConfig</a>
         <span class="lineart">├──</span> <a class="link" href="NMIPConfig.html" title="NMIPConfig">NMIPConfig</a>
diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html
index cc4b7999..6cd6e6dd 100644
--- a/docs/libnm/html/NMRemoteConnection.html
+++ b/docs/libnm/html/NMRemoteConnection.html
@@ -164,14 +164,6 @@
 </tr>
 <tr>
 <td class="function_type">
-<a class="link" href="libnm-nm-dbus-interface.html#NMSettingsConnectionFlags" title="enum NMSettingsConnectionFlags"><span class="returnvalue">NMSettingsConnectionFlags</span></a>
-</td>
-<td class="function_name">
-<a class="link" href="NMRemoteConnection.html#nm-remote-connection-get-flags" title="nm_remote_connection_get_flags ()">nm_remote_connection_get_flags</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
-<tr>
-<td class="function_type">
 <a href="../glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
@@ -191,11 +183,6 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="property_type"><a href="../glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a></td>
-<td class="property_name"><a class="link" href="NMRemoteConnection.html#NMRemoteConnection--flags" title="The “flags” property">flags</a></td>
-<td class="property_flags">Read</td>
-</tr>
-<tr>
 <td class="property_type"><a href="../glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
 <td class="property_name"><a class="link" href="NMRemoteConnection.html#NMRemoteConnection--unsaved" title="The “unsaved” property">unsaved</a></td>
 <td class="property_flags">Read</td>
@@ -230,10 +217,6 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMRemoteConnection.html#NM-REMOTE-CONNECTION-FLAGS:CAPS" title="NM_REMOTE_CONNECTION_FLAGS">NM_REMOTE_CONNECTION_FLAGS</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMRemoteConnection.html#NM-REMOTE-CONNECTION-VISIBLE:CAPS" title="NM_REMOTE_CONNECTION_VISIBLE">NM_REMOTE_CONNECTION_VISIBLE</a></td>
 </tr>
 <tr>
@@ -320,7 +303,7 @@ nm_remote_connection_update2 (<em class="parameter"><code><a class="link" href="
 </tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -935,32 +918,6 @@ representation.</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-remote-connection-get-flags"></a><h3>nm_remote_connection_get_flags ()</h3>
-<pre class="programlisting"><a class="link" href="libnm-nm-dbus-interface.html#NMSettingsConnectionFlags" title="enum NMSettingsConnectionFlags"><span class="returnvalue">NMSettingsConnectionFlags</span></a>
-nm_remote_connection_get_flags (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>);</pre>
-<div class="refsect3">
-<a name="nm-remote-connection-get-flags.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody><tr>
-<td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr></tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="nm-remote-connection-get-flags.returns"></a><h4>Returns</h4>
-<p> the flags of the connection of type <a class="link" href="libnm-nm-dbus-interface.html#NMSettingsConnectionFlags" title="enum NMSettingsConnectionFlags"><span class="type">NMSettingsConnectionFlags</span></a>.</p>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
 <a name="nm-remote-connection-get-visible"></a><h3>nm_remote_connection_get_visible ()</h3>
 <pre class="programlisting"><a href="../glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_remote_connection_get_visible (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>);</pre>
@@ -1015,12 +972,6 @@ user, <a href="../glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="litera
 </div>
 <hr>
 <div class="refsect2">
-<a name="NM-REMOTE-CONNECTION-FLAGS:CAPS"></a><h3>NM_REMOTE_CONNECTION_FLAGS</h3>
-<pre class="programlisting">#define NM_REMOTE_CONNECTION_FLAGS           "flags"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NM-REMOTE-CONNECTION-VISIBLE:CAPS"></a><h3>NM_REMOTE_CONNECTION_VISIBLE</h3>
 <pre class="programlisting">#define NM_REMOTE_CONNECTION_VISIBLE         "visible"
 </pre>
@@ -1034,16 +985,6 @@ user, <a href="../glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="litera
 <div class="refsect1">
 <a name="NMRemoteConnection.property-details"></a><h2>Property Details</h2>
 <div class="refsect2">
-<a name="NMRemoteConnection--flags"></a><h3>The <code class="literal">“flags”</code> property</h3>
-<pre class="programlisting">  “flags”                    <a href="../glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a></pre>
-<p>The flags of the connection as unsigned integer. The values
-correspond to the <a class="link" href="libnm-nm-dbus-interface.html#NMSettingsConnectionFlags" title="enum NMSettingsConnectionFlags"><span class="type">NMSettingsConnectionFlags</span></a> enum.</p>
-<p>Flags: Read</p>
-<p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NMRemoteConnection--unsaved"></a><h3>The <code class="literal">“unsaved”</code> property</h3>
 <pre class="programlisting">  “unsaved”                  <a href="../glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
 <p><a href="../glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the remote connection contains changes that have not been saved
diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html
index 81801e6d..b7625a37 100644
--- a/docs/libnm/html/NMSecretAgentOld.html
+++ b/docs/libnm/html/NMSecretAgentOld.html
@@ -722,6 +722,63 @@ nm_secret_agent_old_get_secrets (<em class="parameter"><code><a class="link" hre
                                  <em class="parameter"><code><a class="link" href="libnm-nm-dbus-interface.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags"><span class="type">NMSecretAgentGetSecretsFlags</span></a> flags</code></em>,
                                  <em class="parameter"><code><a class="link" href="NMSecretAgentOld.html#NMSecretAgentOldGetSecretsFunc" title="NMSecretAgentOldGetSecretsFunc ()"><span class="type">NMSecretAgentOldGetSecretsFunc</span></a> callback</code></em>,
                                  <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>Asynchronously retrieves secrets belonging to <em class="parameter"><code>connection</code></em>
+ for the
+setting <em class="parameter"><code>setting_name</code></em>
+.  <em class="parameter"><code>flags</code></em>
+ indicate specific behavior that the secret
+agent should use when performing the request, for example returning only
+existing secrets without user interaction, or requesting entirely new
+secrets from the user.</p>
+<p>Virtual: get_secrets</p>
+<div class="refsect3">
+<a name="nm-secret-agent-old-get-secrets.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>connection</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> for which we're asked secrets</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>setting_name</p></td>
+<td class="parameter_description"><p>the name of the secret setting</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>hints</p></td>
+<td class="parameter_description"><p>hints to the agent. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> zero-terminated=1]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>flags</p></td>
+<td class="parameter_description"><p>flags that modify the behavior of the request</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>callback</p></td>
+<td class="parameter_description"><p>a callback, to be invoked when the operation is done. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>caller-specific data to be passed to <em class="parameter"><code>callback</code></em>
+. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -731,6 +788,43 @@ nm_secret_agent_old_save_secrets (<em class="parameter"><code><a class="link" hr
                                   <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="NMSecretAgentOld.html#NMSecretAgentOldSaveSecretsFunc" title="NMSecretAgentOldSaveSecretsFunc ()"><span class="type">NMSecretAgentOldSaveSecretsFunc</span></a> callback</code></em>,
                                   <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>Asynchronously ensures that all secrets inside <em class="parameter"><code>connection</code></em>
+ are stored to
+disk.</p>
+<p>Virtual: save_secrets</p>
+<div class="refsect3">
+<a name="nm-secret-agent-old-save-secrets.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>connection</p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>callback</p></td>
+<td class="parameter_description"><p>a callback, to be invoked when the operation is done. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>caller-specific data to be passed to <em class="parameter"><code>callback</code></em>
+. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -740,6 +834,43 @@ nm_secret_agent_old_delete_secrets (<em class="parameter"><code><a class="link"
                                     <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="NMSecretAgentOld.html#NMSecretAgentOldDeleteSecretsFunc" title="NMSecretAgentOldDeleteSecretsFunc ()"><span class="type">NMSecretAgentOldDeleteSecretsFunc</span></a> callback</code></em>,
                                     <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>Asynchronously asks the agent to delete all saved secrets belonging to
+<em class="parameter"><code>connection</code></em>
+.</p>
+<p>Virtual: delete_secrets</p>
+<div class="refsect3">
+<a name="nm-secret-agent-old-delete-secrets.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>connection</p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>callback</p></td>
+<td class="parameter_description"><p>a callback, to be invoked when the operation is done. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>caller-specific data to be passed to <em class="parameter"><code>callback</code></em>
+. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
 </div>
 </div>
 <div class="refsect1">
diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html
index e4284e3f..d64629ac 100644
--- a/docs/libnm/html/NMSettingBond.html
+++ b/docs/libnm/html/NMSettingBond.html
@@ -782,6 +782,10 @@ the <a class="link" href="NMSettingBond.html#NMSettingBond--options" title="The
 <div class="refsect2">
 <a name="NMSettingBond--options"></a><h3>The <code class="literal">“options”</code> property</h3>
 <pre class="programlisting">  “options”                  <a href="../glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *</pre>
+<p>Dictionary of key/value pairs of bonding options.  Both keys and values
+must be strings. Option names must contain only alphanumeric characters
+(ie, [a-zA-Z0-9]).</p>
+<p>Type: GHashTable(utf8,utf8)</p>
 <p>Flags: Read / Write</p>
 </div>
 </div>
diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html
index 116589b0..5644cae1 100644
--- a/docs/libnm/html/NMSettingBridge.html
+++ b/docs/libnm/html/NMSettingBridge.html
@@ -613,10 +613,6 @@ referred instead to generate the initial MAC address. Note that setting
 "ethernet.cloned-mac-address" anyway overwrites the MAC address of
 the bridge later while activating the bridge. Hence, this property
 is deprecated.</p>
-<div class="warning">
-<p><code class="literal">NMSettingBridge:mac-address</code> has been deprecated since version 1.12 and should not be used in newly-written code.</p>
-<p>Use the ethernet.cloned-mac-address property instead.</p>
-</div>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index 6fbb0b5f..36f687c3 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -280,14 +280,6 @@
 <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-auth-retries" title="nm_setting_connection_get_auth_retries ()">nm_setting_connection_get_auth_retries</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
-<tr>
-<td class="function_type">
-<a class="link" href="NMSettingConnection.html#NMSettingConnectionMdns" title="enum NMSettingConnectionMdns"><span class="returnvalue">NMSettingConnectionMdns</span></a>
-</td>
-<td class="function_name">
-<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-mdns" title="nm_setting_connection_get_mdns ()">nm_setting_connection_get_mdns</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
 </tbody>
 </table></div>
 </div>
@@ -354,11 +346,6 @@
 <td class="property_flags">Read / Write</td>
 </tr>
 <tr>
-<td class="property_type"><a href="../glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingConnection.html#NMSettingConnection--mdns" title="The “mdns” property">mdns</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
 <td class="property_type"><a class="link" href="libnm-nm-dbus-interface.html#NMMetered" title="enum NMMetered"><span class="type">NMMetered</span></a></td>
 <td class="property_name"><a class="link" href="NMSettingConnection.html#NMSettingConnection--metered" title="The “metered” property">metered</a></td>
 <td class="property_flags">Read / Write</td>
@@ -521,10 +508,6 @@
 <td class="function_name"><a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTH-RETRIES:CAPS" title="NM_SETTING_CONNECTION_AUTH_RETRIES">NM_SETTING_CONNECTION_AUTH_RETRIES</a></td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-MDNS:CAPS" title="NM_SETTING_CONNECTION_MDNS">NM_SETTING_CONNECTION_MDNS</a></td>
-</tr>
-<tr>
 <td class="datatype_keyword">enum</td>
 <td class="function_name"><a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves">NMSettingConnectionAutoconnectSlaves</a></td>
 </tr>
@@ -533,10 +516,6 @@
 <td class="function_name"><a class="link" href="NMSettingConnection.html#NMSettingConnectionLldp" title="enum NMSettingConnectionLldp">NMSettingConnectionLldp</a></td>
 </tr>
 <tr>
-<td class="datatype_keyword">enum</td>
-<td class="function_name"><a class="link" href="NMSettingConnection.html#NMSettingConnectionMdns" title="enum NMSettingConnectionMdns">NMSettingConnectionMdns</a></td>
-</tr>
-<tr>
 <td class="datatype_keyword"> </td>
 <td class="function_name"><a class="link" href="NMSettingConnection.html#NMSettingConnection-struct" title="NMSettingConnection">NMSettingConnection</a></td>
 </tr>
@@ -547,8 +526,7 @@
 <a name="NMSettingConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
     <span class="lineart">├──</span> NMSettingConnectionAutoconnectSlaves
-    <span class="lineart">├──</span> NMSettingConnectionLldp
-    <span class="lineart">╰──</span> NMSettingConnectionMdns
+    <span class="lineart">╰──</span> NMSettingConnectionLldp
     <a href="../gobject/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
         <span class="lineart">╰──</span> NMSettingConnection
@@ -1515,32 +1493,6 @@ infinity and -1 means a global default value.</p>
 </div>
 <p class="since">Since: 1.10</p>
 </div>
-<hr>
-<div class="refsect2">
-<a name="nm-setting-connection-get-mdns"></a><h3>nm_setting_connection_get_mdns ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingConnection.html#NMSettingConnectionMdns" title="enum NMSettingConnectionMdns"><span class="returnvalue">NMSettingConnectionMdns</span></a>
-nm_setting_connection_get_mdns (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
-<div class="refsect3">
-<a name="nm-setting-connection-get-mdns.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody><tr>
-<td class="parameter_name"><p>setting</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr></tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="nm-setting-connection-get-mdns.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="NMSettingConnection.html#NMSettingConnection--mdns" title="The “mdns” property"><span class="type">“mdns”</span></a> property of the setting.</p>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingConnection.other_details"></a><h2>Types and Values</h2>
@@ -1689,12 +1641,6 @@ nm_setting_connection_get_mdns (<em class="parameter"><code><a class="link" href
 </div>
 <hr>
 <div class="refsect2">
-<a name="NM-SETTING-CONNECTION-MDNS:CAPS"></a><h3>NM_SETTING_CONNECTION_MDNS</h3>
-<pre class="programlisting">#define NM_SETTING_CONNECTION_MDNS           "mdns"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NMSettingConnectionAutoconnectSlaves"></a><h3>enum NMSettingConnectionAutoconnectSlaves</h3>
 <p><a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves"><span class="type">NMSettingConnectionAutoconnectSlaves</span></a> values indicate whether slave connections
 should be activated when master is activated.</p>
@@ -1774,52 +1720,6 @@ should be activated when master is activated.</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NMSettingConnectionMdns"></a><h3>enum NMSettingConnectionMdns</h3>
-<p><a class="link" href="NMSettingConnection.html#NMSettingConnectionMdns" title="enum NMSettingConnectionMdns"><span class="type">NMSettingConnectionMdns</span></a> values indicate whether mDNS should be enabled.</p>
-<div class="refsect3">
-<a name="NMSettingConnectionMdns.members"></a><h4>Members</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="300px" class="enum_members_name">
-<col class="enum_members_description">
-<col width="200px" class="enum_members_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTING-CONNECTION-MDNS-DEFAULT:CAPS"></a>NM_SETTING_CONNECTION_MDNS_DEFAULT</p></td>
-<td class="enum_member_description">
-<p>default value</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTING-CONNECTION-MDNS-NO:CAPS"></a>NM_SETTING_CONNECTION_MDNS_NO</p></td>
-<td class="enum_member_description">
-<p>disable mDNS</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTING-CONNECTION-MDNS-RESOLVE:CAPS"></a>NM_SETTING_CONNECTION_MDNS_RESOLVE</p></td>
-<td class="enum_member_description">
-<p>support only resolving, do not register hostname</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTING-CONNECTION-MDNS-YES:CAPS"></a>NM_SETTING_CONNECTION_MDNS_YES</p></td>
-<td class="enum_member_description">
-<p>enable mDNS</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NMSettingConnection-struct"></a><h3>NMSettingConnection</h3>
 <pre class="programlisting">typedef struct _NMSettingConnection NMSettingConnection;</pre>
 <p>General Connection Profile Settings</p>
@@ -1847,9 +1747,6 @@ retries for 3 times before failing the connection.</p>
 NetworkManager when the resources for the connection are available.
 <a href="../glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to automatically activate the connection, <a href="../glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> to require manual
 intervention to activate the connection.</p>
-<p>Note that autoconnect is not implemented for VPN profiles. See
-<a class="link" href="NMSettingConnection.html#NMSettingConnection--secondaries" title="The “secondaries” property"><span class="type">“secondaries”</span></a> as an alternative to automatically
-connect VPN profiles.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
@@ -1883,9 +1780,7 @@ to autoconnect again.</p>
 <pre class="programlisting">  “autoconnect-slaves”       <a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves"><span class="type">NMSettingConnectionAutoconnectSlaves</span></a></pre>
 <p>Whether or not slaves of this connection should be automatically brought up
 when NetworkManager activates this connection. This only has a real effect
-for master connections. The properties <a class="link" href="NMSettingConnection.html#NMSettingConnection--autoconnect" title="The “autoconnect” property"><span class="type">“autoconnect”</span></a>,
-<a class="link" href="NMSettingConnection.html#NMSettingConnection--autoconnect-priority" title="The “autoconnect-priority” property"><span class="type">“autoconnect-priority”</span></a> and <a class="link" href="NMSettingConnection.html#NMSettingConnection--autoconnect-retries" title="The “autoconnect-retries” property"><span class="type">“autoconnect-retries”</span></a>
-are unrelated to this setting.
+for master connections.
 The permitted values are: 0: leave slave connections untouched,
 1: activate all the slave connections with this connection, -1: default.
 If -1 (default) is set, global connection.autoconnect-slaves is read to
@@ -1948,22 +1843,6 @@ connection may be applied to the wrong interface.</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NMSettingConnection--mdns"></a><h3>The <code class="literal">“mdns”</code> property</h3>
-<pre class="programlisting">  “mdns”                     <a href="../glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></pre>
-<p>Whether mDNS is enabled for the connection.</p>
-<p>The permitted values are: yes: register hostname and resolving
-for the connection, no: disable mDNS for the interface, resolve:
-do not register hostname but allow resolving of mDNS host names.
-When updating this property on a currently activated connection,
-the change takes effect immediately.</p>
-<p>This feature requires a plugin which supports mDNS. One such
-plugin is dns-systemd-resolved.</p>
-<p>Flags: Read / Write</p>
-<p>Default value: -1</p>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NMSettingConnection--metered"></a><h3>The <code class="literal">“metered”</code> property</h3>
 <pre class="programlisting">  “metered”                  <a class="link" href="libnm-nm-dbus-interface.html#NMMetered" title="enum NMMetered"><span class="type">NMMetered</span></a></pre>
 <p>Whether the connection is metered.</p>
@@ -2027,11 +1906,10 @@ slave.</p>
 <p>The stable-id is used for generating IPv6 stable private addresses
 with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the
 generated cloned MAC address for ethernet.cloned-mac-address=stable
-and wifi.cloned-mac-address=stable. It is also used as DHCP client
-identifier with ipv4.dhcp-client-id=stable.</p>
-<p>Note that also the interface name of the activating connection and a
-per-host secret key is included into the address generation so that the
-same stable-id on different hosts/devices yields different addresses.</p>
+and wifi.cloned-mac-address=stable. Note that also the interface name
+of the activating connection and a per-host secret key is included
+into the address generation so that the same stable-id on different
+hosts/devices yields different addresses.</p>
 <p>If the value is unset, an ID unique for the connection is used.
 Specifying a stable-id allows multiple connections to generate the
 same addresses. Another use is to generate IDs at runtime via
diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html
index 44373e30..f7560b20 100644
--- a/docs/libnm/html/NMSettingDcb.html
+++ b/docs/libnm/html/NMSettingDcb.html
@@ -1328,7 +1328,7 @@ Priority (0 - 7) and the value indicates the percentage of bandwidth of
 the priority's assigned group that the priority may use.  The sum of all
 percentages for priorities which belong to the same group must total 100
 percents.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GArray(guint)]</span></p>
+<p>Element-type: guint</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
@@ -1338,7 +1338,7 @@ percents.</p>
 <p>An array of 8 boolean values, where the array index corresponds to the User
 Priority (0 - 7) and the value indicates whether or not the corresponding
 priority should transmit priority pause.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GArray(gboolean)]</span></p>
+<p>Element-type: gboolean</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
@@ -1358,7 +1358,7 @@ Flags may be any combination of <a class="link" href="NMSettingDcb.html#NM-SETTI
 Priority Group ID (0 - 7) and the value indicates the percentage of link
 bandwidth allocated to that group.  Allowed values are 0 - 100, and the
 sum of all values must total 100 percents.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GArray(guint)]</span></p>
+<p>Element-type: guint</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
@@ -1377,7 +1377,7 @@ any combination of <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-E
 <p>An array of 8 uint values, where the array index corresponds to the User
 Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed
 Priority Group ID values are 0 - 7 or 15 for the unrestricted group.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GArray(guint)]</span></p>
+<p>Element-type: guint</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
@@ -1387,7 +1387,7 @@ Priority Group ID values are 0 - 7 or 15 for the unrestricted group.</p>
 <p>An array of 8 boolean values, where the array index corresponds to the User
 Priority (0 - 7) and the value indicates whether or not the priority may
 use all of the bandwidth allocated to its assigned group.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GArray(gboolean)]</span></p>
+<p>Element-type: gboolean</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
@@ -1397,7 +1397,7 @@ use all of the bandwidth allocated to its assigned group.</p>
 <p>An array of 8 uint values, where the array index corresponds to the User
 Priority (0 - 7) and the value indicates the traffic class (0 - 7) to
 which the priority is mapped.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GArray(guint)]</span></p>
+<p>Element-type: guint</p>
 <p>Flags: Read / Write</p>
 </div>
 </div>
diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html
index b26150c1..4bd8df58 100644
--- a/docs/libnm/html/NMSettingIP4Config.html
+++ b/docs/libnm/html/NMSettingIP4Config.html
@@ -319,14 +319,6 @@ an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet
 ARP type and the rest is a MAC address).
 If the property is not a hex string it is considered as a
 non-hardware-address client ID and the 'type' field is set to 0.</p>
-<p>The special values "mac" and "perm-mac" are supported, which use the
-current or permanent MAC address of the device to generate a client identifier
-with type ethernet type (01). Currently, these options only work for ethernet
-type of links.</p>
-<p>The special value "stable" is supported to generate a type 0 client identifier based
-on the stable-id (see connection.stable-id).</p>
-<p>If unset, a globally configured default is used. If still unset, the
-client-id from the last lease is reused.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index 63e0b785..5fe47818 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -840,10 +840,6 @@
 <tbody>
 <tr>
 <td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ADDRESS-ATTRIBUTE-LABEL:CAPS" title="NM_IP_ADDRESS_ATTRIBUTE_LABEL">NM_IP_ADDRESS_ATTRIBUTE_LABEL</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-TABLE:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_TABLE">NM_IP_ROUTE_ATTRIBUTE_TABLE</a></td>
 </tr>
 <tr>
@@ -3836,12 +3832,6 @@ the particular kind of device.</p>
 <div class="refsect1">
 <a name="NMSettingIPConfig.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
-<a name="NM-IP-ADDRESS-ATTRIBUTE-LABEL:CAPS"></a><h3>NM_IP_ADDRESS_ATTRIBUTE_LABEL</h3>
-<pre class="programlisting">#define NM_IP_ADDRESS_ATTRIBUTE_LABEL        "label"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NM-IP-ROUTE-ATTRIBUTE-TABLE:CAPS"></a><h3>NM_IP_ROUTE_ATTRIBUTE_TABLE</h3>
 <pre class="programlisting">#define NM_IP_ROUTE_ATTRIBUTE_TABLE          "table"
 </pre>
@@ -4146,7 +4136,7 @@ the particular kind of device.</p>
 <a name="NMSettingIPConfig--addresses"></a><h3>The <code class="literal">“addresses”</code> property</h3>
 <pre class="programlisting">  “addresses”                <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>Array of IP addresses.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMIPAddress)]</span></p>
+<p>Element-Type: NMIPAddress</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
@@ -4157,9 +4147,8 @@ the particular kind of device.</p>
 addresses on the network.  If an address conflict is detected, the
 activation will fail.  A zero value means that no duplicate address
 detection is performed, -1 means the default value (either configuration
-ipvx.dad-timeout override or zero).  A value greater than zero is a
+ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a
 timeout in milliseconds.</p>
-<p>The property is currently implemented only for IPv4.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [-1,30000]</p>
 <p>Default value: -1</p>
@@ -4243,10 +4232,7 @@ value will be used.</p>
 <div class="refsect2">
 <a name="NMSettingIPConfig--dns-search"></a><h3>The <code class="literal">“dns-search”</code> property</h3>
 <pre class="programlisting">  “dns-search”               <a href="../glib/glib-String-Utility-Functions.html#GStrv"><span class="type">GStrv</span></a></pre>
-<p>Array of DNS search domains. Domains starting with a tilde ('~')
-are considered 'routing' domains and are used only to decide the
-interface over which a query must be forwarded; they are not used
-to complete unqualified host names.</p>
+<p>Array of DNS search domains.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
@@ -4367,7 +4353,7 @@ of NetworkManager.</p>
 <a name="NMSettingIPConfig--routes"></a><h3>The <code class="literal">“routes”</code> property</h3>
 <pre class="programlisting">  “routes”                   <a href="../glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
 <p>Array of IP routes.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMIPRoute)]</span></p>
+<p>Element-Type: NMIPRoute</p>
 <p>Flags: Read / Write</p>
 </div>
 </div>
diff --git a/docs/libnm/html/NMSettingIPTunnel.html b/docs/libnm/html/NMSettingIPTunnel.html
index 093a8cf5..e8bb273c 100644
--- a/docs/libnm/html/NMSettingIPTunnel.html
+++ b/docs/libnm/html/NMSettingIPTunnel.html
@@ -140,14 +140,6 @@
 <a class="link" href="NMSettingIPTunnel.html#nm-setting-ip-tunnel-get-mtu" title="nm_setting_ip_tunnel_get_mtu ()">nm_setting_ip_tunnel_get_mtu</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
-<tr>
-<td class="function_type">
-<a class="link" href="NMSettingIPTunnel.html#NMIPTunnelFlags" title="enum NMIPTunnelFlags"><span class="returnvalue">NMIPTunnelFlags</span></a>
-</td>
-<td class="function_name">
-<a class="link" href="NMSettingIPTunnel.html#nm-setting-ip-tunnel-get-flags" title="nm_setting_ip_tunnel_get_flags ()">nm_setting_ip_tunnel_get_flags</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
 </tbody>
 </table></div>
 </div>
@@ -167,11 +159,6 @@
 </tr>
 <tr>
 <td class="property_type"><a href="../glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPTunnel.html#NMSettingIPTunnel--flags" title="The “flags” property">flags</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><a href="../glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a></td>
 <td class="property_name"><a class="link" href="NMSettingIPTunnel.html#NMSettingIPTunnel--flow-label" title="The “flow-label” property">flow-label</a></td>
 <td class="property_flags">Read / Write / Construct</td>
 </tr>
@@ -294,25 +281,15 @@
 <td class="function_name"><a class="link" href="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-MTU:CAPS" title="NM_SETTING_IP_TUNNEL_MTU">NM_SETTING_IP_TUNNEL_MTU</a></td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-FLAGS:CAPS" title="NM_SETTING_IP_TUNNEL_FLAGS">NM_SETTING_IP_TUNNEL_FLAGS</a></td>
-</tr>
-<tr>
 <td class="datatype_keyword"> </td>
 <td class="function_name"><a class="link" href="NMSettingIPTunnel.html#NMSettingIPTunnel-struct" title="NMSettingIPTunnel">NMSettingIPTunnel</a></td>
 </tr>
-<tr>
-<td class="datatype_keyword">enum</td>
-<td class="function_name"><a class="link" href="NMSettingIPTunnel.html#NMIPTunnelFlags" title="enum NMIPTunnelFlags">NMIPTunnelFlags</a></td>
-</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMSettingIPTunnel.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
-    <span class="lineart">╰──</span> NMIPTunnelFlags
-    <a href="../gobject/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
+<pre class="screen">    <a href="../gobject/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
         <span class="lineart">╰──</span> NMSettingIPTunnel
 </pre>
@@ -660,12 +637,6 @@ nm_setting_ip_tunnel_get_mtu (<em class="parameter"><code><a class="link" href="
 </div>
 <p class="since">Since: 1.2</p>
 </div>
-<hr>
-<div class="refsect2">
-<a name="nm-setting-ip-tunnel-get-flags"></a><h3>nm_setting_ip_tunnel_get_flags ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIPTunnel.html#NMIPTunnelFlags" title="enum NMIPTunnelFlags"><span class="returnvalue">NMIPTunnelFlags</span></a>
-nm_setting_ip_tunnel_get_flags (<em class="parameter"><code><a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel"><span class="type">NMSettingIPTunnel</span></a> *setting</code></em>);</pre>
-</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingIPTunnel.other_details"></a><h2>Types and Values</h2>
@@ -748,67 +719,10 @@ nm_setting_ip_tunnel_get_flags (<em class="parameter"><code><a class="link" href
 </div>
 <hr>
 <div class="refsect2">
-<a name="NM-SETTING-IP-TUNNEL-FLAGS:CAPS"></a><h3>NM_SETTING_IP_TUNNEL_FLAGS</h3>
-<pre class="programlisting">#define NM_SETTING_IP_TUNNEL_FLAGS               "flags"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NMSettingIPTunnel-struct"></a><h3>NMSettingIPTunnel</h3>
 <pre class="programlisting">typedef struct _NMSettingIPTunnel NMSettingIPTunnel;</pre>
 <p>IP Tunneling Settings</p>
 </div>
-<hr>
-<div class="refsect2">
-<a name="NMIPTunnelFlags"></a><h3>enum NMIPTunnelFlags</h3>
-<div class="refsect3">
-<a name="NMIPTunnelFlags.members"></a><h4>Members</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="300px" class="enum_members_name">
-<col class="enum_members_description">
-<col width="200px" class="enum_members_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="enum_member_name"><p><a name="NM-IP-TUNNEL-FLAG-NONE:CAPS"></a>NM_IP_TUNNEL_FLAG_NONE</p></td>
-<td> </td>
-<td> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-IP-TUNNEL-FLAG-IP6-IGN-ENCAP-LIMIT:CAPS"></a>NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT</p></td>
-<td> </td>
-<td> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-IP-TUNNEL-FLAG-IP6-USE-ORIG-TCLASS:CAPS"></a>NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS</p></td>
-<td> </td>
-<td> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-IP-TUNNEL-FLAG-IP6-USE-ORIG-FLOWLABEL:CAPS"></a>NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL</p></td>
-<td> </td>
-<td> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-IP-TUNNEL-FLAG-IP6-MIP6-DEV:CAPS"></a>NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV</p></td>
-<td> </td>
-<td> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-IP-TUNNEL-FLAG-IP6-RCV-DSCP-COPY:CAPS"></a>NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY</p></td>
-<td> </td>
-<td> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-IP-TUNNEL-FLAG-IP6-USE-ORIG-FWMARK:CAPS"></a>NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK</p></td>
-<td> </td>
-<td> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingIPTunnel.property-details"></a><h2>Property Details</h2>
@@ -824,19 +738,6 @@ to packets. This property applies only to IPv6 tunnels.</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NMSettingIPTunnel--flags"></a><h3>The <code class="literal">“flags”</code> property</h3>
-<pre class="programlisting">  “flags”                    <a href="../glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a></pre>
-<p>Tunnel flags. Currently the following values are supported:
-<a class="link" href="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-IGN-ENCAP-LIMIT:CAPS"><code class="literal">NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT</code></a>, <a class="link" href="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-USE-ORIG-TCLASS:CAPS"><code class="literal">NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS</code></a>,
-<a class="link" href="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-USE-ORIG-FLOWLABEL:CAPS"><code class="literal">NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL</code></a>, <a class="link" href="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-MIP6-DEV:CAPS"><code class="literal">NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV</code></a>,
-<a class="link" href="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-RCV-DSCP-COPY:CAPS"><code class="literal">NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY</code></a>, <a class="link" href="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-USE-ORIG-FWMARK:CAPS"><code class="literal">NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK</code></a>.
-They are valid only for IPv6 tunnels.</p>
-<p>Flags: Read / Write</p>
-<p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NMSettingIPTunnel--flow-label"></a><h3>The <code class="literal">“flow-label”</code> property</h3>
 <pre class="programlisting">  “flow-label”               <a href="../glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a></pre>
 <p>The flow label to assign to tunnel packets. This property applies only to
diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index f9352308..19f211c7 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -710,7 +710,7 @@ consistency with the link_watcher constructors of other type</p></td>
 <p>the new <a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a> object. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -765,7 +765,7 @@ target address in the NS packet</p></td>
 <p>the new <a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a> object, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -833,7 +833,7 @@ address in the arp request</p></td>
 <p>the new <a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a> object, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -856,7 +856,7 @@ nm_team_link_watcher_ref (<em class="parameter"><code><a class="link" href="NMSe
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -880,7 +880,7 @@ reaches zero, the object will be destroyed.</p>
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -917,7 +917,7 @@ to.</p></td>
 <a name="nm-team-link-watcher-equal.returns"></a><h4>Returns</h4>
 <p> <a href="../glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the objects contain the same values, <a href="../glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not.</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -947,7 +947,7 @@ nm_team_link_watcher_dup (<em class="parameter"><code><a class="link" href="NMSe
 . </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -970,7 +970,7 @@ nm_team_link_watcher_get_name (<em class="parameter"><code><a class="link" href=
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -994,7 +994,7 @@ coming up and the runner beeing notified about it.</p>
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1018,7 +1018,7 @@ going down and the runner beeing notified about it.</p>
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1042,7 +1042,7 @@ wait before sending the first packet to the target host.</p>
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1066,7 +1066,7 @@ sending two check packets to the target host.</p>
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1089,7 +1089,7 @@ nm_team_link_watcher_get_missed_max (<em class="parameter"><code><a class="link"
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1113,7 +1113,7 @@ packets.</p>
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1136,7 +1136,7 @@ nm_team_link_watcher_get_source_host (<em class="parameter"><code><a class="link
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1159,7 +1159,7 @@ nm_team_link_watcher_get_flags (<em class="parameter"><code><a class="link" href
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1223,7 +1223,7 @@ nm_setting_team_get_notify_peers_count
 <a name="nm-setting-team-get-notify-peers-count.returns"></a><h4>Returns</h4>
 <p> the #<a class="link" href="NMSettingTeam.html#NMSettingTeam--notify-peers-count" title="The “notify-peers-count” property"><span class="type">“notify-peers-count”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1250,7 +1250,7 @@ nm_setting_team_get_notify_peers_interval
 <a name="nm-setting-team-get-notify-peers-interval.returns"></a><h4>Returns</h4>
 <p> the #<a class="link" href="NMSettingTeam.html#NMSettingTeam--notify-peers-interval" title="The “notify-peers-interval” property"><span class="type">“notify-peers-interval”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1277,7 +1277,7 @@ nm_setting_team_get_mcast_rejoin_count
 <a name="nm-setting-team-get-mcast-rejoin-count.returns"></a><h4>Returns</h4>
 <p> the #<a class="link" href="NMSettingTeam.html#NMSettingTeam--mcast-rejoin-count" title="The “mcast-rejoin-count” property"><span class="type">“mcast-rejoin-count”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1304,7 +1304,7 @@ nm_setting_team_get_mcast_rejoin_interval
 <a name="nm-setting-team-get-mcast-rejoin-interval.returns"></a><h4>Returns</h4>
 <p> the #<a class="link" href="NMSettingTeam.html#NMSettingTeam--mcast-rejoin-interval" title="The “mcast-rejoin-interval” property"><span class="type">“mcast-rejoin-interval”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1330,7 +1330,7 @@ nm_setting_team_get_runner (<em class="parameter"><code><a class="link" href="NM
 <a name="nm-setting-team-get-runner.returns"></a><h4>Returns</h4>
 <p> the #<a class="link" href="NMSettingTeam.html#NMSettingTeam--runner" title="The “runner” property"><span class="type">“runner”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1357,7 +1357,7 @@ nm_setting_team_get_runner_hwaddr_policy
 <a name="nm-setting-team-get-runner-hwaddr-policy.returns"></a><h4>Returns</h4>
 <p> the #<a class="link" href="NMSettingTeam.html#NMSettingTeam--runner-hwaddr-policy" title="The “runner-hwaddr-policy” property"><span class="type">“runner-hwaddr-policy”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1384,7 +1384,7 @@ nm_setting_team_get_runner_tx_balancer
 <a name="nm-setting-team-get-runner-tx-balancer.returns"></a><h4>Returns</h4>
 <p> the #<a class="link" href="NMSettingTeam.html#NMSettingTeam--runner-tx-balancer" title="The “runner-tx-balancer” property"><span class="type">“runner-tx-balancer”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1411,7 +1411,7 @@ nm_setting_team_get_runner_tx_balancer_interval
 <a name="nm-setting-team-get-runner-tx-balancer-interval.returns"></a><h4>Returns</h4>
 <p> the #<a class="link" href="NMSettingTeam.html#NMSettingTeam--runner-tx-balancer-interval" title="The “runner-tx-balancer-interval” property"><span class="type">“runner-tx-balancer_interval”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1437,7 +1437,7 @@ nm_setting_team_get_runner_active (<em class="parameter"><code><a class="link" h
 <a name="nm-setting-team-get-runner-active.returns"></a><h4>Returns</h4>
 <p> the #<a class="link" href="NMSettingTeam.html#NMSettingTeam--runner-active" title="The “runner-active” property"><span class="type">“runner_active”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1463,7 +1463,7 @@ nm_setting_team_get_runner_fast_rate (<em class="parameter"><code><a class="link
 <a name="nm-setting-team-get-runner-fast-rate.returns"></a><h4>Returns</h4>
 <p> the #<a class="link" href="NMSettingTeam.html#NMSettingTeam--runner-fast-rate" title="The “runner-fast-rate” property"><span class="type">“runner-fast-rate”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1489,7 +1489,7 @@ nm_setting_team_get_runner_sys_prio (<em class="parameter"><code><a class="link"
 <a name="nm-setting-team-get-runner-sys-prio.returns"></a><h4>Returns</h4>
 <p> the #<a class="link" href="NMSettingTeam.html#NMSettingTeam--runner-sys-prio" title="The “runner-sys-prio” property"><span class="type">“runner-sys-prio”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1515,7 +1515,7 @@ nm_setting_team_get_runner_min_ports (<em class="parameter"><code><a class="link
 <a name="nm-setting-team-get-runner-min-ports.returns"></a><h4>Returns</h4>
 <p> the #<a class="link" href="NMSettingTeam.html#NMSettingTeam--runner-min-ports" title="The “runner-min-ports” property"><span class="type">“runner-min-ports”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1542,7 +1542,7 @@ nm_setting_team_get_runner_agg_select_policy
 <a name="nm-setting-team-get-runner-agg-select-policy.returns"></a><h4>Returns</h4>
 <p> the #<a class="link" href="NMSettingTeam.html#NMSettingTeam--runner-agg-select-policy" title="The “runner-agg-select-policy” property"><span class="type">“runner-agg-select-policy”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1578,7 +1578,7 @@ nm_setting_team_remove_runner_tx_hash_by_value
 <a name="nm-setting-team-remove-runner-tx-hash-by-value.returns"></a><h4>Returns</h4>
 <p> <a href="../glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the txhash element was found and removed; <a href="../glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it was not.</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1605,7 +1605,7 @@ nm_setting_team_get_num_runner_tx_hash
 <a name="nm-setting-team-get-num-runner-tx-hash.returns"></a><h4>Returns</h4>
 <p> the number of elements in txhash</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1640,7 +1640,7 @@ nm_setting_team_get_runner_tx_hash (<em class="parameter"><code><a class="link"
 <p> the txhash element at index <em class="parameter"><code>idx</code></em>
 </p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1672,7 +1672,7 @@ nm_setting_team_remove_runner_tx_hash (<em class="parameter"><code><a class="lin
 </tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1708,7 +1708,7 @@ nm_setting_team_add_runner_tx_hash (<em class="parameter"><code><a class="link"
 <p> <a href="../glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the txhash element was added; <a href="../glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if the element
 was already knnown.</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1734,7 +1734,7 @@ nm_setting_team_get_num_link_watchers (<em class="parameter"><code><a class="lin
 <a name="nm-setting-team-get-num-link-watchers.returns"></a><h4>Returns</h4>
 <p> the number of configured link watchers</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1770,7 +1770,7 @@ nm_setting_team_get_link_watcher (<em class="parameter"><code><a class="link" hr
 . </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1806,7 +1806,7 @@ nm_setting_team_add_link_watcher (<em class="parameter"><code><a class="link" hr
 <p> <a href="../glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the link watcher is added; <a href="../glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if an identical link
 watcher was already there.</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1837,7 +1837,7 @@ nm_setting_team_remove_link_watcher (<em class="parameter"><code><a class="link"
 </tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1873,7 +1873,7 @@ nm_setting_team_remove_link_watcher_by_value
 <a name="nm-setting-team-remove-link-watcher-by-value.returns"></a><h4>Returns</h4>
 <p> <a href="../glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the link watcher was found and removed, <a href="../glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1896,7 +1896,7 @@ nm_setting_team_clear_link_watchers (<em class="parameter"><code><a class="link"
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 </div>
 <div class="refsect1">
@@ -2226,9 +2226,9 @@ Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait';
 nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host';
 arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
 'validate-incative', 'send-always'. See teamd.conf man for more details.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMTeamLinkWatcher)]</span></p>
+<p>Element-Type: NMTeamLinkWatcher</p>
 <p>Flags: Read / Write</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2237,7 +2237,7 @@ arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
 <p>Corresponds to the teamd mcast_rejoin.count.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2246,7 +2246,7 @@ arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
 <p>Corresponds to the teamd mcast_rejoin.interval.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2255,7 +2255,7 @@ arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
 <p>Corresponds to the teamd notify_peers.count.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2264,7 +2264,7 @@ arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
 <p>Corresponds to the teamd notify_peers.interval.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2279,7 +2279,7 @@ other runners will be set to an empty value (or if not possible to
 a default value).</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2288,7 +2288,7 @@ a default value).</p>
 <p>Corresponds to the teamd runner.active.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2297,7 +2297,7 @@ a default value).</p>
 <p>Corresponds to the teamd runner.agg_select_policy.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2306,7 +2306,7 @@ a default value).</p>
 <p>Corresponds to the teamd runner.fast_rate.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2315,7 +2315,7 @@ a default value).</p>
 <p>Corresponds to the teamd runner.hwaddr_policy.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2324,7 +2324,7 @@ a default value).</p>
 <p>Corresponds to the teamd runner.min_ports.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2333,7 +2333,7 @@ a default value).</p>
 <p>Corresponds to the teamd runner.sys_prio.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2342,7 +2342,7 @@ a default value).</p>
 <p>Corresponds to the teamd runner.tx_balancer.name.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2351,7 +2351,7 @@ a default value).</p>
 <p>Corresponds to the teamd runner.tx_balancer.interval.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2359,7 +2359,7 @@ a default value).</p>
 <pre class="programlisting">  “runner-tx-hash”           <a href="../glib/glib-String-Utility-Functions.html#GStrv"><span class="type">GStrv</span></a></pre>
 <p>Corresponds to the teamd runner.tx_hash.</p>
 <p>Flags: Read / Write</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 </div>
 </div>
diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html
index b71ec713..4e5feda1 100644
--- a/docs/libnm/html/NMSettingTeamPort.html
+++ b/docs/libnm/html/NMSettingTeamPort.html
@@ -325,7 +325,7 @@ nm_setting_team_port_get_queue_id (<em class="parameter"><code><a class="link" h
 <a name="nm-setting-team-port-get-queue-id.returns"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingTeamPort.html#NMSettingTeamPort--queue-id" title="The “queue-id” property"><span class="type">“queue_id”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -351,7 +351,7 @@ nm_setting_team_port_get_prio (<em class="parameter"><code><a class="link" href=
 <a name="nm-setting-team-port-get-prio.returns"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingTeamPort.html#NMSettingTeamPort--prio" title="The “prio” property"><span class="type">“prio”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -377,7 +377,7 @@ nm_setting_team_port_get_sticky (<em class="parameter"><code><a class="link" hre
 <a name="nm-setting-team-port-get-sticky.returns"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingTeamPort.html#NMSettingTeamPort--sticky" title="The “sticky” property"><span class="type">“sticky”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -403,7 +403,7 @@ nm_setting_team_port_get_lacp_prio (<em class="parameter"><code><a class="link"
 <a name="nm-setting-team-port-get-lacp-prio.returns"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingTeamPort.html#NMSettingTeamPort--lacp-prio" title="The “lacp-prio” property"><span class="type">“lacp-prio”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -429,7 +429,7 @@ nm_setting_team_port_get_lacp_key (<em class="parameter"><code><a class="link" h
 <a name="nm-setting-team-port-get-lacp-key.returns"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingTeamPort.html#NMSettingTeamPort--lacp-key" title="The “lacp-key” property"><span class="type">“lacp-key”</span></a> property of the setting</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -456,7 +456,7 @@ nm_setting_team_port_get_num_link_watchers
 <a name="nm-setting-team-port-get-num-link-watchers.returns"></a><h4>Returns</h4>
 <p> the number of configured link watchers</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -492,7 +492,7 @@ nm_setting_team_port_get_link_watcher (<em class="parameter"><code><a class="lin
 . </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -528,7 +528,7 @@ nm_setting_team_port_add_link_watcher (<em class="parameter"><code><a class="lin
 <p> <a href="../glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the link watcher is added; <a href="../glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if an identical link
 watcher was already there.</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -560,7 +560,7 @@ nm_setting_team_port_remove_link_watcher
 </tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -596,7 +596,7 @@ nm_setting_team_port_remove_link_watcher_by_value
 <a name="nm-setting-team-port-remove-link-watcher-by-value.returns"></a><h4>Returns</h4>
 <p> <a href="../glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the link watcher was found and removed, <a href="../glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -620,7 +620,7 @@ nm_setting_team_port_clear_link_watchers
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 </div>
 <div class="refsect1">
@@ -710,7 +710,7 @@ used. See man teamd.conf for the format details.</p>
 <p>Corresponds to the teamd ports.PORTIFNAME.lacp_key.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -719,7 +719,7 @@ used. See man teamd.conf for the format details.</p>
 <p>Corresponds to the teamd ports.PORTIFNAME.lacp_prio.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -733,9 +733,9 @@ Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait';
 nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host';
 arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
 'validate-incative', 'send-always'. See teamd.conf man for more details.</p>
-<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMTeamLinkWatcher)]</span></p>
+<p>Element-Type: NMTeamLinkWatcher</p>
 <p>Flags: Read / Write</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -744,7 +744,7 @@ arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
 <p>Corresponds to the teamd ports.PORTIFNAME.prio.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -754,7 +754,7 @@ arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
 When set to -1 means the parameter is skipped from the json config.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -763,7 +763,7 @@ When set to -1 means the parameter is skipped from the json config.</p>
 <p>Corresponds to the teamd ports.PORTIFNAME.sticky.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 </div>
 </div>
diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index e9f270e5..4aeec14f 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -798,7 +798,7 @@ to 802.1p priorities used in VLANs.</p>
 <td class="enum_member_name"><p><a name="NM-VLAN-FLAG-GVRP:CAPS"></a>NM_VLAN_FLAG_GVRP</p></td>
 <td class="enum_member_description">
 <p>indicates that this interface should use GVRP to register
- itself with its switch</p>
+ itself with it's switch</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -815,7 +815,7 @@ to 802.1p priorities used in VLANs.</p>
 <td class="enum_member_name"><p><a name="NM-VLAN-FLAG-MVRP:CAPS"></a>NM_VLAN_FLAG_MVRP</p></td>
 <td class="enum_member_description">
 <p>indicates that this interface should use MVRP to register
- itself with its switch</p>
+ itself with it's switch</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
diff --git a/docs/libnm/html/NMSettingVpn.html b/docs/libnm/html/NMSettingVpn.html
index 10bf4db3..8814e6f8 100644
--- a/docs/libnm/html/NMSettingVpn.html
+++ b/docs/libnm/html/NMSettingVpn.html
@@ -119,13 +119,6 @@
 </td>
 </tr>
 <tr>
-<td class="function_type">const <span class="returnvalue">char</span> **
-</td>
-<td class="function_name">
-<a class="link" href="NMSettingVpn.html#nm-setting-vpn-get-data-keys" title="nm_setting_vpn_get_data_keys ()">nm_setting_vpn_get_data_keys</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
-<tr>
 <td class="function_type">
 <a href="../glib/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
 </td>
@@ -165,13 +158,6 @@
 </td>
 </tr>
 <tr>
-<td class="function_type">const <span class="returnvalue">char</span> **
-</td>
-<td class="function_name">
-<a class="link" href="NMSettingVpn.html#nm-setting-vpn-get-secret-keys" title="nm_setting_vpn_get_secret_keys ()">nm_setting_vpn_get_secret_keys</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
-<tr>
 <td class="function_type">
 <a href="../glib/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
 </td>
@@ -595,45 +581,6 @@ during iteration will not be part of the iteration.</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-setting-vpn-get-data-keys"></a><h3>nm_setting_vpn_get_data_keys ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> **
-nm_setting_vpn_get_data_keys (<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 href="../glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *out_length</code></em>);</pre>
-<p>Retrieves every data key inside <em class="parameter"><code>setting</code></em>
-, as an array.</p>
-<div class="refsect3">
-<a name="nm-setting-vpn-get-data-keys.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>setting</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingVpn.html" title="NMSettingVpn"><span class="type">NMSettingVpn</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>out_length</p></td>
-<td class="parameter_description"><p>(out): the length of the returned array. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="nm-setting-vpn-get-data-keys.returns"></a><h4>Returns</h4>
-<p>a
-<a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array containing each data key or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if
-there are no data items. </p>
-<p><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=out_length][<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>]</span></p>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
 <a name="nm-setting-vpn-get-num-secrets"></a><h3>nm_setting_vpn_get_num_secrets ()</h3>
 <pre class="programlisting"><a href="../glib/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
 nm_setting_vpn_get_num_secrets (<em class="parameter"><code><a class="link" href="NMSettingVpn.html" title="NMSettingVpn"><span class="type">NMSettingVpn</span></a> *setting</code></em>);</pre>
@@ -812,45 +759,6 @@ iteration will not be part of the iteration.</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-setting-vpn-get-secret-keys"></a><h3>nm_setting_vpn_get_secret_keys ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> **
-nm_setting_vpn_get_secret_keys (<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 href="../glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *out_length</code></em>);</pre>
-<p>Retrieves every secret key inside <em class="parameter"><code>setting</code></em>
-, as an array.</p>
-<div class="refsect3">
-<a name="nm-setting-vpn-get-secret-keys.parameters"></a><h4>Parameters</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="parameters_name">
-<col class="parameters_description">
-<col width="200px" class="parameters_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>setting</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingVpn.html" title="NMSettingVpn"><span class="type">NMSettingVpn</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>out_length</p></td>
-<td class="parameter_description"><p>(out): the length of the returned array. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect3">
-<a name="nm-setting-vpn-get-secret-keys.returns"></a><h4>Returns</h4>
-<p>a
-<a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array containing each secret key or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if
-there are no secrets. </p>
-<p><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=out_length][<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>]</span></p>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
 <a name="nm-setting-vpn-get-timeout"></a><h3>nm_setting_vpn_get_timeout ()</h3>
 <pre class="programlisting"><a href="../glib/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
 nm_setting_vpn_get_timeout (<em class="parameter"><code><a class="link" href="NMSettingVpn.html" title="NMSettingVpn"><span class="type">NMSettingVpn</span></a> *setting</code></em>);</pre>
@@ -931,6 +839,9 @@ nm_setting_vpn_get_timeout (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect2">
 <a name="NMSettingVpn--data"></a><h3>The <code class="literal">“data”</code> property</h3>
 <pre class="programlisting">  “data”                     <a href="../glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *</pre>
+<p>Dictionary of key/value pairs of VPN plugin specific data.  Both keys and
+values must be strings.</p>
+<p>Type: GHashTable(utf8,utf8)</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
@@ -947,6 +858,9 @@ until explicitly disconnected.</p>
 <div class="refsect2">
 <a name="NMSettingVpn--secrets"></a><h3>The <code class="literal">“secrets”</code> property</h3>
 <pre class="programlisting">  “secrets”                  <a href="../glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *</pre>
+<p>Dictionary of key/value pairs of VPN plugin specific secrets like
+passwords or private keys.  Both keys and values must be strings.</p>
+<p>Type: GHashTable(utf8,utf8)</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index e22c9fd9..3bbe9fd4 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -1534,6 +1534,11 @@ the different types of virtual network devices available on s390 systems.</p>
 <div class="refsect2">
 <a name="NMSettingWired--s390-options"></a><h3>The <code class="literal">“s390-options”</code> property</h3>
 <pre class="programlisting">  “s390-options”             <a href="../glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *</pre>
+<p>Dictionary of key/value pairs of s390-specific device options.  Both keys
+and values must be strings.  Allowed keys include "portno", "layer2",
+"portname", "protocol", among others.  Key names must contain only
+alphanumeric characters (ie, [a-zA-Z0-9]).</p>
+<p>Type: GHashTable(utf8,utf8)</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index c8b208a7..848f2cf9 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -297,14 +297,6 @@ use WEP, LEAP, WPA or WPA2/RSN security</p>
 <a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wps-method" title="nm_setting_wireless_security_get_wps_method ()">nm_setting_wireless_security_get_wps_method</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
-<tr>
-<td class="function_type">
-<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityFils" title="enum NMSettingWirelessSecurityFils"><span class="returnvalue">NMSettingWirelessSecurityFils</span></a>
-</td>
-<td class="function_name">
-<a class="link" href="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-fils" title="nm_setting_wireless_security_get_fils ()">nm_setting_wireless_security_get_fils</a> <span class="c_punctuation">()</span>
-</td>
-</tr>
 </tbody>
 </table></div>
 </div>
@@ -324,11 +316,6 @@ use WEP, LEAP, WPA or WPA2/RSN security</p>
 <td class="property_flags">Read / Write</td>
 </tr>
 <tr>
-<td class="property_type"><a href="../glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--fils" title="The “fils” property">fils</a></td>
-<td class="property_flags">Read / Write / Construct</td>
-</tr>
-<tr>
 <td class="property_type"><a href="../glib/glib-String-Utility-Functions.html#GStrv"><span class="type">GStrv</span></a></td>
 <td class="property_name"><a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--group" title="The “group” property">group</a></td>
 <td class="property_flags">Read / Write</td>
@@ -454,10 +441,6 @@ use WEP, LEAP, WPA or WPA2/RSN security</p>
 <td class="function_name"><a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityWpsMethod" title="enum NMSettingWirelessSecurityWpsMethod">NMSettingWirelessSecurityWpsMethod</a></td>
 </tr>
 <tr>
-<td class="datatype_keyword">enum</td>
-<td class="function_name"><a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityFils" title="enum NMSettingWirelessSecurityFils">NMSettingWirelessSecurityFils</a></td>
-</tr>
-<tr>
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-KEY-MGMT:CAPS" title="NM_SETTING_WIRELESS_SECURITY_KEY_MGMT">NM_SETTING_WIRELESS_SECURITY_KEY_MGMT</a></td>
 </tr>
@@ -534,10 +517,6 @@ use WEP, LEAP, WPA or WPA2/RSN security</p>
 <td class="function_name"><a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WPS-METHOD:CAPS" title="NM_SETTING_WIRELESS_SECURITY_WPS_METHOD">NM_SETTING_WIRELESS_SECURITY_WPS_METHOD</a></td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_FILS">NM_SETTING_WIRELESS_SECURITY_FILS</a></td>
-</tr>
-<tr>
 <td class="datatype_keyword"> </td>
 <td class="function_name"><a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a></td>
 </tr>
@@ -547,7 +526,6 @@ use WEP, LEAP, WPA or WPA2/RSN security</p>
 <div class="refsect1">
 <a name="NMSettingWirelessSecurity.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
-    <span class="lineart">├──</span> NMSettingWirelessSecurityFils
     <span class="lineart">├──</span> NMSettingWirelessSecurityPmf
     <span class="lineart">├──</span> NMSettingWirelessSecurityWpsMethod
     <span class="lineart">╰──</span> NMWepKeyType
@@ -1534,12 +1512,6 @@ nm_setting_wireless_security_get_wps_method
 </div>
 <p class="since">Since: 1.10</p>
 </div>
-<hr>
-<div class="refsect2">
-<a name="nm-setting-wireless-security-get-fils"></a><h3>nm_setting_wireless_security_get_fils ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityFils" title="enum NMSettingWirelessSecurityFils"><span class="returnvalue">NMSettingWirelessSecurityFils</span></a>
-nm_setting_wireless_security_get_fils (<em class="parameter"><code><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> *setting</code></em>);</pre>
-</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingWirelessSecurity.other_details"></a><h2>Types and Values</h2>
@@ -1717,66 +1689,6 @@ the actual WEP key using the MD5 hash algorithm.</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NMSettingWirelessSecurityFils"></a><h3>enum NMSettingWirelessSecurityFils</h3>
-<p>These flags indicate whether FILS must be enabled.</p>
-<div class="refsect3">
-<a name="NMSettingWirelessSecurityFils.members"></a><h4>Members</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="300px" class="enum_members_name">
-<col class="enum_members_description">
-<col width="200px" class="enum_members_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTING-WIRELESS-SECURITY-FILS-DEFAULT:CAPS"></a>NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT</p></td>
-<td class="enum_member_description">
-<p>use the default value</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTING-WIRELESS-SECURITY-FILS-DISABLE:CAPS"></a>NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE</p></td>
-<td class="enum_member_description">
-<p>disable FILS</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTING-WIRELESS-SECURITY-FILS-OPTIONAL:CAPS"></a>NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL</p></td>
-<td class="enum_member_description">
-<p>enable FILS if the supplicant and the AP support it</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTING-WIRELESS-SECURITY-FILS-REQUIRED:CAPS"></a>NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED</p></td>
-<td class="enum_member_description">
-<p>require FILS and fail if not available</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTING-WIRELESS-SECURITY-FILS-NUM:CAPS"></a>_NM_SETTING_WIRELESS_SECURITY_FILS_NUM</p></td>
-<td class="enum_member_description">
-<p>placeholder value for bounds-checking</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTING-WIRELESS-SECURITY-FILS-LAST:CAPS"></a>NM_SETTING_WIRELESS_SECURITY_FILS_LAST</p></td>
-<td class="enum_member_description">
-<p>placeholder value for bounds-checking</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<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>
@@ -1891,12 +1803,6 @@ the actual WEP key using the MD5 hash algorithm.</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NM-SETTING-WIRELESS-SECURITY-FILS:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_FILS</h3>
-<pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_FILS "fils"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NMSettingWirelessSecurity-struct"></a><h3>NMSettingWirelessSecurity</h3>
 <pre class="programlisting">typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;</pre>
 <p>Wi-Fi Security Settings</p>
@@ -1917,22 +1823,6 @@ using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the
 </div>
 <hr>
 <div class="refsect2">
-<a name="NMSettingWirelessSecurity--fils"></a><h3>The <code class="literal">“fils”</code> property</h3>
-<pre class="programlisting">  “fils”                     <a href="../glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></pre>
-<p>Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for
-the connection.  One of <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-DEFAULT:CAPS"><code class="literal">NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT</code></a> (use
-global default value), <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-DISABLE:CAPS"><code class="literal">NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE</code></a>
-(disable FILS), <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-OPTIONAL:CAPS"><code class="literal">NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL</code></a> (enable FILS
-if the supplicant and the access point support it) or
-<a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-REQUIRED:CAPS"><code class="literal">NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED</code></a> (enable FILS and fail if not
-supported).  When set to <a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-DEFAULT:CAPS"><code class="literal">NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT</code></a> and
-no global default is set, FILS will be optionally enabled.</p>
-<p>Flags: Read / Write / Construct</p>
-<p>Default value: 0</p>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NMSettingWirelessSecurity--group"></a><h3>The <code class="literal">“group”</code> property</h3>
 <pre class="programlisting">  “group”                    <a href="../glib/glib-String-Utility-Functions.html#GStrv"><span class="type">GStrv</span></a></pre>
 <p>A list of group/broadcast encryption algorithms which prevents
diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index 63f0e087..7bdc9f9b 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -124,8 +124,7 @@
 </td>
 </tr>
 <tr>
-<td class="function_type">
-<a class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="returnvalue">NMVpnPluginInfo</span></a> *
+<td class="function_type">struct <span class="returnvalue">_NMVpnPluginInfo</span> *
 </td>
 <td class="function_name">
 <a class="link" href="NMVpnEditorPlugin.html#nm-vpn-editor-plugin-get-plugin-info" title="nm_vpn_editor_plugin_get_plugin_info ()">nm_vpn_editor_plugin_get_plugin_info</a> <span class="c_punctuation">()</span>
@@ -223,10 +222,6 @@
 <td class="datatype_keyword"> </td>
 <td class="function_name"><a class="link" href="NMVpnEditorPlugin.html#NMVpnEditorPluginVT" title="NMVpnEditorPluginVT">NMVpnEditorPluginVT</a></td>
 </tr>
-<tr>
-<td class="datatype_keyword"> </td>
-<td class="function_name"><a class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo">NMVpnPluginInfo</a></td>
-</tr>
 </tbody>
 </table></div>
 </div>
@@ -547,7 +542,7 @@ the given service.</p></td>
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-editor-plugin-get-plugin-info"></a><h3>nm_vpn_editor_plugin_get_plugin_info ()</h3>
-<pre class="programlisting"><a class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="returnvalue">NMVpnPluginInfo</span></a> *
+<pre class="programlisting">struct <span class="returnvalue">_NMVpnPluginInfo</span> *
 nm_vpn_editor_plugin_get_plugin_info (<em class="parameter"><code><a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> *plugin</code></em>);</pre>
 <div class="refsect3">
 <a name="nm-vpn-editor-plugin-get-plugin-info.parameters"></a><h4>Parameters</h4>
@@ -566,7 +561,7 @@ nm_vpn_editor_plugin_get_plugin_info (<em class="parameter"><code><a class="link
 </div>
 <div class="refsect3">
 <a name="nm-vpn-editor-plugin-get-plugin-info.returns"></a><h4>Returns</h4>
-<p>if set, return the <a class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="type">NMVpnPluginInfo</span></a> instance. </p>
+<p>if set, return the <span class="type">NMVpnPluginInfo</span> instance. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 <p class="since">Since: 1.4</p>
@@ -576,7 +571,7 @@ nm_vpn_editor_plugin_get_plugin_info (<em class="parameter"><code><a class="link
 <a name="nm-vpn-editor-plugin-set-plugin-info"></a><h3>nm_vpn_editor_plugin_set_plugin_info ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_editor_plugin_set_plugin_info (<em class="parameter"><code><a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> *plugin</code></em>,
-                                      <em class="parameter"><code><a class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="type">NMVpnPluginInfo</span></a> *plugin_info</code></em>);</pre>
+                                      <em class="parameter"><code><span class="type">struct _NMVpnPluginInfo</span> *plugin_info</code></em>);</pre>
 <p>Set or clear the plugin-info instance.
 This takes a weak reference on <em class="parameter"><code>plugin_info</code></em>
 , to avoid circular
@@ -597,7 +592,7 @@ reference as the plugin-info might also reference the editor-plugin.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>plugin_info</p></td>
-<td class="parameter_description"><p>a <a class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo"><span class="type">NMVpnPluginInfo</span></a> instance or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
+<td class="parameter_description"><p>a <span class="type">NMVpnPluginInfo</span> instance or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -694,7 +689,7 @@ reference as the plugin-info might also reference the editor-plugin.</p>
 	char * (*get_suggested_filename) (NMVpnEditorPlugin *plugin, NMConnection *connection);
 
 	void (*notify_plugin_info_set) (NMVpnEditorPlugin *plugin,
-	                                NMVpnPluginInfo *plugin_info);
+	                                struct _NMVpnPluginInfo *plugin_info);
 
 	const NMVpnEditorPluginVT *(*get_vt) (NMVpnEditorPlugin *plugin,
 	                                      gsize *out_vt_size);
@@ -773,15 +768,6 @@ the plugin, without requiring to update libnm. Used by <a class="link" href="NMV
 <a name="NMVpnEditorPluginVT"></a><h3>NMVpnEditorPluginVT</h3>
 <pre class="programlisting">typedef struct _NMVpnEditorPluginVT NMVpnEditorPluginVT;</pre>
 </div>
-<hr>
-<div class="refsect2">
-<a name="NMVpnPluginInfo"></a><h3>NMVpnPluginInfo</h3>
-<pre class="programlisting">typedef struct {
-	NM_AVAILABLE_IN_1_2
-	GObject parent;
-} NMVpnPluginInfo;
-</pre>
-</div>
 </div>
 <div class="refsect1">
 <a name="NMVpnEditorPlugin.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/annotation-glossary.html b/docs/libnm/html/annotation-glossary.html
index 5a66390d..2af383fb 100644
--- a/docs/libnm/html/annotation-glossary.html
+++ b/docs/libnm/html/annotation-glossary.html
@@ -20,8 +20,6 @@
                      <span class="dim">|</span> 
                   <a class="shortcut" href="#glsI">I</a>
                      <span class="dim">|</span> 
-                  <a class="shortcut" href="#glsN">N</a>
-                     <span class="dim">|</span> 
                   <a class="shortcut" href="#glsO">O</a>
                      <span class="dim">|</span> 
                   <a class="shortcut" href="#glsS">S</a>
@@ -49,9 +47,6 @@
 <a name="glsI"></a><h3 class="title">I</h3>
 <dt><span class="glossterm"><a name="annotation-glossterm-inout"></a>inout</span></dt>
 <dd class="glossdef"><p>Parameter for input and 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="glsN"></a><h3 class="title">N</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-nullable"></a>nullable</span></dt>
-<dd class="glossdef"><p>NULL may be passed as the value in, out, in-out; or as a return value.</p></dd>
 <a name="glsO"></a><h3 class="title">O</h3>
 <dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt>
 <dd class="glossdef"><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>
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index bcb67421..2dd07b0b 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -447,7 +447,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-12:CAPS" title="NM_AVAILABLE_IN_1_12">NM_AVAILABLE_IN_1_12</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
+<a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-10-2:CAPS" title="NM_AVAILABLE_IN_1_10_2">NM_AVAILABLE_IN_1_10_2</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
 </dt>
 <dd></dd>
 <dt>
@@ -477,50 +477,10 @@
 </dt>
 <dd></dd>
 <dt>
-NMCheckpoint, struct in nm-types
-</dt>
-<dd></dd>
-<dt>
-NMCheckpoint:created, object property in nm-types
-</dt>
-<dd></dd>
-<dt>
-NMCheckpoint:devices, object property in nm-types
-</dt>
-<dd></dd>
-<dt>
-NMCheckpoint:rollback-timeout, object property in nm-types
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="libnm-nm-dbus-interface.html#NMCheckpointCreateFlags" title="enum NMCheckpointCreateFlags">NMCheckpointCreateFlags</a>, enum in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
 </dt>
 <dd></dd>
 <dt>
-NM_CHECKPOINT_CREATED, macro in nm-checkpoint
-</dt>
-<dd></dd>
-<dt>
-NM_CHECKPOINT_DEVICES, macro in nm-checkpoint
-</dt>
-<dd></dd>
-<dt>
-nm_checkpoint_get_created, function in nm-checkpoint
-</dt>
-<dd></dd>
-<dt>
-nm_checkpoint_get_devices, function in nm-checkpoint
-</dt>
-<dd></dd>
-<dt>
-nm_checkpoint_get_rollback_timeout, function in nm-checkpoint
-</dt>
-<dd></dd>
-<dt>
-NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in nm-checkpoint
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMClient.html#NMClient-struct" title="NMClient">NMClient</a>, struct in nm-types
 </dt>
 <dd></dd>
@@ -577,10 +537,6 @@ NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in nm-checkpoint
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--checkpoints" title="The “checkpoints” property">NMClient:checkpoints</a>, object property in nm-types
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMClient.html#NMClient--connections" title="The “connections” property">NMClient:connections</a>, object property in nm-types
 </dt>
 <dd></dd>
@@ -737,38 +693,6 @@ NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in nm-checkpoint
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#nm-client-checkpoint-adjust-rollback-timeout" title="nm_client_checkpoint_adjust_rollback_timeout ()">nm_client_checkpoint_adjust_rollback_timeout</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMClient.html#nm-client-checkpoint-adjust-rollback-timeout-finish" title="nm_client_checkpoint_adjust_rollback_timeout_finish ()">nm_client_checkpoint_adjust_rollback_timeout_finish</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMClient.html#nm-client-checkpoint-create" title="nm_client_checkpoint_create ()">nm_client_checkpoint_create</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMClient.html#nm-client-checkpoint-create-finish" title="nm_client_checkpoint_create_finish ()">nm_client_checkpoint_create_finish</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMClient.html#nm-client-checkpoint-destroy" title="nm_client_checkpoint_destroy ()">nm_client_checkpoint_destroy</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMClient.html#nm-client-checkpoint-destroy-finish" title="nm_client_checkpoint_destroy_finish ()">nm_client_checkpoint_destroy_finish</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMClient.html#nm-client-checkpoint-rollback" title="nm_client_checkpoint_rollback ()">nm_client_checkpoint_rollback</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMClient.html#nm-client-checkpoint-rollback-finish" title="nm_client_checkpoint_rollback_finish ()">nm_client_checkpoint_rollback_finish</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMClient.html#nm-client-check-connectivity" title="nm_client_check_connectivity ()">nm_client_check_connectivity</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
 </dt>
 <dd></dd>
@@ -873,10 +797,6 @@ NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in nm-checkpoint
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#nm-client-get-checkpoints" title="nm_client_get_checkpoints ()">nm_client_get_checkpoints</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMClient.html#nm-client-get-connections" title="nm_client_get_connections ()">nm_client_get_connections</a>, function in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
 </dt>
 <dd></dd>
@@ -1458,10 +1378,6 @@ NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in nm-checkpoint
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-dbus-interface.html#NM-DBUS-INTERFACE-CHECKPOINT:CAPS" title="NM_DBUS_INTERFACE_CHECKPOINT">NM_DBUS_INTERFACE_CHECKPOINT</a>, macro in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="libnm-nm-dbus-interface.html#NM-DBUS-INTERFACE-DEVICE:CAPS" title="NM_DBUS_INTERFACE_DEVICE">NM_DBUS_INTERFACE_DEVICE</a>, macro in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
 </dt>
 <dd></dd>
@@ -1762,14 +1678,6 @@ NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in nm-checkpoint
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-12:CAPS" title="NM_DEPRECATED_IN_1_12">NM_DEPRECATED_IN_1_12</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-12-FOR:CAPS" title="NM_DEPRECATED_IN_1_12_FOR()">NM_DEPRECATED_IN_1_12_FOR</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-2:CAPS" title="NM_DEPRECATED_IN_1_2">NM_DEPRECATED_IN_1_2</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
 </dt>
 <dd></dd>
@@ -2046,10 +1954,6 @@ NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in nm-checkpoint
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--flags" title="The “flags” property">NMDeviceIPTunnel:flags</a>, object property in nm-types
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--flow-label" title="The “flow-label” property">NMDeviceIPTunnel:flow-label</a>, object property in nm-types
 </dt>
 <dd></dd>
@@ -2870,10 +2774,6 @@ NMDevicePpp, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-FLAGS:CAPS" title="NM_DEVICE_IP_TUNNEL_FLAGS">NM_DEVICE_IP_TUNNEL_FLAGS</a>, macro in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-FLOW-LABEL:CAPS" title="NM_DEVICE_IP_TUNNEL_FLOW_LABEL">NM_DEVICE_IP_TUNNEL_FLOW_LABEL</a>, macro in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
 </dt>
 <dd></dd>
@@ -2882,10 +2782,6 @@ NMDevicePpp, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#nm-device-ip-tunnel-get-flags" title="nm_device_ip_tunnel_get_flags ()">nm_device_ip_tunnel_get_flags</a>, function in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMDeviceIPTunnel.html#nm-device-ip-tunnel-get-flow-label" title="nm_device_ip_tunnel_get_flow_label ()">nm_device_ip_tunnel_get_flow_label</a>, function in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
 </dt>
 <dd></dd>
@@ -3735,18 +3631,10 @@ NMDevicePpp, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIPTunnel.html#NMIPTunnelFlags" title="enum NMIPTunnelFlags">NMIPTunnelFlags</a>, enum in <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel">NMSettingIPTunnel</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="libnm-nm-dbus-interface.html#NMIPTunnelMode" title="enum NMIPTunnelMode">NMIPTunnelMode</a>, enum in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIPConfig.html#NM-IP-ADDRESS-ATTRIBUTE-LABEL:CAPS" title="NM_IP_ADDRESS_ATTRIBUTE_LABEL">NM_IP_ADDRESS_ATTRIBUTE_LABEL</a>, macro in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingIPConfig.html#nm-ip-address-dup" title="nm_ip_address_dup ()">nm_ip_address_dup</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
 </dt>
 <dd></dd>
@@ -4096,11 +3984,15 @@ json_object_iter, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
+json_object_iter_at, macro in nm-json
+</dt>
+<dd></dd>
+<dt>
 json_object_iter_key, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
-json_object_iter_next, macro in nm-json
+<a href="../json-glib/json-glib-JSON-Object.html#json-object-iter-next">json_object_iter_next</a>, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
@@ -4288,10 +4180,6 @@ json_true, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMRemoteConnection.html#NMRemoteConnection--flags" title="The “flags” property">NMRemoteConnection:flags</a>, object property in nm-types
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMRemoteConnection.html#NMRemoteConnection--unsaved" title="The “unsaved” property">NMRemoteConnection:unsaved</a>, object property in nm-types
 </dt>
 <dd></dd>
@@ -4328,14 +4216,6 @@ json_true, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMRemoteConnection.html#NM-REMOTE-CONNECTION-FLAGS:CAPS" title="NM_REMOTE_CONNECTION_FLAGS">NM_REMOTE_CONNECTION_FLAGS</a>, macro in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMRemoteConnection.html#nm-remote-connection-get-flags" title="nm_remote_connection_get_flags ()">nm_remote_connection_get_flags</a>, function in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMRemoteConnection.html#nm-remote-connection-get-secrets" title="nm_remote_connection_get_secrets ()">nm_remote_connection_get_secrets</a>, function in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
 </dt>
 <dd></dd>
@@ -4885,10 +4765,6 @@ json_true, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingConnection.html#NMSettingConnection--mdns" title="The “mdns” property">NMSettingConnection:mdns</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--metered" title="The “metered” property">NMSettingConnection:metered</a>, object property in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -4937,10 +4813,6 @@ json_true, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingConnection.html#NMSettingConnectionMdns" title="enum NMSettingConnectionMdns">NMSettingConnectionMdns</a>, enum in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingDcb.html#NMSettingDcb-struct" title="NMSettingDcb">NMSettingDcb</a>, struct in <a class="link" href="NMSettingDcb.html" title="NMSettingDcb">NMSettingDcb</a>
 </dt>
 <dd></dd>
@@ -5221,10 +5093,6 @@ json_true, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIPTunnel.html#NMSettingIPTunnel--flags" title="The “flags” property">NMSettingIPTunnel:flags</a>, object property in <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel">NMSettingIPTunnel</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingIPTunnel.html#NMSettingIPTunnel--flow-label" title="The “flow-label” property">NMSettingIPTunnel:flow-label</a>, object property in <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel">NMSettingIPTunnel</a>
 </dt>
 <dd></dd>
@@ -5545,10 +5413,6 @@ NMSettingProxyMethod, enum in NMSettingProxy
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-nm-dbus-interface.html#NMSettingsConnectionFlags" title="enum NMSettingsConnectionFlags">NMSettingsConnectionFlags</a>, enum in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</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>
@@ -6029,10 +5893,6 @@ NMSettingUser:data, object property in nm-core-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--fils" title="The “fils” property">NMSettingWirelessSecurity:fils</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--group" title="The “group” property">NMSettingWirelessSecurity:group</a>, object property in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -6105,10 +5965,6 @@ NMSettingUser:data, object property in nm-core-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityFils" title="enum NMSettingWirelessSecurityFils">NMSettingWirelessSecurityFils</a>, enum in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityPmf" title="enum NMSettingWirelessSecurityPmf">NMSettingWirelessSecurityPmf</a>, enum in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -7177,10 +7033,6 @@ NMSettingUser:data, object property in nm-core-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-mdns" title="nm_setting_connection_get_mdns ()">nm_setting_connection_get_mdns</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-metered" title="nm_setting_connection_get_metered ()">nm_setting_connection_get_metered</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -7245,10 +7097,6 @@ NMSettingUser:data, object property in nm-core-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-MDNS:CAPS" title="NM_SETTING_CONNECTION_MDNS">NM_SETTING_CONNECTION_MDNS</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-METERED:CAPS" title="NM_SETTING_CONNECTION_METERED">NM_SETTING_CONNECTION_METERED</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -8101,10 +7949,6 @@ NMSettingUser:data, object property in nm-core-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-FLAGS:CAPS" title="NM_SETTING_IP_TUNNEL_FLAGS">NM_SETTING_IP_TUNNEL_FLAGS</a>, macro in <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel">NMSettingIPTunnel</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-FLOW-LABEL:CAPS" title="NM_SETTING_IP_TUNNEL_FLOW_LABEL">NM_SETTING_IP_TUNNEL_FLOW_LABEL</a>, macro in <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel">NMSettingIPTunnel</a>
 </dt>
 <dd></dd>
@@ -8113,10 +7957,6 @@ NMSettingUser:data, object property in nm-core-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingIPTunnel.html#nm-setting-ip-tunnel-get-flags" title="nm_setting_ip_tunnel_get_flags ()">nm_setting_ip_tunnel_get_flags</a>, function in <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel">NMSettingIPTunnel</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingIPTunnel.html#nm-setting-ip-tunnel-get-flow-label" title="nm_setting_ip_tunnel_get_flow_label ()">nm_setting_ip_tunnel_get_flow_label</a>, function in <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel">NMSettingIPTunnel</a>
 </dt>
 <dd></dd>
@@ -9409,10 +9249,6 @@ nm_setting_user_set_data, function in nm-setting-user
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingVpn.html#nm-setting-vpn-get-data-keys" title="nm_setting_vpn_get_data_keys ()">nm_setting_vpn_get_data_keys</a>, function in <a class="link" href="NMSettingVpn.html" title="NMSettingVpn">NMSettingVpn</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingVpn.html#nm-setting-vpn-get-num-data-items" title="nm_setting_vpn_get_num_data_items ()">nm_setting_vpn_get_num_data_items</a>, function in <a class="link" href="NMSettingVpn.html" title="NMSettingVpn">NMSettingVpn</a>
 </dt>
 <dd></dd>
@@ -9429,10 +9265,6 @@ nm_setting_user_set_data, function in nm-setting-user
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingVpn.html#nm-setting-vpn-get-secret-keys" title="nm_setting_vpn_get_secret_keys ()">nm_setting_vpn_get_secret_keys</a>, function in <a class="link" href="NMSettingVpn.html" title="NMSettingVpn">NMSettingVpn</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSettingVpn.html#nm-setting-vpn-get-service-type" title="nm_setting_vpn_get_service_type ()">nm_setting_vpn_get_service_type</a>, function in <a class="link" href="NMSettingVpn.html" title="NMSettingVpn">NMSettingVpn</a>
 </dt>
 <dd></dd>
@@ -10001,18 +9833,10 @@ nm_setting_user_set_data, function in nm-setting-user
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_FILS">NM_SETTING_WIRELESS_SECURITY_FILS</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-get-auth-alg" title="nm_setting_wireless_security_get_auth_alg ()">nm_setting_wireless_security_get_auth_alg</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-fils" title="nm_setting_wireless_security_get_fils ()">nm_setting_wireless_security_get_fils</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-group" title="nm_setting_wireless_security_get_group ()">nm_setting_wireless_security_get_group</a>, function in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -10495,11 +10319,7 @@ nm_tc_tfilter_unref, function in nm-setting-tc-config
 </dt>
 <dd></dd>
 <dt>
-nm_utils_fixup_product_string, function in nm-libnm-utils
-</dt>
-<dd></dd>
-<dt>
-nm_utils_fixup_vendor_string, function in nm-libnm-utils
+nm_utils_fixup_desc_string, function in nm-libnm-utils
 </dt>
 <dd></dd>
 <dt>
@@ -10844,7 +10664,7 @@ NMVpnEditorInterface, struct in <a class="link" href="NMVpnEditorPlugin.html#NMV
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMVpnEditorPlugin.html#NMVpnPluginInfo" title="NMVpnPluginInfo">NMVpnPluginInfo</a>, struct in nm-vpn-plugin-info
+NMVpnPluginInfo, struct in nm-vpn-plugin-info
 </dt>
 <dd></dd>
 <dt>
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index ddd2828f..9a689570 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm 1.11.3
+      for libnm 1.10.8
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm/stable/" target="_top">https://developer.gnome.org/libnm/stable/</a>.
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index dbf59b84..575adb4e 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -206,10 +206,6 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-DBUS-INTERFACE-CHECKPOINT:CAPS" title="NM_DBUS_INTERFACE_CHECKPOINT">NM_DBUS_INTERFACE_CHECKPOINT</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-DBUS-INTERFACE-SETTINGS:CAPS" title="NM_DBUS_INTERFACE_SETTINGS">NM_DBUS_INTERFACE_SETTINGS</a></td>
 </tr>
 <tr>
@@ -410,10 +406,6 @@
 </tr>
 <tr>
 <td class="datatype_keyword">enum</td>
-<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NMSettingsConnectionFlags" title="enum NMSettingsConnectionFlags">NMSettingsConnectionFlags</a></td>
-</tr>
-<tr>
-<td class="datatype_keyword">enum</td>
 <td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NMActivationStateFlags" title="enum NMActivationStateFlags">NMActivationStateFlags</a></td>
 </tr>
 <tr>
@@ -443,13 +435,11 @@
     <span class="lineart">├──</span> NM80211ApSecurityFlags
     <span class="lineart">├──</span> NMActivationStateFlags
     <span class="lineart">├──</span> NMBluetoothCapabilities
-    <span class="lineart">├──</span> NMCheckpointCreateFlags
     <span class="lineart">├──</span> NMDeviceCapabilities
     <span class="lineart">├──</span> NMDeviceModemCapabilities
     <span class="lineart">├──</span> NMDeviceWifiCapabilities
     <span class="lineart">├──</span> NMSecretAgentCapabilities
     <span class="lineart">├──</span> NMSecretAgentGetSecretsFlags
-    <span class="lineart">├──</span> NMSettingsConnectionFlags
     <span class="lineart">╰──</span> NMSettingsUpdate2Flags
 </pre>
 </div>
@@ -707,12 +697,6 @@
 </div>
 <hr>
 <div class="refsect2">
-<a name="NM-DBUS-INTERFACE-CHECKPOINT:CAPS"></a><h3>NM_DBUS_INTERFACE_CHECKPOINT</h3>
-<pre class="programlisting">#define NM_DBUS_INTERFACE_CHECKPOINT           NM_DBUS_INTERFACE ".Checkpoint"
-</pre>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NM-DBUS-INTERFACE-SETTINGS:CAPS"></a><h3>NM_DBUS_INTERFACE_SETTINGS</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_SETTINGS        "org.freedesktop.NetworkManager.Settings"
 </pre>
@@ -2877,28 +2861,10 @@ VPN plugin authentication dialogs.</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-CHECKPOINT-CREATE-FLAG-ALLOW-OVERLAPPING:CAPS"></a>NM_CHECKPOINT_CREATE_FLAG_ALLOW_OVERLAPPING</p></td>
-<td class="enum_member_description">
-<p>by default, creating
-  a checkpoint fails if there are already existing checkoints that
-  reference the same devices. With this flag, creation of such
-  checkpoints is allowed, however, if an older checkpoint
-  that references overlapping devices gets rolled back, it will
-  automatically destroy this checkpoint during rollback. This
-  allows to create several overlapping checkpoints in parallel,
-  and rollback to them at will. With the special case that
-  rolling back to an older checkpoint will invalidate all
-  overlapping younger checkpoints. This opts-in that the
-  checkpoint can be automatically destroyed by the rollback
-  of an older checkpoint. (Since: 1.12)</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.4 (gi flags generated since 1.12)</p>
+<p class="since">Since: 1.4</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2948,62 +2914,6 @@ VPN plugin authentication dialogs.</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NMSettingsConnectionFlags"></a><h3>enum NMSettingsConnectionFlags</h3>
-<p>Flags describing the current activation state.</p>
-<div class="refsect3">
-<a name="NMSettingsConnectionFlags.members"></a><h4>Members</h4>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="300px" class="enum_members_name">
-<col class="enum_members_description">
-<col width="200px" class="enum_members_annotations">
-</colgroup>
-<tbody>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTINGS-CONNECTION-FLAG-NONE:CAPS"></a>NM_SETTINGS_CONNECTION_FLAG_NONE</p></td>
-<td class="enum_member_description">
-<p>an alias for numeric zero, no flags set.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTINGS-CONNECTION-FLAG-UNSAVED:CAPS"></a>NM_SETTINGS_CONNECTION_FLAG_UNSAVED</p></td>
-<td class="enum_member_description">
-<p>the connection is not saved to disk.
-  That either means, that the connection is in-memory only and currently
-  is not backed by a file. Or, that the connection is backed by a file,
-  but has modifications in-memory that were not persisted to disk.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTINGS-CONNECTION-FLAG-NM-GENERATED:CAPS"></a>NM_SETTINGS_CONNECTION_FLAG_NM_GENERATED</p></td>
-<td class="enum_member_description">
-<p>A connection is "nm-generated" if
- it was generated by NetworkManger. If the connection gets modified or saved
- by the user, the flag gets cleared. A nm-generated is also unsaved
- and has no backing file as it is in-memory only.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-<tr>
-<td class="enum_member_name"><p><a name="NM-SETTINGS-CONNECTION-FLAG-VOLATILE:CAPS"></a>NM_SETTINGS_CONNECTION_FLAG_VOLATILE</p></td>
-<td class="enum_member_description">
-<p>The connection will be deleted
- when it disconnects. That is for in-memory connections (unsaved), which are
- currently active but deleted on disconnect. Volatile connections are
- always unsaved, but they are also no backing file on disk and are entirely
- in-memory only.</p>
-</td>
-<td class="enum_member_annotations"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<p class="since">Since: 1.12</p>
-</div>
-<hr>
-<div class="refsect2">
 <a name="NMActivationStateFlags"></a><h3>enum NMActivationStateFlags</h3>
 <p>Flags describing the current activation state.</p>
 <div class="refsect3">
@@ -3158,7 +3068,7 @@ VPN plugin authentication dialogs.</p>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 </div>
 </div>
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 918f6336..002d54ce 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -2051,11 +2051,9 @@ nm_utils_wifi_5ghz_freqs (<em class="parameter"><code><span class="type">void</s
 nm_utils_wifi_strength_bars (<em class="parameter"><code><a href="../glib/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> strength</code></em>);</pre>
 <p>Converts <em class="parameter"><code>strength</code></em>
  into a 4-character-wide graphical representation of
-strength suitable for printing to stdout.</p>
-<p>Previous versions used to take a guess at the terminal type and possibly
-return a wide UTF-8 encoded string. Now it always returns a 7-bit
-clean strings of one to 0 to 4 asterisks. Users that actually need
-the functionality are encouraged to make their implementations instead.</p>
+strength suitable for printing to stdout. If the current locale and terminal
+support it, this will use unicode graphics characters to represent
+"bars". Otherwise it will use 0 to 4 asterisks.</p>
 <div class="refsect3">
 <a name="nm-utils-wifi-strength-bars.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -2211,8 +2209,8 @@ Bytes in <em class="parameter"><code>asc</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>buffer</p></td>
-<td class="parameter_description"><p>buffer to store the result into. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> guint8][<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=length]</span></td>
+<td class="parameter_description"><p>buffer to store the result into</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>length</p></td>
@@ -2364,8 +2362,8 @@ guaranteed to not match if they are invalid.)</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>hwaddr1</p></td>
-<td class="parameter_description"><p>pointer to a binary or ASCII hardware address, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></td>
+<td class="parameter_description"><p>pointer to a binary or ASCII hardware address, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>hwaddr1_len</p></td>
@@ -2376,8 +2374,8 @@ is ASCII</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>hwaddr2</p></td>
-<td class="parameter_description"><p>pointer to a binary or ASCII hardware address, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></td>
+<td class="parameter_description"><p>pointer to a binary or ASCII hardware address, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>hwaddr2_len</p></td>
@@ -2600,7 +2598,7 @@ nm_utils_inet4_ntop (<em class="parameter"><code><span class="type">in_addr_t</s
 characters. If set to <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, it will return a pointer to an internal, static
 buffer (shared with <a class="link" href="libnm-nm-utils.html#nm-utils-inet6-ntop" title="nm_utils_inet6_ntop ()"><code class="function">nm_utils_inet6_ntop()</code></a>).  Beware, that the internal
 buffer will be overwritten with ever new call of <a class="link" href="libnm-nm-utils.html#nm-utils-inet4-ntop" title="nm_utils_inet4_ntop ()"><code class="function">nm_utils_inet4_ntop()</code></a> or
-<a class="link" href="libnm-nm-utils.html#nm-utils-inet6-ntop" title="nm_utils_inet6_ntop ()"><code class="function">nm_utils_inet6_ntop()</code></a> that does not provide its own <em class="parameter"><code>dst</code></em>
+<a class="link" href="libnm-nm-utils.html#nm-utils-inet6-ntop" title="nm_utils_inet6_ntop ()"><code class="function">nm_utils_inet6_ntop()</code></a> that does not provied it's own <em class="parameter"><code>dst</code></em>
 buffer. Also,
 using the internal buffer is not thread safe. When in doubt, pass your own
 <em class="parameter"><code>dst</code></em>
@@ -2646,7 +2644,7 @@ nm_utils_inet6_ntop (<em class="parameter"><code>const <span class="type">struct
 characters. If set to <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, it will return a pointer to an internal, static
 buffer (shared with <a class="link" href="libnm-nm-utils.html#nm-utils-inet4-ntop" title="nm_utils_inet4_ntop ()"><code class="function">nm_utils_inet4_ntop()</code></a>).  Beware, that the internal
 buffer will be overwritten with ever new call of <a class="link" href="libnm-nm-utils.html#nm-utils-inet4-ntop" title="nm_utils_inet4_ntop ()"><code class="function">nm_utils_inet4_ntop()</code></a> or
-<a class="link" href="libnm-nm-utils.html#nm-utils-inet6-ntop" title="nm_utils_inet6_ntop ()"><code class="function">nm_utils_inet6_ntop()</code></a> that does not provide its own <em class="parameter"><code>dst</code></em>
+<a class="link" href="libnm-nm-utils.html#nm-utils-inet6-ntop" title="nm_utils_inet6_ntop ()"><code class="function">nm_utils_inet6_ntop()</code></a> that does not provied it's own <em class="parameter"><code>dst</code></em>
 buffer. Also,
 using the internal buffer is not thread safe. When in doubt, pass your own
 <em class="parameter"><code>dst</code></em>
@@ -3017,9 +3015,8 @@ nm_utils_parse_variant_attributes (<em class="parameter"><code>const <span class
 </div>
 <div class="refsect3">
 <a name="nm-utils-parse-variant-attributes.returns"></a><h4>Returns</h4>
-<p>a <a href="../glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping
-attribute names to <a href="../glib/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> values. </p>
-<p><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 GVariant]</span></p>
+<p>a <a href="../glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping attribute names to <a href="../glib/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> values. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 <p class="since">Since: 1.8</p>
 </div>
@@ -3065,7 +3062,7 @@ discipline to a <code class="literal">NMTCQdisc</code> instance. Supports a subs
 <a name="nm-utils-tc-qdisc-from-str.returns"></a><h4>Returns</h4>
 <p> the <code class="literal">NMTCQdisc</code> or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -3101,7 +3098,7 @@ discipline.</p>
 <a name="nm-utils-tc-qdisc-to-str.returns"></a><h4>Returns</h4>
 <p> formatted string or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -3137,7 +3134,7 @@ discipline to a <code class="literal">NMTCAction</code> instance. Supports a sub
 <a name="nm-utils-tc-action-from-str.returns"></a><h4>Returns</h4>
 <p> the <code class="literal">NMTCAction</code> or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -3173,7 +3170,7 @@ discipline.</p>
 <a name="nm-utils-tc-action-to-str.returns"></a><h4>Returns</h4>
 <p> formatted string or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -3209,7 +3206,7 @@ discipline to a <code class="literal">NMTCTfilter</code> instance. Supports a su
 <a name="nm-utils-tc-tfilter-from-str.returns"></a><h4>Returns</h4>
 <p> the <code class="literal">NMTCTfilter</code> or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -3245,7 +3242,7 @@ discipline.</p>
 <a name="nm-utils-tc-tfilter-to-str.returns"></a><h4>Returns</h4>
 <p> formatted string or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
 </div>
-<p class="since">Since: 1.12</p>
+<p class="since">Since: 1.10.2</p>
 </div>
 </div>
 <div class="refsect1">
diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html
index f403698d..e2010ded 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -81,12 +81,6 @@
 <a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-10-FOR:CAPS" title="NM_DEPRECATED_IN_1_10_FOR()">NM_DEPRECATED_IN_1_10_FOR</a><span class="c_punctuation">()</span>
 </td>
 </tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name">
-<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-12-FOR:CAPS" title="NM_DEPRECATED_IN_1_12_FOR()">NM_DEPRECATED_IN_1_12_FOR</a><span class="c_punctuation">()</span>
-</td>
-</tr>
 </tbody>
 </table></div>
 </div>
@@ -164,11 +158,7 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-12:CAPS" title="NM_DEPRECATED_IN_1_12">NM_DEPRECATED_IN_1_12</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-12:CAPS" title="NM_AVAILABLE_IN_1_12">NM_AVAILABLE_IN_1_12</a></td>
+<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-10-2:CAPS" title="NM_AVAILABLE_IN_1_10_2">NM_AVAILABLE_IN_1_10_2</a></td>
 </tr>
 </tbody>
 </table></div>
@@ -218,24 +208,18 @@
 <pre class="programlisting"># define NM_DEPRECATED_IN_1_10_FOR(f)    G_DEPRECATED_FOR(f)
 </pre>
 </div>
-<hr>
-<div class="refsect2">
-<a name="NM-DEPRECATED-IN-1-12-FOR:CAPS"></a><h3>NM_DEPRECATED_IN_1_12_FOR()</h3>
-<pre class="programlisting"># define NM_DEPRECATED_IN_1_12_FOR(f)    G_DEPRECATED_FOR(f)
-</pre>
-</div>
 </div>
 <div class="refsect1">
 <a name="libnm-nm-version.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
 <a name="NM-VERSION-MIN-REQUIRED:CAPS"></a><h3>NM_VERSION_MIN_REQUIRED</h3>
-<pre class="programlisting"># define NM_VERSION_MIN_REQUIRED (NM_API_VERSION)
+<pre class="programlisting"># define NM_VERSION_MIN_REQUIRED (NM_VERSION_CUR_STABLE)
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VERSION-MAX-ALLOWED:CAPS"></a><h3>NM_VERSION_MAX_ALLOWED</h3>
-<pre class="programlisting"># define NM_VERSION_MAX_ALLOWED (NM_API_VERSION)
+<pre class="programlisting"># define NM_VERSION_MAX_ALLOWED (NM_VERSION_CUR_STABLE)
 </pre>
 </div>
 <hr>
@@ -322,14 +306,8 @@
 </div>
 <hr>
 <div class="refsect2">
-<a name="NM-DEPRECATED-IN-1-12:CAPS"></a><h3>NM_DEPRECATED_IN_1_12</h3>
-<pre class="programlisting"># define NM_DEPRECATED_IN_1_12           G_DEPRECATED
-</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-AVAILABLE-IN-1-12:CAPS"></a><h3>NM_AVAILABLE_IN_1_12</h3>
-<pre class="programlisting"># define NM_AVAILABLE_IN_1_12            G_UNAVAILABLE(1,12)
+<a name="NM-AVAILABLE-IN-1-10-2:CAPS"></a><h3>NM_AVAILABLE_IN_1_10_2</h3>
+<pre class="programlisting"># define NM_AVAILABLE_IN_1_10_2          G_UNAVAILABLE(1,10.2)
 </pre>
 </div>
 </div>
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index 8ae5853d..1e687022 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -159,15 +159,6 @@
     <keyword type="function" name="nm_client_get_dns_mode ()" link="NMClient.html#nm-client-get-dns-mode" since="1.6"/>
     <keyword type="function" name="nm_client_get_dns_rc_manager ()" link="NMClient.html#nm-client-get-dns-rc-manager" since="1.6"/>
     <keyword type="function" name="nm_client_get_dns_configuration ()" link="NMClient.html#nm-client-get-dns-configuration" since="1.6"/>
-    <keyword type="function" name="nm_client_get_checkpoints ()" link="NMClient.html#nm-client-get-checkpoints" since="1.12"/>
-    <keyword type="function" name="nm_client_checkpoint_create ()" link="NMClient.html#nm-client-checkpoint-create" since="1.12"/>
-    <keyword type="function" name="nm_client_checkpoint_create_finish ()" link="NMClient.html#nm-client-checkpoint-create-finish" since="1.12"/>
-    <keyword type="function" name="nm_client_checkpoint_destroy ()" link="NMClient.html#nm-client-checkpoint-destroy" since="1.12"/>
-    <keyword type="function" name="nm_client_checkpoint_destroy_finish ()" link="NMClient.html#nm-client-checkpoint-destroy-finish" since="1.12"/>
-    <keyword type="function" name="nm_client_checkpoint_rollback ()" link="NMClient.html#nm-client-checkpoint-rollback" since="1.12"/>
-    <keyword type="function" name="nm_client_checkpoint_rollback_finish ()" link="NMClient.html#nm-client-checkpoint-rollback-finish" since="1.12"/>
-    <keyword type="function" name="nm_client_checkpoint_adjust_rollback_timeout ()" link="NMClient.html#nm-client-checkpoint-adjust-rollback-timeout" since="1.12"/>
-    <keyword type="function" name="nm_client_checkpoint_adjust_rollback_timeout_finish ()" link="NMClient.html#nm-client-checkpoint-adjust-rollback-timeout-finish" since="1.12"/>
     <keyword type="macro" name="NM_CLIENT_VERSION" link="NMClient.html#NM-CLIENT-VERSION:CAPS"/>
     <keyword type="macro" name="NM_CLIENT_STATE" link="NMClient.html#NM-CLIENT-STATE:CAPS"/>
     <keyword type="macro" name="NM_CLIENT_STARTUP" link="NMClient.html#NM-CLIENT-STARTUP:CAPS"/>
@@ -212,7 +203,6 @@
     <keyword type="property" name="The “active-connections” property" link="NMClient.html#NMClient--active-connections"/>
     <keyword type="property" name="The “all-devices” property" link="NMClient.html#NMClient--all-devices"/>
     <keyword type="property" name="The “can-modify” property" link="NMClient.html#NMClient--can-modify"/>
-    <keyword type="property" name="The “checkpoints” property" link="NMClient.html#NMClient--checkpoints"/>
     <keyword type="property" name="The “connections” property" link="NMClient.html#NMClient--connections"/>
     <keyword type="property" name="The “connectivity” property" link="NMClient.html#NMClient--connectivity"/>
     <keyword type="property" name="The “connectivity-check-available” property" link="NMClient.html#NMClient--connectivity-check-available"/>
@@ -340,7 +330,6 @@
     <keyword type="macro" name="NM_DBUS_INTERFACE_DEVICE_GRE" link="libnm-nm-dbus-interface.html#NM-DBUS-INTERFACE-DEVICE-GRE:CAPS"/>
     <keyword type="macro" name="NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL" link="libnm-nm-dbus-interface.html#NM-DBUS-INTERFACE-DEVICE-IP-TUNNEL:CAPS"/>
     <keyword type="macro" name="NM_DBUS_INTERFACE_DEVICE_STATISTICS" link="libnm-nm-dbus-interface.html#NM-DBUS-INTERFACE-DEVICE-STATISTICS:CAPS"/>
-    <keyword type="macro" name="NM_DBUS_INTERFACE_CHECKPOINT" link="libnm-nm-dbus-interface.html#NM-DBUS-INTERFACE-CHECKPOINT:CAPS"/>
     <keyword type="macro" name="NM_DBUS_INTERFACE_SETTINGS" link="libnm-nm-dbus-interface.html#NM-DBUS-INTERFACE-SETTINGS:CAPS"/>
     <keyword type="macro" name="NM_DBUS_PATH_SETTINGS" link="libnm-nm-dbus-interface.html#NM-DBUS-PATH-SETTINGS:CAPS"/>
     <keyword type="macro" name="NM_DBUS_INTERFACE_SETTINGS_CONNECTION" link="libnm-nm-dbus-interface.html#NM-DBUS-INTERFACE-SETTINGS-CONNECTION:CAPS"/>
@@ -389,11 +378,10 @@
     <keyword type="macro" name="NM_LLDP_DEST_NEAREST_NON_TPMR_BRIDGE" link="libnm-nm-dbus-interface.html#NM-LLDP-DEST-NEAREST-NON-TPMR-BRIDGE:CAPS"/>
     <keyword type="macro" name="NM_LLDP_DEST_NEAREST_CUSTOMER_BRIDGE" link="libnm-nm-dbus-interface.html#NM-LLDP-DEST-NEAREST-CUSTOMER-BRIDGE:CAPS"/>
     <keyword type="enum" name="enum NMIPTunnelMode" link="libnm-nm-dbus-interface.html#NMIPTunnelMode" since="1.2"/>
-    <keyword type="enum" name="enum NMCheckpointCreateFlags" link="libnm-nm-dbus-interface.html#NMCheckpointCreateFlags" since="1.4 (gi flags generated since 1.12)"/>
+    <keyword type="enum" name="enum NMCheckpointCreateFlags" link="libnm-nm-dbus-interface.html#NMCheckpointCreateFlags" since="1.4"/>
     <keyword type="enum" name="enum NMRollbackResult" link="libnm-nm-dbus-interface.html#NMRollbackResult" since="1.4"/>
-    <keyword type="enum" name="enum NMSettingsConnectionFlags" link="libnm-nm-dbus-interface.html#NMSettingsConnectionFlags" since="1.12"/>
     <keyword type="enum" name="enum NMActivationStateFlags" link="libnm-nm-dbus-interface.html#NMActivationStateFlags" since="1.10"/>
-    <keyword type="enum" name="enum NMSettingsUpdate2Flags" link="libnm-nm-dbus-interface.html#NMSettingsUpdate2Flags" since="1.12"/>
+    <keyword type="enum" name="enum NMSettingsUpdate2Flags" link="libnm-nm-dbus-interface.html#NMSettingsUpdate2Flags" since="1.10.2"/>
     <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"/>
@@ -451,7 +439,7 @@
     <keyword type="function" name="nm_connection_get_setting_pppoe ()" link="NMConnection.html#nm-connection-get-setting-pppoe"/>
     <keyword type="function" name="nm_connection_get_setting_proxy ()" link="NMConnection.html#nm-connection-get-setting-proxy" since="1.6"/>
     <keyword type="function" name="nm_connection_get_setting_serial ()" link="NMConnection.html#nm-connection-get-setting-serial"/>
-    <keyword type="function" name="nm_connection_get_setting_tc_config ()" link="NMConnection.html#nm-connection-get-setting-tc-config" since="1.12"/>
+    <keyword type="function" name="nm_connection_get_setting_tc_config ()" link="NMConnection.html#nm-connection-get-setting-tc-config" since="1.10.2"/>
     <keyword type="function" name="nm_connection_get_setting_tun ()" link="NMConnection.html#nm-connection-get-setting-tun" since="1.2"/>
     <keyword type="function" name="nm_connection_get_setting_vpn ()" link="NMConnection.html#nm-connection-get-setting-vpn"/>
     <keyword type="function" name="nm_connection_get_setting_wimax ()" link="NMConnection.html#nm-connection-get-setting-wimax"/>
@@ -527,7 +515,6 @@
     <keyword type="function" name="nm_setting_connection_get_metered ()" link="NMSettingConnection.html#nm-setting-connection-get-metered" since="1.2"/>
     <keyword type="function" name="nm_setting_connection_get_lldp ()" link="NMSettingConnection.html#nm-setting-connection-get-lldp" since="1.2"/>
     <keyword type="function" name="nm_setting_connection_get_auth_retries ()" link="NMSettingConnection.html#nm-setting-connection-get-auth-retries" since="1.10"/>
-    <keyword type="function" name="nm_setting_connection_get_mdns ()" link="NMSettingConnection.html#nm-setting-connection-get-mdns" since="1.12"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_SETTING_NAME" link="NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MIN" link="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-PRIORITY-MIN:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MAX" link="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-PRIORITY-MAX:CAPS"/>
@@ -552,10 +539,8 @@
     <keyword type="macro" name="NM_SETTING_CONNECTION_METERED" link="NMSettingConnection.html#NM-SETTING-CONNECTION-METERED:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_LLDP" link="NMSettingConnection.html#NM-SETTING-CONNECTION-LLDP:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_AUTH_RETRIES" link="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTH-RETRIES:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_CONNECTION_MDNS" link="NMSettingConnection.html#NM-SETTING-CONNECTION-MDNS:CAPS"/>
     <keyword type="enum" name="enum NMSettingConnectionAutoconnectSlaves" link="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves"/>
     <keyword type="enum" name="enum NMSettingConnectionLldp" link="NMSettingConnection.html#NMSettingConnectionLldp"/>
-    <keyword type="enum" name="enum NMSettingConnectionMdns" link="NMSettingConnection.html#NMSettingConnectionMdns" since="1.12"/>
     <keyword type="struct" name="NMSettingConnection" link="NMSettingConnection.html#NMSettingConnection-struct"/>
     <keyword type="property" name="The “auth-retries” property" link="NMSettingConnection.html#NMSettingConnection--auth-retries"/>
     <keyword type="property" name="The “autoconnect” property" link="NMSettingConnection.html#NMSettingConnection--autoconnect"/>
@@ -567,7 +552,6 @@
     <keyword type="property" name="The “interface-name” property" link="NMSettingConnection.html#NMSettingConnection--interface-name"/>
     <keyword type="property" name="The “lldp” property" link="NMSettingConnection.html#NMSettingConnection--lldp"/>
     <keyword type="property" name="The “master” property" link="NMSettingConnection.html#NMSettingConnection--master"/>
-    <keyword type="property" name="The “mdns” property" link="NMSettingConnection.html#NMSettingConnection--mdns"/>
     <keyword type="property" name="The “metered” property" link="NMSettingConnection.html#NMSettingConnection--metered"/>
     <keyword type="property" name="The “permissions” property" link="NMSettingConnection.html#NMSettingConnection--permissions"/>
     <keyword type="property" name="The “read-only” property" link="NMSettingConnection.html#NMSettingConnection--read-only"/>
@@ -1145,7 +1129,6 @@
     <keyword type="function" name="nm_setting_ip_config_get_may_fail ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-may-fail"/>
     <keyword type="function" name="nm_setting_ip_config_get_dad_timeout ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-dad-timeout" since="1.2"/>
     <keyword type="function" name="nm_setting_ip_config_get_dhcp_timeout ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-timeout" since="1.2"/>
-    <keyword type="macro" name="NM_IP_ADDRESS_ATTRIBUTE_LABEL" link="NMSettingIPConfig.html#NM-IP-ADDRESS-ATTRIBUTE-LABEL:CAPS"/>
     <keyword type="macro" name="NM_IP_ROUTE_ATTRIBUTE_TABLE" link="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-TABLE:CAPS"/>
     <keyword type="macro" name="NM_IP_ROUTE_ATTRIBUTE_SRC" link="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-SRC:CAPS"/>
     <keyword type="macro" name="NM_IP_ROUTE_ATTRIBUTE_FROM" link="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-FROM:CAPS"/>
@@ -1227,7 +1210,6 @@
     <keyword type="function" name="nm_setting_ip_tunnel_get_encapsulation_limit ()" link="NMSettingIPTunnel.html#nm-setting-ip-tunnel-get-encapsulation-limit" since="1.2"/>
     <keyword type="function" name="nm_setting_ip_tunnel_get_flow_label ()" link="NMSettingIPTunnel.html#nm-setting-ip-tunnel-get-flow-label" since="1.2"/>
     <keyword type="function" name="nm_setting_ip_tunnel_get_mtu ()" link="NMSettingIPTunnel.html#nm-setting-ip-tunnel-get-mtu" since="1.2"/>
-    <keyword type="function" name="nm_setting_ip_tunnel_get_flags ()" link="NMSettingIPTunnel.html#nm-setting-ip-tunnel-get-flags"/>
     <keyword type="macro" name="NM_SETTING_IP_TUNNEL_SETTING_NAME" link="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-SETTING-NAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP_TUNNEL_PARENT" link="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-PARENT:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP_TUNNEL_MODE" link="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-MODE:CAPS"/>
@@ -1241,11 +1223,8 @@
     <keyword type="macro" name="NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT" link="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-ENCAPSULATION-LIMIT:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP_TUNNEL_FLOW_LABEL" link="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-FLOW-LABEL:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP_TUNNEL_MTU" link="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-MTU:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_IP_TUNNEL_FLAGS" link="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-FLAGS:CAPS"/>
     <keyword type="struct" name="NMSettingIPTunnel" link="NMSettingIPTunnel.html#NMSettingIPTunnel-struct"/>
-    <keyword type="enum" name="enum NMIPTunnelFlags" link="NMSettingIPTunnel.html#NMIPTunnelFlags"/>
     <keyword type="property" name="The “encapsulation-limit” property" link="NMSettingIPTunnel.html#NMSettingIPTunnel--encapsulation-limit"/>
-    <keyword type="property" name="The “flags” property" link="NMSettingIPTunnel.html#NMSettingIPTunnel--flags"/>
     <keyword type="property" name="The “flow-label” property" link="NMSettingIPTunnel.html#NMSettingIPTunnel--flow-label"/>
     <keyword type="property" name="The “input-key” property" link="NMSettingIPTunnel.html#NMSettingIPTunnel--input-key"/>
     <keyword type="property" name="The “local” property" link="NMSettingIPTunnel.html#NMSettingIPTunnel--local"/>
@@ -1410,48 +1389,48 @@
     <keyword type="property" name="The “parity” property" link="NMSettingSerial.html#NMSettingSerial--parity"/>
     <keyword type="property" name="The “send-delay” property" link="NMSettingSerial.html#NMSettingSerial--send-delay"/>
     <keyword type="property" name="The “stopbits” property" link="NMSettingSerial.html#NMSettingSerial--stopbits"/>
-    <keyword type="function" name="nm_team_link_watcher_new_ethtool ()" link="NMSettingTeam.html#nm-team-link-watcher-new-ethtool" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_new_nsna_ping ()" link="NMSettingTeam.html#nm-team-link-watcher-new-nsna-ping" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_new_arp_ping ()" link="NMSettingTeam.html#nm-team-link-watcher-new-arp-ping" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_ref ()" link="NMSettingTeam.html#nm-team-link-watcher-ref" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_unref ()" link="NMSettingTeam.html#nm-team-link-watcher-unref" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_equal ()" link="NMSettingTeam.html#nm-team-link-watcher-equal" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_dup ()" link="NMSettingTeam.html#nm-team-link-watcher-dup" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_get_name ()" link="NMSettingTeam.html#nm-team-link-watcher-get-name" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_get_delay_up ()" link="NMSettingTeam.html#nm-team-link-watcher-get-delay-up" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_get_delay_down ()" link="NMSettingTeam.html#nm-team-link-watcher-get-delay-down" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_get_init_wait ()" link="NMSettingTeam.html#nm-team-link-watcher-get-init-wait" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_get_interval ()" link="NMSettingTeam.html#nm-team-link-watcher-get-interval" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_get_missed_max ()" link="NMSettingTeam.html#nm-team-link-watcher-get-missed-max" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_get_target_host ()" link="NMSettingTeam.html#nm-team-link-watcher-get-target-host" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_get_source_host ()" link="NMSettingTeam.html#nm-team-link-watcher-get-source-host" since="1.12"/>
-    <keyword type="function" name="nm_team_link_watcher_get_flags ()" link="NMSettingTeam.html#nm-team-link-watcher-get-flags" since="1.12"/>
+    <keyword type="function" name="nm_team_link_watcher_new_ethtool ()" link="NMSettingTeam.html#nm-team-link-watcher-new-ethtool" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_new_nsna_ping ()" link="NMSettingTeam.html#nm-team-link-watcher-new-nsna-ping" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_new_arp_ping ()" link="NMSettingTeam.html#nm-team-link-watcher-new-arp-ping" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_ref ()" link="NMSettingTeam.html#nm-team-link-watcher-ref" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_unref ()" link="NMSettingTeam.html#nm-team-link-watcher-unref" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_equal ()" link="NMSettingTeam.html#nm-team-link-watcher-equal" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_dup ()" link="NMSettingTeam.html#nm-team-link-watcher-dup" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_get_name ()" link="NMSettingTeam.html#nm-team-link-watcher-get-name" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_get_delay_up ()" link="NMSettingTeam.html#nm-team-link-watcher-get-delay-up" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_get_delay_down ()" link="NMSettingTeam.html#nm-team-link-watcher-get-delay-down" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_get_init_wait ()" link="NMSettingTeam.html#nm-team-link-watcher-get-init-wait" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_get_interval ()" link="NMSettingTeam.html#nm-team-link-watcher-get-interval" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_get_missed_max ()" link="NMSettingTeam.html#nm-team-link-watcher-get-missed-max" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_get_target_host ()" link="NMSettingTeam.html#nm-team-link-watcher-get-target-host" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_get_source_host ()" link="NMSettingTeam.html#nm-team-link-watcher-get-source-host" since="1.10.2"/>
+    <keyword type="function" name="nm_team_link_watcher_get_flags ()" link="NMSettingTeam.html#nm-team-link-watcher-get-flags" since="1.10.2"/>
     <keyword type="function" name="nm_setting_team_new ()" link="NMSettingTeam.html#nm-setting-team-new"/>
     <keyword type="function" name="nm_setting_team_get_config ()" link="NMSettingTeam.html#nm-setting-team-get-config"/>
-    <keyword type="function" name="nm_setting_team_get_notify_peers_count ()" link="NMSettingTeam.html#nm-setting-team-get-notify-peers-count" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_notify_peers_interval ()" link="NMSettingTeam.html#nm-setting-team-get-notify-peers-interval" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_mcast_rejoin_count ()" link="NMSettingTeam.html#nm-setting-team-get-mcast-rejoin-count" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_mcast_rejoin_interval ()" link="NMSettingTeam.html#nm-setting-team-get-mcast-rejoin-interval" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_runner ()" link="NMSettingTeam.html#nm-setting-team-get-runner" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_runner_hwaddr_policy ()" link="NMSettingTeam.html#nm-setting-team-get-runner-hwaddr-policy" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_runner_tx_balancer ()" link="NMSettingTeam.html#nm-setting-team-get-runner-tx-balancer" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_runner_tx_balancer_interval ()" link="NMSettingTeam.html#nm-setting-team-get-runner-tx-balancer-interval" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_runner_active ()" link="NMSettingTeam.html#nm-setting-team-get-runner-active" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_runner_fast_rate ()" link="NMSettingTeam.html#nm-setting-team-get-runner-fast-rate" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_runner_sys_prio ()" link="NMSettingTeam.html#nm-setting-team-get-runner-sys-prio" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_runner_min_ports ()" link="NMSettingTeam.html#nm-setting-team-get-runner-min-ports" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_runner_agg_select_policy ()" link="NMSettingTeam.html#nm-setting-team-get-runner-agg-select-policy" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_remove_runner_tx_hash_by_value ()" link="NMSettingTeam.html#nm-setting-team-remove-runner-tx-hash-by-value" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_num_runner_tx_hash ()" link="NMSettingTeam.html#nm-setting-team-get-num-runner-tx-hash" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_runner_tx_hash ()" link="NMSettingTeam.html#nm-setting-team-get-runner-tx-hash" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_remove_runner_tx_hash ()" link="NMSettingTeam.html#nm-setting-team-remove-runner-tx-hash" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_add_runner_tx_hash ()" link="NMSettingTeam.html#nm-setting-team-add-runner-tx-hash" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_num_link_watchers ()" link="NMSettingTeam.html#nm-setting-team-get-num-link-watchers" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_get_link_watcher ()" link="NMSettingTeam.html#nm-setting-team-get-link-watcher" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_add_link_watcher ()" link="NMSettingTeam.html#nm-setting-team-add-link-watcher" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_remove_link_watcher ()" link="NMSettingTeam.html#nm-setting-team-remove-link-watcher" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_remove_link_watcher_by_value ()" link="NMSettingTeam.html#nm-setting-team-remove-link-watcher-by-value" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_clear_link_watchers ()" link="NMSettingTeam.html#nm-setting-team-clear-link-watchers" since="1.12"/>
+    <keyword type="function" name="nm_setting_team_get_notify_peers_count ()" link="NMSettingTeam.html#nm-setting-team-get-notify-peers-count" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_notify_peers_interval ()" link="NMSettingTeam.html#nm-setting-team-get-notify-peers-interval" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_mcast_rejoin_count ()" link="NMSettingTeam.html#nm-setting-team-get-mcast-rejoin-count" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_mcast_rejoin_interval ()" link="NMSettingTeam.html#nm-setting-team-get-mcast-rejoin-interval" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_runner ()" link="NMSettingTeam.html#nm-setting-team-get-runner" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_runner_hwaddr_policy ()" link="NMSettingTeam.html#nm-setting-team-get-runner-hwaddr-policy" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_runner_tx_balancer ()" link="NMSettingTeam.html#nm-setting-team-get-runner-tx-balancer" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_runner_tx_balancer_interval ()" link="NMSettingTeam.html#nm-setting-team-get-runner-tx-balancer-interval" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_runner_active ()" link="NMSettingTeam.html#nm-setting-team-get-runner-active" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_runner_fast_rate ()" link="NMSettingTeam.html#nm-setting-team-get-runner-fast-rate" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_runner_sys_prio ()" link="NMSettingTeam.html#nm-setting-team-get-runner-sys-prio" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_runner_min_ports ()" link="NMSettingTeam.html#nm-setting-team-get-runner-min-ports" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_runner_agg_select_policy ()" link="NMSettingTeam.html#nm-setting-team-get-runner-agg-select-policy" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_remove_runner_tx_hash_by_value ()" link="NMSettingTeam.html#nm-setting-team-remove-runner-tx-hash-by-value" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_num_runner_tx_hash ()" link="NMSettingTeam.html#nm-setting-team-get-num-runner-tx-hash" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_runner_tx_hash ()" link="NMSettingTeam.html#nm-setting-team-get-runner-tx-hash" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_remove_runner_tx_hash ()" link="NMSettingTeam.html#nm-setting-team-remove-runner-tx-hash" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_add_runner_tx_hash ()" link="NMSettingTeam.html#nm-setting-team-add-runner-tx-hash" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_num_link_watchers ()" link="NMSettingTeam.html#nm-setting-team-get-num-link-watchers" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_get_link_watcher ()" link="NMSettingTeam.html#nm-setting-team-get-link-watcher" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_add_link_watcher ()" link="NMSettingTeam.html#nm-setting-team-add-link-watcher" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_remove_link_watcher ()" link="NMSettingTeam.html#nm-setting-team-remove-link-watcher" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_remove_link_watcher_by_value ()" link="NMSettingTeam.html#nm-setting-team-remove-link-watcher-by-value" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_clear_link_watchers ()" link="NMSettingTeam.html#nm-setting-team-clear-link-watchers" since="1.10.2"/>
     <keyword type="enum" name="enum NMTeamLinkWatcherArpPingFlags" link="NMSettingTeam.html#NMTeamLinkWatcherArpPingFlags"/>
     <keyword type="macro" name="NM_TEAM_LINK_WATCHER_ETHTOOL" link="NMSettingTeam.html#NM-TEAM-LINK-WATCHER-ETHTOOL:CAPS"/>
     <keyword type="macro" name="NM_TEAM_LINK_WATCHER_ARP_PING" link="NMSettingTeam.html#NM-TEAM-LINK-WATCHER-ARP-PING:CAPS"/>
@@ -1513,17 +1492,17 @@
     <keyword type="property" name="The “runner-tx-hash” property" link="NMSettingTeam.html#NMSettingTeam--runner-tx-hash"/>
     <keyword type="function" name="nm_setting_team_port_new ()" link="NMSettingTeamPort.html#nm-setting-team-port-new"/>
     <keyword type="function" name="nm_setting_team_port_get_config ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-config"/>
-    <keyword type="function" name="nm_setting_team_port_get_queue_id ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-queue-id" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_get_prio ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-prio" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_get_sticky ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-sticky" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_get_lacp_prio ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-lacp-prio" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_get_lacp_key ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-lacp-key" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_get_num_link_watchers ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-num-link-watchers" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_get_link_watcher ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-link-watcher" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_add_link_watcher ()" link="NMSettingTeamPort.html#nm-setting-team-port-add-link-watcher" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_remove_link_watcher ()" link="NMSettingTeamPort.html#nm-setting-team-port-remove-link-watcher" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_remove_link_watcher_by_value ()" link="NMSettingTeamPort.html#nm-setting-team-port-remove-link-watcher-by-value" since="1.12"/>
-    <keyword type="function" name="nm_setting_team_port_clear_link_watchers ()" link="NMSettingTeamPort.html#nm-setting-team-port-clear-link-watchers" since="1.12"/>
+    <keyword type="function" name="nm_setting_team_port_get_queue_id ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-queue-id" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_port_get_prio ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-prio" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_port_get_sticky ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-sticky" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_port_get_lacp_prio ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-lacp-prio" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_port_get_lacp_key ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-lacp-key" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_port_get_num_link_watchers ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-num-link-watchers" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_port_get_link_watcher ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-link-watcher" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_port_add_link_watcher ()" link="NMSettingTeamPort.html#nm-setting-team-port-add-link-watcher" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_port_remove_link_watcher ()" link="NMSettingTeamPort.html#nm-setting-team-port-remove-link-watcher" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_port_remove_link_watcher_by_value ()" link="NMSettingTeamPort.html#nm-setting-team-port-remove-link-watcher-by-value" since="1.10.2"/>
+    <keyword type="function" name="nm_setting_team_port_clear_link_watchers ()" link="NMSettingTeamPort.html#nm-setting-team-port-clear-link-watchers" since="1.10.2"/>
     <keyword type="macro" name="NM_SETTING_TEAM_PORT_SETTING_NAME" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-SETTING-NAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_TEAM_PORT_CONFIG" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-CONFIG:CAPS"/>
     <keyword type="macro" name="NM_SETTING_TEAM_PORT_QUEUE_ID" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-QUEUE-ID:CAPS"/>
@@ -1601,13 +1580,11 @@
     <keyword type="function" name="nm_setting_vpn_get_data_item ()" link="NMSettingVpn.html#nm-setting-vpn-get-data-item"/>
     <keyword type="function" name="nm_setting_vpn_remove_data_item ()" link="NMSettingVpn.html#nm-setting-vpn-remove-data-item"/>
     <keyword type="function" name="nm_setting_vpn_foreach_data_item ()" link="NMSettingVpn.html#nm-setting-vpn-foreach-data-item"/>
-    <keyword type="function" name="nm_setting_vpn_get_data_keys ()" link="NMSettingVpn.html#nm-setting-vpn-get-data-keys" since="1.12"/>
     <keyword type="function" name="nm_setting_vpn_get_num_secrets ()" link="NMSettingVpn.html#nm-setting-vpn-get-num-secrets"/>
     <keyword type="function" name="nm_setting_vpn_add_secret ()" link="NMSettingVpn.html#nm-setting-vpn-add-secret"/>
     <keyword type="function" name="nm_setting_vpn_get_secret ()" link="NMSettingVpn.html#nm-setting-vpn-get-secret"/>
     <keyword type="function" name="nm_setting_vpn_remove_secret ()" link="NMSettingVpn.html#nm-setting-vpn-remove-secret"/>
     <keyword type="function" name="nm_setting_vpn_foreach_secret ()" link="NMSettingVpn.html#nm-setting-vpn-foreach-secret"/>
-    <keyword type="function" name="nm_setting_vpn_get_secret_keys ()" link="NMSettingVpn.html#nm-setting-vpn-get-secret-keys" since="1.12"/>
     <keyword type="function" name="nm_setting_vpn_get_timeout ()" link="NMSettingVpn.html#nm-setting-vpn-get-timeout" since="1.2"/>
     <keyword type="macro" name="NM_SETTING_VPN_SETTING_NAME" link="NMSettingVpn.html#NM-SETTING-VPN-SETTING-NAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_VPN_SERVICE_TYPE" link="NMSettingVpn.html#NM-SETTING-VPN-SERVICE-TYPE:CAPS"/>
@@ -1837,12 +1814,10 @@
     <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="function" name="nm_setting_wireless_security_get_wps_method ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-wps-method" since="1.10"/>
-    <keyword type="function" name="nm_setting_wireless_security_get_fils ()" link="NMSettingWirelessSecurity.html#nm-setting-wireless-security-get-fils"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_SETTING_NAME" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS"/>
     <keyword type="enum" name="enum NMWepKeyType" link="NMSettingWirelessSecurity.html#NMWepKeyType"/>
     <keyword type="enum" name="enum NMSettingWirelessSecurityPmf" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityPmf"/>
     <keyword type="enum" name="enum NMSettingWirelessSecurityWpsMethod" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityWpsMethod" since="1.10"/>
-    <keyword type="enum" name="enum NMSettingWirelessSecurityFils" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityFils" since="1.12"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_KEY_MGMT" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-KEY-MGMT:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-TX-KEYIDX:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_AUTH_ALG" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-AUTH-ALG:CAPS"/>
@@ -1862,10 +1837,8 @@
     <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_LEAP_PASSWORD_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_WPS_METHOD" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WPS-METHOD:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_FILS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS:CAPS"/>
     <keyword type="struct" name="NMSettingWirelessSecurity" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct"/>
     <keyword type="property" name="The “auth-alg” property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg"/>
-    <keyword type="property" name="The “fils” property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--fils"/>
     <keyword type="property" name="The “group” property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--group"/>
     <keyword type="property" name="The “key-mgmt” property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt"/>
     <keyword type="property" name="The “leap-password” property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password"/>
@@ -2075,7 +2048,6 @@
     <keyword type="function" name="nm_device_ip_tunnel_get_output_key ()" link="NMDeviceIPTunnel.html#nm-device-ip-tunnel-get-output-key" since="1.2"/>
     <keyword type="function" name="nm_device_ip_tunnel_get_encapsulation_limit ()" link="NMDeviceIPTunnel.html#nm-device-ip-tunnel-get-encapsulation-limit" since="1.2"/>
     <keyword type="function" name="nm_device_ip_tunnel_get_flow_label ()" link="NMDeviceIPTunnel.html#nm-device-ip-tunnel-get-flow-label" since="1.2"/>
-    <keyword type="function" name="nm_device_ip_tunnel_get_flags ()" link="NMDeviceIPTunnel.html#nm-device-ip-tunnel-get-flags" since="1.12"/>
     <keyword type="macro" name="NM_DEVICE_IP_TUNNEL_MODE" link="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-MODE:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_IP_TUNNEL_PARENT" link="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-PARENT:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_IP_TUNNEL_LOCAL" link="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-LOCAL:CAPS"/>
@@ -2087,10 +2059,8 @@
     <keyword type="macro" name="NM_DEVICE_IP_TUNNEL_OUTPUT_KEY" link="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-OUTPUT-KEY:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT" link="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-ENCAPSULATION-LIMIT:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_IP_TUNNEL_FLOW_LABEL" link="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-FLOW-LABEL:CAPS"/>
-    <keyword type="macro" name="NM_DEVICE_IP_TUNNEL_FLAGS" link="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-FLAGS:CAPS"/>
     <keyword type="struct" name="NMDeviceIPTunnel" link="NMDeviceIPTunnel.html#NMDeviceIPTunnel-struct"/>
     <keyword type="property" name="The “encapsulation-limit” property" link="NMDeviceIPTunnel.html#NMDeviceIPTunnel--encapsulation-limit"/>
-    <keyword type="property" name="The “flags” property" link="NMDeviceIPTunnel.html#NMDeviceIPTunnel--flags"/>
     <keyword type="property" name="The “flow-label” property" link="NMDeviceIPTunnel.html#NMDeviceIPTunnel--flow-label"/>
     <keyword type="property" name="The “input-key” property" link="NMDeviceIPTunnel.html#NMDeviceIPTunnel--input-key"/>
     <keyword type="property" name="The “local” property" link="NMDeviceIPTunnel.html#NMDeviceIPTunnel--local"/>
@@ -2397,7 +2367,7 @@
     <keyword type="property" name="The “banner” property" link="NMVpnConnection.html#NMVpnConnection--banner"/>
     <keyword type="property" name="The “vpn-state” property" link="NMVpnConnection.html#NMVpnConnection--vpn-state"/>
     <keyword type="signal" name="The “vpn-state-changed” signal" link="NMVpnConnection.html#NMVpnConnection-vpn-state-changed"/>
-    <keyword type="function" name="nm_remote_connection_update2 ()" link="NMRemoteConnection.html#nm-remote-connection-update2" since="1.12"/>
+    <keyword type="function" name="nm_remote_connection_update2 ()" link="NMRemoteConnection.html#nm-remote-connection-update2" since="1.10.2"/>
     <keyword type="function" name="nm_remote_connection_update2_finish ()" link="NMRemoteConnection.html#nm-remote-connection-update2-finish"/>
     <keyword type="function" name="nm_remote_connection_commit_changes ()" link="NMRemoteConnection.html#nm-remote-connection-commit-changes"/>
     <keyword type="function" name="nm_remote_connection_commit_changes_async ()" link="NMRemoteConnection.html#nm-remote-connection-commit-changes-async"/>
@@ -2412,15 +2382,12 @@
     <keyword type="function" name="nm_remote_connection_get_secrets_async ()" link="NMRemoteConnection.html#nm-remote-connection-get-secrets-async"/>
     <keyword type="function" name="nm_remote_connection_get_secrets_finish ()" link="NMRemoteConnection.html#nm-remote-connection-get-secrets-finish"/>
     <keyword type="function" name="nm_remote_connection_get_unsaved ()" link="NMRemoteConnection.html#nm-remote-connection-get-unsaved"/>
-    <keyword type="function" name="nm_remote_connection_get_flags ()" link="NMRemoteConnection.html#nm-remote-connection-get-flags" since="1.12"/>
     <keyword type="function" name="nm_remote_connection_get_visible ()" link="NMRemoteConnection.html#nm-remote-connection-get-visible"/>
     <keyword type="macro" name="NM_REMOTE_CONNECTION_DBUS_CONNECTION" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-DBUS-CONNECTION:CAPS"/>
     <keyword type="macro" name="NM_REMOTE_CONNECTION_PATH" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-PATH:CAPS"/>
     <keyword type="macro" name="NM_REMOTE_CONNECTION_UNSAVED" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-UNSAVED:CAPS"/>
-    <keyword type="macro" name="NM_REMOTE_CONNECTION_FLAGS" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_REMOTE_CONNECTION_VISIBLE" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-VISIBLE:CAPS"/>
     <keyword type="struct" name="NMRemoteConnection" link="NMRemoteConnection.html#NMRemoteConnection-struct"/>
-    <keyword type="property" name="The “flags” property" link="NMRemoteConnection.html#NMRemoteConnection--flags"/>
     <keyword type="property" name="The “unsaved” property" link="NMRemoteConnection.html#NMRemoteConnection--unsaved"/>
     <keyword type="property" name="The “visible” property" link="NMRemoteConnection.html#NMRemoteConnection--visible"/>
     <keyword type="function" name="nm_access_point_get_flags ()" link="NMAccessPoint.html#nm-access-point-get-flags"/>
@@ -2569,12 +2536,12 @@
     <keyword type="function" name="nm_utils_version ()" link="libnm-nm-utils.html#nm-utils-version" since="1.6.0"/>
     <keyword type="function" name="nm_utils_parse_variant_attributes ()" link="libnm-nm-utils.html#nm-utils-parse-variant-attributes" since="1.8"/>
     <keyword type="function" name="nm_utils_format_variant_attributes ()" link="libnm-nm-utils.html#nm-utils-format-variant-attributes"/>
-    <keyword type="function" name="nm_utils_tc_qdisc_from_str ()" link="libnm-nm-utils.html#nm-utils-tc-qdisc-from-str" since="1.12"/>
-    <keyword type="function" name="nm_utils_tc_qdisc_to_str ()" link="libnm-nm-utils.html#nm-utils-tc-qdisc-to-str" since="1.12"/>
-    <keyword type="function" name="nm_utils_tc_action_from_str ()" link="libnm-nm-utils.html#nm-utils-tc-action-from-str" since="1.12"/>
-    <keyword type="function" name="nm_utils_tc_action_to_str ()" link="libnm-nm-utils.html#nm-utils-tc-action-to-str" since="1.12"/>
-    <keyword type="function" name="nm_utils_tc_tfilter_from_str ()" link="libnm-nm-utils.html#nm-utils-tc-tfilter-from-str" since="1.12"/>
-    <keyword type="function" name="nm_utils_tc_tfilter_to_str ()" link="libnm-nm-utils.html#nm-utils-tc-tfilter-to-str" since="1.12"/>
+    <keyword type="function" name="nm_utils_tc_qdisc_from_str ()" link="libnm-nm-utils.html#nm-utils-tc-qdisc-from-str" since="1.10.2"/>
+    <keyword type="function" name="nm_utils_tc_qdisc_to_str ()" link="libnm-nm-utils.html#nm-utils-tc-qdisc-to-str" since="1.10.2"/>
+    <keyword type="function" name="nm_utils_tc_action_from_str ()" link="libnm-nm-utils.html#nm-utils-tc-action-from-str" since="1.10.2"/>
+    <keyword type="function" name="nm_utils_tc_action_to_str ()" link="libnm-nm-utils.html#nm-utils-tc-action-to-str" since="1.10.2"/>
+    <keyword type="function" name="nm_utils_tc_tfilter_from_str ()" link="libnm-nm-utils.html#nm-utils-tc-tfilter-from-str" since="1.10.2"/>
+    <keyword type="function" name="nm_utils_tc_tfilter_to_str ()" link="libnm-nm-utils.html#nm-utils-tc-tfilter-to-str" since="1.10.2"/>
     <keyword type="enum" name="enum NMUtilsSecurityType" link="libnm-nm-utils.html#NMUtilsSecurityType"/>
     <keyword type="macro" name="NM_UTILS_HWADDR_LEN_MAX" link="libnm-nm-utils.html#NM-UTILS-HWADDR-LEN-MAX:CAPS"/>
     <keyword type="macro" name="NM_UTILS_INET_ADDRSTRLEN" link="libnm-nm-utils.html#NM-UTILS-INET-ADDRSTRLEN:CAPS"/>
@@ -2587,7 +2554,6 @@
     <keyword type="macro" name="NM_DEPRECATED_IN_1_6_FOR()" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-6-FOR:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_1_8_FOR()" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-8-FOR:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_1_10_FOR()" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-10-FOR:CAPS"/>
-    <keyword type="macro" name="NM_DEPRECATED_IN_1_12_FOR()" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-12-FOR:CAPS"/>
     <keyword type="macro" name="NM_VERSION_MIN_REQUIRED" link="libnm-nm-version.html#NM-VERSION-MIN-REQUIRED:CAPS"/>
     <keyword type="macro" name="NM_VERSION_MAX_ALLOWED" link="libnm-nm-version.html#NM-VERSION-MAX-ALLOWED:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_0_9_10" link="libnm-nm-version.html#NM-DEPRECATED-IN-0-9-10:CAPS"/>
@@ -2604,8 +2570,7 @@
     <keyword type="macro" name="NM_AVAILABLE_IN_1_8" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-8:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_1_10" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-10:CAPS"/>
     <keyword type="macro" name="NM_AVAILABLE_IN_1_10" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-10:CAPS"/>
-    <keyword type="macro" name="NM_DEPRECATED_IN_1_12" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-12:CAPS"/>
-    <keyword type="macro" name="NM_AVAILABLE_IN_1_12" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-12:CAPS"/>
+    <keyword type="macro" name="NM_AVAILABLE_IN_1_10_2" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-10-2:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_1_8_FOR()" link="libnm-nm-vpn-dbus-interface.html#NM-DEPRECATED-IN-1-8-FOR:CAPS"/>
     <keyword type="macro" name="NM_DBUS_PATH_VPN" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-PATH-VPN:CAPS"/>
     <keyword type="macro" name="NM_DBUS_INTERFACE_VPN" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-INTERFACE-VPN:CAPS"/>
@@ -2691,7 +2656,6 @@
     <keyword type="struct" name="NMVpnEditorPluginInterface" link="NMVpnEditorPlugin.html#NMVpnEditorPluginInterface"/>
     <keyword type="struct" name="NMVpnEditor" link="NMVpnEditorPlugin.html#NMVpnEditor-struct"/>
     <keyword type="struct" name="NMVpnEditorPluginVT" link="NMVpnEditorPlugin.html#NMVpnEditorPluginVT"/>
-    <keyword type="struct" name="NMVpnPluginInfo" link="NMVpnEditorPlugin.html#NMVpnPluginInfo"/>
     <keyword type="property" name="The “description” property" link="NMVpnEditorPlugin.html#NMVpnEditorPlugin--description"/>
     <keyword type="property" name="The “name” property" link="NMVpnEditorPlugin.html#NMVpnEditorPlugin--name"/>
     <keyword type="property" name="The “service” property" link="NMVpnEditorPlugin.html#NMVpnEditorPlugin--service"/>
@@ -3007,15 +2971,10 @@
     <keyword type="constant" name="NM_CHECKPOINT_CREATE_FLAG_DESTROY_ALL" link="libnm-nm-dbus-interface.html#NM-CHECKPOINT-CREATE-FLAG-DESTROY-ALL:CAPS"/>
     <keyword type="constant" name="NM_CHECKPOINT_CREATE_FLAG_DELETE_NEW_CONNECTIONS" link="libnm-nm-dbus-interface.html#NM-CHECKPOINT-CREATE-FLAG-DELETE-NEW-CONNECTIONS:CAPS"/>
     <keyword type="constant" name="NM_CHECKPOINT_CREATE_FLAG_DISCONNECT_NEW_DEVICES" link="libnm-nm-dbus-interface.html#NM-CHECKPOINT-CREATE-FLAG-DISCONNECT-NEW-DEVICES:CAPS"/>
-    <keyword type="constant" name="NM_CHECKPOINT_CREATE_FLAG_ALLOW_OVERLAPPING" link="libnm-nm-dbus-interface.html#NM-CHECKPOINT-CREATE-FLAG-ALLOW-OVERLAPPING:CAPS"/>
     <keyword type="constant" name="NM_ROLLBACK_RESULT_OK" link="libnm-nm-dbus-interface.html#NM-ROLLBACK-RESULT-OK:CAPS"/>
     <keyword type="constant" name="NM_ROLLBACK_RESULT_ERR_NO_DEVICE" link="libnm-nm-dbus-interface.html#NM-ROLLBACK-RESULT-ERR-NO-DEVICE:CAPS"/>
     <keyword type="constant" name="NM_ROLLBACK_RESULT_ERR_DEVICE_UNMANAGED" link="libnm-nm-dbus-interface.html#NM-ROLLBACK-RESULT-ERR-DEVICE-UNMANAGED:CAPS"/>
     <keyword type="constant" name="NM_ROLLBACK_RESULT_ERR_FAILED" link="libnm-nm-dbus-interface.html#NM-ROLLBACK-RESULT-ERR-FAILED:CAPS"/>
-    <keyword type="constant" name="NM_SETTINGS_CONNECTION_FLAG_NONE" link="libnm-nm-dbus-interface.html#NM-SETTINGS-CONNECTION-FLAG-NONE:CAPS"/>
-    <keyword type="constant" name="NM_SETTINGS_CONNECTION_FLAG_UNSAVED" link="libnm-nm-dbus-interface.html#NM-SETTINGS-CONNECTION-FLAG-UNSAVED:CAPS"/>
-    <keyword type="constant" name="NM_SETTINGS_CONNECTION_FLAG_NM_GENERATED" link="libnm-nm-dbus-interface.html#NM-SETTINGS-CONNECTION-FLAG-NM-GENERATED:CAPS"/>
-    <keyword type="constant" name="NM_SETTINGS_CONNECTION_FLAG_VOLATILE" link="libnm-nm-dbus-interface.html#NM-SETTINGS-CONNECTION-FLAG-VOLATILE:CAPS"/>
     <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_NONE" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-NONE:CAPS"/>
     <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_MASTER" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IS-MASTER:CAPS"/>
     <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_SLAVE" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IS-SLAVE:CAPS"/>
@@ -3060,10 +3019,6 @@
     <keyword type="constant" name="NM_SETTING_CONNECTION_LLDP_DEFAULT" link="NMSettingConnection.html#NM-SETTING-CONNECTION-LLDP-DEFAULT:CAPS"/>
     <keyword type="constant" name="NM_SETTING_CONNECTION_LLDP_DISABLE" link="NMSettingConnection.html#NM-SETTING-CONNECTION-LLDP-DISABLE:CAPS"/>
     <keyword type="constant" name="NM_SETTING_CONNECTION_LLDP_ENABLE_RX" link="NMSettingConnection.html#NM-SETTING-CONNECTION-LLDP-ENABLE-RX:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_CONNECTION_MDNS_DEFAULT" link="NMSettingConnection.html#NM-SETTING-CONNECTION-MDNS-DEFAULT:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_CONNECTION_MDNS_NO" link="NMSettingConnection.html#NM-SETTING-CONNECTION-MDNS-NO:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_CONNECTION_MDNS_RESOLVE" link="NMSettingConnection.html#NM-SETTING-CONNECTION-MDNS-RESOLVE:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_CONNECTION_MDNS_YES" link="NMSettingConnection.html#NM-SETTING-CONNECTION-MDNS-YES: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"/>
@@ -3088,13 +3043,6 @@
     <keyword type="constant" name="NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-TEMP-ADDR:CAPS"/>
     <keyword type="constant" name="NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ADDR-GEN-MODE-EUI64:CAPS"/>
     <keyword type="constant" name="NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ADDR-GEN-MODE-STABLE-PRIVACY:CAPS"/>
-    <keyword type="constant" name="NM_IP_TUNNEL_FLAG_NONE" link="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-NONE:CAPS"/>
-    <keyword type="constant" name="NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT" link="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-IGN-ENCAP-LIMIT:CAPS"/>
-    <keyword type="constant" name="NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS" link="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-USE-ORIG-TCLASS:CAPS"/>
-    <keyword type="constant" name="NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL" link="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-USE-ORIG-FLOWLABEL:CAPS"/>
-    <keyword type="constant" name="NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV" link="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-MIP6-DEV:CAPS"/>
-    <keyword type="constant" name="NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY" link="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-RCV-DSCP-COPY:CAPS"/>
-    <keyword type="constant" name="NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK" link="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-USE-ORIG-FWMARK:CAPS"/>
     <keyword type="constant" name="NM_SETTING_MACSEC_MODE_PSK" link="NMSettingMacsec.html#NM-SETTING-MACSEC-MODE-PSK:CAPS"/>
     <keyword type="constant" name="NM_SETTING_MACSEC_MODE_EAP" link="NMSettingMacsec.html#NM-SETTING-MACSEC-MODE-EAP:CAPS"/>
     <keyword type="constant" name="NM_SETTING_MACSEC_VALIDATION_DISABLE" link="NMSettingMacsec.html#NM-SETTING-MACSEC-VALIDATION-DISABLE:CAPS"/>
@@ -3157,12 +3105,6 @@
     <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_AUTO" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WPS-METHOD-AUTO:CAPS"/>
     <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_PBC" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WPS-METHOD-PBC:CAPS"/>
     <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_PIN" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WPS-METHOD-PIN:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-DEFAULT:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-DISABLE:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-OPTIONAL:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-REQUIRED:CAPS"/>
-    <keyword type="constant" name="_NM_SETTING_WIRELESS_SECURITY_FILS_NUM" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-NUM:CAPS"/>
-    <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_FILS_LAST" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-FILS-LAST:CAPS"/>
     <keyword type="constant" name="NMU_SEC_INVALID" link="libnm-nm-utils.html#NMU-SEC-INVALID:CAPS"/>
     <keyword type="constant" name="NMU_SEC_NONE" link="libnm-nm-utils.html#NMU-SEC-NONE:CAPS"/>
     <keyword type="constant" name="NMU_SEC_STATIC_WEP" link="libnm-nm-utils.html#NMU-SEC-STATIC-WEP:CAPS"/>
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index 3a05c8a2..268539b2 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -69,7 +69,6 @@
     <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
     <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
     <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="NMVpnConnection.html" title="NMVpnConnection">NMVpnConnection</a>
-    <span class="lineart">│</span>   <span class="lineart">├──</span> NMCheckpoint
     <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
     <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a>
     <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMDeviceBond.html" title="NMDeviceBond">NMDeviceBond</a>
@@ -110,19 +109,16 @@
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NM80211ApSecurityFlags" title="enum NM80211ApSecurityFlags">NM80211ApSecurityFlags</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMActivationStateFlags" title="enum NMActivationStateFlags">NMActivationStateFlags</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities">NMBluetoothCapabilities</a>
-    <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMCheckpointCreateFlags" title="enum NMCheckpointCreateFlags">NMCheckpointCreateFlags</a>
     <span class="lineart">├──</span> <a class="link" href="NMConnection.html#NMConnectionSerializationFlags" title="enum NMConnectionSerializationFlags">NMConnectionSerializationFlags</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceCapabilities" title="enum NMDeviceCapabilities">NMDeviceCapabilities</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceModemCapabilities" title="enum NMDeviceModemCapabilities">NMDeviceModemCapabilities</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceWifiCapabilities" title="enum NMDeviceWifiCapabilities">NMDeviceWifiCapabilities</a>
-    <span class="lineart">├──</span> <a class="link" href="NMSettingIPTunnel.html#NMIPTunnelFlags" title="enum NMIPTunnelFlags">NMIPTunnelFlags</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMSecretAgentCapabilities" title="enum NMSecretAgentCapabilities">NMSecretAgentCapabilities</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags">NMSecretAgentGetSecretsFlags</a>
     <span class="lineart">├──</span> <a class="link" href="NMSetting8021x.html#NMSetting8021xAuthFlags" title="enum NMSetting8021xAuthFlags">NMSetting8021xAuthFlags</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags">NMSettingDcbFlags</a>
     <span class="lineart">├──</span> <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags">NMSettingSecretFlags</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingWired.html#NMSettingWiredWakeOnLan" title="enum NMSettingWiredWakeOnLan">NMSettingWiredWakeOnLan</a>
-    <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMSettingsConnectionFlags" title="enum NMSettingsConnectionFlags">NMSettingsConnectionFlags</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMSettingsUpdate2Flags" title="enum NMSettingsUpdate2Flags">NMSettingsUpdate2Flags</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingTeam.html#NMTeamLinkWatcherArpPingFlags" title="enum NMTeamLinkWatcherArpPingFlags">NMTeamLinkWatcherArpPingFlags</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingVlan.html#NMVlanFlags" title="enum NMVlanFlags">NMVlanFlags</a>
@@ -154,7 +150,6 @@
     <span class="lineart">├──</span> <a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags">NMSettingCompareFlags</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves">NMSettingConnectionAutoconnectSlaves</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingConnection.html#NMSettingConnectionLldp" title="enum NMSettingConnectionLldp">NMSettingConnectionLldp</a>
-    <span class="lineart">├──</span> <a class="link" href="NMSettingConnection.html#NMSettingConnectionMdns" title="enum NMSettingConnectionMdns">NMSettingConnectionMdns</a>
     <span class="lineart">├──</span> <a class="link" href="NMSetting.html#NMSettingDiffResult" title="enum NMSettingDiffResult">NMSettingDiffResult</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigAddrGenMode" title="enum NMSettingIP6ConfigAddrGenMode">NMSettingIP6ConfigAddrGenMode</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigPrivacy" title="enum NMSettingIP6ConfigPrivacy">NMSettingIP6ConfigPrivacy</a>
@@ -166,7 +161,6 @@
     <span class="lineart">├──</span> <a class="link" href="NMSettingSerial.html#NMSettingSerialParity" title="enum NMSettingSerialParity">NMSettingSerialParity</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingTun.html#NMSettingTunMode" title="enum NMSettingTunMode">NMSettingTunMode</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingWireless.html#NMSettingWirelessPowersave" title="enum NMSettingWirelessPowersave">NMSettingWirelessPowersave</a>
-    <span class="lineart">├──</span> <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityFils" title="enum NMSettingWirelessSecurityFils">NMSettingWirelessSecurityFils</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityPmf" title="enum NMSettingWirelessSecurityPmf">NMSettingWirelessSecurityPmf</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurityWpsMethod" title="enum NMSettingWirelessSecurityWpsMethod">NMSettingWirelessSecurityWpsMethod</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMState" title="enum NMState">NMState</a>
diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
index e037ae29..9ec43f4b 100644
--- a/docs/libnm/html/usage.html
+++ b/docs/libnm/html/usage.html
@@ -96,7 +96,7 @@
         </p>
 <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c</code></strong>
   <code class="prompt">$ </code><strong class="userinput"><code>./hello-nm</code></strong>
-  NetworkManager version: 1.11.3
+  NetworkManager version: 1.10.8
 
   <code class="prompt">$ </code></pre>
 <p>
diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt
index af7571bc..7310f18b 100644
--- a/docs/libnm/libnm-sections.txt
+++ b/docs/libnm/libnm-sections.txt
@@ -88,29 +88,6 @@ nm_active_connection_get_type
 </SECTION>
 
 <SECTION>
-<FILE>nm-autoptr</FILE>
-
-</SECTION>
-
-<SECTION>
-<FILE>nm-checkpoint</FILE>
-NM_CHECKPOINT_DEVICES
-NM_CHECKPOINT_CREATED
-NM_CHECKPOINT_ROLLBACK_TIMEOUT
-nm_checkpoint_get_devices
-nm_checkpoint_get_created
-nm_checkpoint_get_rollback_timeout
-<SUBSECTION Standard>
-NMCheckpointClass
-NM_CHECKPOINT
-NM_CHECKPOINT_CLASS
-NM_CHECKPOINT_GET_CLASS
-NM_IS_CHECKPOINT
-NM_TYPE_CHECKPOINT
-nm_checkpoint_get_type
-</SECTION>
-
-<SECTION>
 <FILE>nm-client</FILE>
 <TITLE>NMClient</TITLE>
 NM_CLIENT_VERSION
@@ -220,15 +197,6 @@ nm_client_reload_connections_finish
 nm_client_get_dns_mode
 nm_client_get_dns_rc_manager
 nm_client_get_dns_configuration
-nm_client_get_checkpoints
-nm_client_checkpoint_create
-nm_client_checkpoint_create_finish
-nm_client_checkpoint_destroy
-nm_client_checkpoint_destroy_finish
-nm_client_checkpoint_rollback
-nm_client_checkpoint_rollback_finish
-nm_client_checkpoint_adjust_rollback_timeout
-nm_client_checkpoint_adjust_rollback_timeout_finish
 <SUBSECTION Standard>
 NMClientClass
 NMDnsEntry
@@ -342,7 +310,6 @@ NM_TYPE_ACTIVE_CONNECTION_STATE_REASON
 NM_TYPE_AGENT_MANAGER_ERROR
 NM_TYPE_BLUETOOTH_CAPABILITIES
 NM_TYPE_CAPABILITY
-NM_TYPE_CHECKPOINT_CREATE_FLAGS
 NM_TYPE_CONNECTION_ERROR
 NM_TYPE_CONNECTION_SERIALIZATION_FLAGS
 NM_TYPE_CONNECTIVITY_STATE
@@ -353,14 +320,12 @@ NM_TYPE_DEVICE_MODEM_CAPABILITIES
 NM_TYPE_DEVICE_STATE_REASON
 NM_TYPE_DEVICE_TYPE
 NM_TYPE_DEVICE_WIFI_CAPABILITIES
-NM_TYPE_IP_TUNNEL_FLAGS
 NM_TYPE_IP_TUNNEL_MODE
 NM_TYPE_MANAGER_ERROR
 NM_TYPE_METERED
 NM_TYPE_SECRET_AGENT_CAPABILITIES
 NM_TYPE_SECRET_AGENT_ERROR
 NM_TYPE_SECRET_AGENT_GET_SECRETS_FLAGS
-NM_TYPE_SETTINGS_CONNECTION_FLAGS
 NM_TYPE_SETTINGS_ERROR
 NM_TYPE_SETTINGS_UPDATE2_FLAGS
 NM_TYPE_SETTING_802_1X_AUTH_FLAGS
@@ -369,7 +334,6 @@ NM_TYPE_SETTING_802_1X_CK_SCHEME
 NM_TYPE_SETTING_COMPARE_FLAGS
 NM_TYPE_SETTING_CONNECTION_AUTOCONNECT_SLAVES
 NM_TYPE_SETTING_CONNECTION_LLDP
-NM_TYPE_SETTING_CONNECTION_MDNS
 NM_TYPE_SETTING_DCB_FLAGS
 NM_TYPE_SETTING_DIFF_RESULT
 NM_TYPE_SETTING_IP6_CONFIG_ADDR_GEN_MODE
@@ -384,7 +348,6 @@ NM_TYPE_SETTING_SERIAL_PARITY
 NM_TYPE_SETTING_TUN_MODE
 NM_TYPE_SETTING_WIRED_WAKE_ON_LAN
 NM_TYPE_SETTING_WIRELESS_POWERSAVE
-NM_TYPE_SETTING_WIRELESS_SECURITY_FILS
 NM_TYPE_SETTING_WIRELESS_SECURITY_PMF
 NM_TYPE_SETTING_WIRELESS_SECURITY_WPS_METHOD
 NM_TYPE_STATE
@@ -406,7 +369,6 @@ nm_active_connection_state_reason_get_type
 nm_agent_manager_error_get_type
 nm_bluetooth_capabilities_get_type
 nm_capability_get_type
-nm_checkpoint_create_flags_get_type
 nm_connection_error_get_type
 nm_connection_serialization_flags_get_type
 nm_crypto_error_get_type
@@ -416,7 +378,6 @@ nm_device_modem_capabilities_get_type
 nm_device_state_reason_get_type
 nm_device_type_get_type
 nm_device_wifi_capabilities_get_type
-nm_ip_tunnel_flags_get_type
 nm_ip_tunnel_mode_get_type
 nm_manager_error_get_type
 nm_metered_get_type
@@ -429,7 +390,6 @@ nm_setting_802_1x_ck_scheme_get_type
 nm_setting_compare_flags_get_type
 nm_setting_connection_autoconnect_slaves_get_type
 nm_setting_connection_lldp_get_type
-nm_setting_connection_mdns_get_type
 nm_setting_dcb_flags_get_type
 nm_setting_diff_result_get_type
 nm_setting_ip6_config_addr_gen_mode_get_type
@@ -444,10 +404,8 @@ nm_setting_serial_parity_get_type
 nm_setting_tun_mode_get_type
 nm_setting_wired_wake_on_lan_get_type
 nm_setting_wireless_powersave_get_type
-nm_setting_wireless_security_fils_get_type
 nm_setting_wireless_security_pmf_get_type
 nm_setting_wireless_security_wps_method_get_type
-nm_settings_connection_flags_get_type
 nm_settings_error_get_type
 nm_settings_update2_flags_get_type
 nm_state_get_type
@@ -552,7 +510,6 @@ NM_DBUS_INTERFACE_DEVICE_VXLAN
 NM_DBUS_INTERFACE_DEVICE_GRE
 NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL
 NM_DBUS_INTERFACE_DEVICE_STATISTICS
-NM_DBUS_INTERFACE_CHECKPOINT
 NM_DBUS_INTERFACE_SETTINGS
 NM_DBUS_PATH_SETTINGS
 NM_DBUS_INTERFACE_SETTINGS_CONNECTION
@@ -603,7 +560,6 @@ NM_LLDP_DEST_NEAREST_CUSTOMER_BRIDGE
 NMIPTunnelMode
 NMCheckpointCreateFlags
 NMRollbackResult
-NMSettingsConnectionFlags
 NMActivationStateFlags
 NMSettingsUpdate2Flags
 </SECTION>
@@ -873,7 +829,6 @@ NM_DEVICE_IP_TUNNEL_INPUT_KEY
 NM_DEVICE_IP_TUNNEL_OUTPUT_KEY
 NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT
 NM_DEVICE_IP_TUNNEL_FLOW_LABEL
-NM_DEVICE_IP_TUNNEL_FLAGS
 NMDeviceIPTunnel
 nm_device_ip_tunnel_get_parent
 nm_device_ip_tunnel_get_mode
@@ -886,7 +841,6 @@ nm_device_ip_tunnel_get_input_key
 nm_device_ip_tunnel_get_output_key
 nm_device_ip_tunnel_get_encapsulation_limit
 nm_device_ip_tunnel_get_flow_label
-nm_device_ip_tunnel_get_flags
 <SUBSECTION Standard>
 NMDeviceIPTunnelClass
 NM_DEVICE_IP_TUNNEL
@@ -1347,14 +1301,14 @@ json_true
 json_object_size
 json_object_set_new
 json_object_iter
+json_object_iter_at
 json_integer_value
 json_string_value
 </SECTION>
 
 <SECTION>
 <FILE>nm-libnm-utils</FILE>
-nm_utils_fixup_vendor_string
-nm_utils_fixup_product_string
+nm_utils_fixup_desc_string
 </SECTION>
 
 <SECTION>
@@ -1381,7 +1335,6 @@ nm_object_get_type
 NM_REMOTE_CONNECTION_DBUS_CONNECTION
 NM_REMOTE_CONNECTION_PATH
 NM_REMOTE_CONNECTION_UNSAVED
-NM_REMOTE_CONNECTION_FLAGS
 NM_REMOTE_CONNECTION_VISIBLE
 NMRemoteConnection
 nm_remote_connection_update2
@@ -1399,7 +1352,6 @@ nm_remote_connection_get_secrets
 nm_remote_connection_get_secrets_async
 nm_remote_connection_get_secrets_finish
 nm_remote_connection_get_unsaved
-nm_remote_connection_get_flags
 nm_remote_connection_get_visible
 <SUBSECTION Standard>
 NMRemoteConnectionClass
@@ -1848,10 +1800,8 @@ NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT
 NM_SETTING_CONNECTION_METERED
 NM_SETTING_CONNECTION_LLDP
 NM_SETTING_CONNECTION_AUTH_RETRIES
-NM_SETTING_CONNECTION_MDNS
 NMSettingConnectionAutoconnectSlaves
 NMSettingConnectionLldp
-NMSettingConnectionMdns
 NMSettingConnection
 nm_setting_connection_new
 nm_setting_connection_get_id
@@ -1884,7 +1834,6 @@ nm_setting_connection_get_gateway_ping_timeout
 nm_setting_connection_get_metered
 nm_setting_connection_get_lldp
 nm_setting_connection_get_auth_retries
-nm_setting_connection_get_mdns
 <SUBSECTION Standard>
 NMSettingConnectionClass
 NM_IS_SETTING_CONNECTION
@@ -2054,7 +2003,6 @@ nm_setting_infiniband_get_type
 <SECTION>
 <FILE>nm-setting-ip-config</FILE>
 <TITLE>NMSettingIPConfig</TITLE>
-NM_IP_ADDRESS_ATTRIBUTE_LABEL
 nm_ip_address_new
 nm_ip_address_new_binary
 nm_ip_address_ref
@@ -2221,9 +2169,7 @@ NM_SETTING_IP_TUNNEL_OUTPUT_KEY
 NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT
 NM_SETTING_IP_TUNNEL_FLOW_LABEL
 NM_SETTING_IP_TUNNEL_MTU
-NM_SETTING_IP_TUNNEL_FLAGS
 NMSettingIPTunnel
-NMIPTunnelFlags
 nm_setting_ip_tunnel_new
 nm_setting_ip_tunnel_get_parent
 nm_setting_ip_tunnel_get_mode
@@ -2237,7 +2183,6 @@ nm_setting_ip_tunnel_get_output_key
 nm_setting_ip_tunnel_get_encapsulation_limit
 nm_setting_ip_tunnel_get_flow_label
 nm_setting_ip_tunnel_get_mtu
-nm_setting_ip_tunnel_get_flags
 <SUBSECTION Standard>
 NMSettingIPTunnelClass
 NM_IS_SETTING_IP_TUNNEL
@@ -2901,13 +2846,11 @@ nm_setting_vpn_add_data_item
 nm_setting_vpn_get_data_item
 nm_setting_vpn_remove_data_item
 nm_setting_vpn_foreach_data_item
-nm_setting_vpn_get_data_keys
 nm_setting_vpn_get_num_secrets
 nm_setting_vpn_add_secret
 nm_setting_vpn_get_secret
 nm_setting_vpn_remove_secret
 nm_setting_vpn_foreach_secret
-nm_setting_vpn_get_secret_keys
 nm_setting_vpn_get_timeout
 <SUBSECTION Standard>
 NMSettingVpnClass
@@ -3111,7 +3054,6 @@ NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
 NMWepKeyType
 NMSettingWirelessSecurityPmf
 NMSettingWirelessSecurityWpsMethod
-NMSettingWirelessSecurityFils
 NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
 NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX
 NM_SETTING_WIRELESS_SECURITY_AUTH_ALG
@@ -3131,7 +3073,6 @@ NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
 NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
 NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
 NM_SETTING_WIRELESS_SECURITY_WPS_METHOD
-NM_SETTING_WIRELESS_SECURITY_FILS
 NMSettingWirelessSecurity
 nm_setting_wireless_security_new
 nm_setting_wireless_security_get_key_mgmt
@@ -3166,7 +3107,6 @@ nm_setting_wireless_security_get_auth_alg
 nm_setting_wireless_security_get_wep_key_flags
 nm_setting_wireless_security_get_wep_key_type
 nm_setting_wireless_security_get_wps_method
-nm_setting_wireless_security_get_fils
 <SUBSECTION Standard>
 NMSettingWirelessSecurityClass
 NM_IS_SETTING_WIRELESS_SECURITY
@@ -3198,7 +3138,6 @@ nm_simple_connection_get_type
 <FILE>nm-types</FILE>
 NMAccessPoint
 NMActiveConnection
-NMCheckpoint
 NMClient
 NMDevice
 NMDeviceAdsl
@@ -3338,9 +3277,7 @@ NM_AVAILABLE_IN_1_8
 NM_DEPRECATED_IN_1_10
 NM_DEPRECATED_IN_1_10_FOR
 NM_AVAILABLE_IN_1_10
-NM_DEPRECATED_IN_1_12
-NM_DEPRECATED_IN_1_12_FOR
-NM_AVAILABLE_IN_1_12
+NM_AVAILABLE_IN_1_10_2
 </SECTION>
 
 <SECTION>
@@ -3467,7 +3404,6 @@ nm_vpn_editor_plugin_get_plugin_info
 nm_vpn_editor_plugin_set_plugin_info
 NMVpnEditor
 NMVpnEditorPluginVT
-NMVpnPluginInfo
 <SUBSECTION Standard>
 NMVpnEditorPlugin
 NM_IS_VPN_EDITOR_PLUGIN
diff --git a/docs/libnm/libnm.types b/docs/libnm/libnm.types
index 41fa51a0..9682f14d 100644
--- a/docs/libnm/libnm.types
+++ b/docs/libnm/libnm.types
@@ -9,8 +9,6 @@ nm_active_connection_state_reason_get_type
 nm_agent_manager_error_get_type
 nm_bluetooth_capabilities_get_type
 nm_capability_get_type
-nm_checkpoint_create_flags_get_type
-nm_checkpoint_get_type
 nm_client_error_get_type
 nm_client_get_type
 nm_client_permission_get_type
@@ -56,7 +54,6 @@ nm_dns_entry_get_type
 nm_ip_address_get_type
 nm_ip_config_get_type
 nm_ip_route_get_type
-nm_ip_tunnel_flags_get_type
 nm_ip_tunnel_mode_get_type
 nm_lldp_neighbor_get_type
 nm_manager_error_get_type
@@ -81,7 +78,6 @@ nm_setting_compare_flags_get_type
 nm_setting_connection_autoconnect_slaves_get_type
 nm_setting_connection_get_type
 nm_setting_connection_lldp_get_type
-nm_setting_connection_mdns_get_type
 nm_setting_dcb_flags_get_type
 nm_setting_dcb_get_type
 nm_setting_diff_result_get_type
@@ -128,11 +124,9 @@ nm_setting_wired_get_type
 nm_setting_wired_wake_on_lan_get_type
 nm_setting_wireless_get_type
 nm_setting_wireless_powersave_get_type
-nm_setting_wireless_security_fils_get_type
 nm_setting_wireless_security_get_type
 nm_setting_wireless_security_pmf_get_type
 nm_setting_wireless_security_wps_method_get_type
-nm_settings_connection_flags_get_type
 nm_settings_error_get_type
 nm_settings_update2_flags_get_type
 nm_simple_connection_get_type
diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build
deleted file mode 100644
index 7baf09f8..00000000
--- a/docs/libnm/meson.build
+++ /dev/null
@@ -1,52 +0,0 @@
-doc_module = libnm_name
-
-private_headers = [
-  'common.h',
-  'crypto.h',
-  'nm-dbus-helpers.h',
-  'nm-core-internal.h',
-  'nm-core-types-internal.h',
-  'nm-device-private.h',
-  'nm-dhcp4-config.h',
-  'nm-dhcp6-config.h',
-  'nm-dns-manager.h',
-  'nm-ip4-config.h',
-  'nm-ip6-config.h',
-  'nm-manager.h',
-  'nm-object-private.h',
-  'nm-property-compare.h',
-  'nm-remote-connection-private.h',
-  'nm-remote-settings.h',
-  'nm-setting-private.h',
-  'nm-utils-private.h',
-  'nm-core-tests-enum-types.h',
-  'nm-keyfile-internal.h',
-  'nm-keyfile-utils.h',
-  'test-general-enums.h'
-]
-
-configure_file(
-  input: version_xml + '.in',
-  output: version_xml,
-  configuration: version_conf
-)
-
-gnome.gtkdoc(
-  doc_module,
-  main_xml: doc_module + '-docs.xml',
-  src_dir: [
-    libnm_core_inc,
-    libnm_inc
-  ],
-  dependencies: libnm_dep,
-  scan_args: [
-    '--rebuild-types',
-    '--rebuild-sections',
-    '--ignore-headers=' + ' '.join(private_headers)
-  ],
-  scanobjs_args: '--type-init-func="g_type_init();"',
-  fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)),
-  gobject_typesfile: doc_module + '.types',
-  html_assets: doc_module + '.png',
-  install: true
-)
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index 0a5af26d..3cc3669f 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.11.3
+1.10.8