Imported Upstream version 1.0.4 upstream/1.0.4

306 files changed, 5335 insertions, 33452 deletions

diff --git a/docs/Makefile.in b/docs/Makefile.in
index 367eedba..6d65e596 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -195,6 +195,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -308,6 +309,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in
index 162643b5..891f0402 100644
--- a/docs/api/Makefile.in
+++ b/docs/api/Makefile.in
@@ -145,6 +145,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -258,6 +259,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -455,6 +457,7 @@ GPATH = $(srcdir)
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
 SETUP_FILES = \
 	$(content_files)		\
+	$(expand_content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
@@ -463,9 +466,9 @@ SETUP_FILES = \
 ####################################
 EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in \
 	settings-spec.xsl $(GENERATED_FILES)
-DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	tmpl.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -501,11 +504,6 @@ GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
 GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
 
-#### templates ####
-GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V))
-GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_TMPL_0 = @echo "  DOC   Rebuilding template files";
-
 #### xml ####
 GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
 GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
@@ -755,18 +753,15 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
-	            destdir=`dirname $(abs_builddir)/$$file` ;\
+	            destdir=`dirname $(abs_builddir)/$$file`; \
 	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
 	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
-	    test -d $(abs_srcdir)/tmpl && \
-	        { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
-	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
 	$(AM_V_at)touch setup-build.stamp
 
@@ -779,7 +774,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$(?)" = "0"; then \
+	    if test "$$?" = "0"; then \
 	        if test "x$(V)" = "x1"; then \
 	            scanobj_options="--verbose"; \
 	        fi; \
@@ -796,23 +791,8 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	$(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	  if test -w $(abs_srcdir) ; then \
-	    cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
-	  fi \
-	fi
-	$(AM_V_at)touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	-$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
@@ -822,17 +802,17 @@ sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(
 sgml.stamp: sgml-build.stamp
 	@true
 
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkhtml_options="$$mkhtml_options --verbose"; \
 	  fi; \
 	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -848,11 +828,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp
 
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
 	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkpdf_options="$$mkpdf_options --verbose"; \
 	  fi; \
@@ -877,13 +857,15 @@ clean-local:
 	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
 	  rm -f $(DOC_MODULE).types; \
 	fi
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+	  rm -f $(DOC_MODULE)-sections.txt; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
-	    rm -rf tmpl; \
+	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local:
@@ -930,9 +912,7 @@ uninstall-local:
 @HAVE_GTK_DOC_FALSE@	@false
 
 dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
-	@mkdir $(distdir)/tmpl
 	@mkdir $(distdir)/html
-	@-cp ./tmpl/*.sgml $(distdir)/tmpl
 	@cp ./html/* $(distdir)/html
 	@-cp ./$(DOC_MODULE).pdf $(distdir)/
 	@-cp ./$(DOC_MODULE).types $(distdir)/
diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index 79421726..112d9686 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
 <book xmlns="http://www.devhelp.net/book" title="NetworkManager D-Bus Reference Manual" link="index.html" author="" name="NetworkManager" version="2" language="c">
   <chapters>
     <sub name="D-Bus API Reference" link="ref-dbus.html"/>
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index b227e2ee..c2c59933 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
 <link rel="next" href="ref-dbus.html" title="D-Bus API Reference">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -14,7 +14,7 @@
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager D-Bus Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">Version 1.0.2
+<div><p class="releaseinfo">Version 1.0.4
 </p></div>
 <div><p class="copyright">Copyright © 2012 The NetworkManager Authors</p></div>
 <div><div class="legalnotice">
@@ -72,7 +72,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index d2c5a387..54a8424f 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NetworkManager D-Bus Reference Manual: Index</title>
+<title>Index: NetworkManager D-Bus Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
 <link rel="up" href="index.html" title="NetworkManager D-Bus Reference Manual">
 <link rel="prev" href="ref-migrating.html" title="Migrating from NetworkManager 0.8 to NetworkManager 0.9">
 <link rel="next" href="license.html" title="Appendix A. License">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -25,7 +25,6 @@
 <div class="index"></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/api/html/license.html b/docs/api/html/license.html
index bd063781..b7944bba 100644
--- a/docs/api/html/license.html
+++ b/docs/api/html/license.html
@@ -2,12 +2,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NetworkManager D-Bus Reference Manual: Appendix A. License</title>
+<title>Appendix A. License: NetworkManager D-Bus Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
 <link rel="up" href="index.html" title="NetworkManager D-Bus Reference Manual">
 <link rel="prev" href="ix01.html" title="Index">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -379,7 +379,6 @@ Public License instead of this License.
     </p>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/api/html/ref-dbus.html b/docs/api/html/ref-dbus.html
index 8bc3817f..8a0b56c7 100644
--- a/docs/api/html/ref-dbus.html
+++ b/docs/api/html/ref-dbus.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NetworkManager D-Bus Reference Manual: D-Bus API Reference</title>
+<title>D-Bus API Reference: NetworkManager D-Bus Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
 <link rel="up" href="index.html" title="NetworkManager D-Bus Reference Manual">
 <link rel="prev" href="index.html" title="NetworkManager D-Bus Reference Manual">
 <link rel="next" href="ref-settings.html" title="Network Configuration Setting Specification">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -29,7 +29,6 @@
 <a class="ulink" href="spec.html" target="_top">spec.html</a>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html
index 02fcb588..34f90ebb 100644
--- a/docs/api/html/ref-migrating.html
+++ b/docs/api/html/ref-migrating.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NetworkManager D-Bus Reference Manual: Migrating from NetworkManager 0.8 to NetworkManager 0.9</title>
+<title>Migrating from NetworkManager 0.8 to NetworkManager 0.9: NetworkManager D-Bus Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
 <link rel="up" href="index.html" title="NetworkManager D-Bus Reference Manual">
 <link rel="prev" href="secrets-flags.html" title="Secret flag types">
 <link rel="next" href="ix01.html" title="Index">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -535,7 +535,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html
index 6fca6945..10405a35 100644
--- a/docs/api/html/ref-settings.html
+++ b/docs/api/html/ref-settings.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NetworkManager D-Bus Reference Manual: Network Configuration Setting Specification</title>
+<title>Network Configuration Setting Specification: NetworkManager D-Bus Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
 <link rel="up" href="index.html" title="NetworkManager D-Bus Reference Manual">
 <link rel="prev" href="ref-dbus.html" title="D-Bus API Reference">
 <link rel="next" href="secrets-flags.html" title="Secret flag types">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -248,7 +248,7 @@
 <td><pre class="screen">system-ca-certs</pre></td>
 <td><pre class="screen">boolean</pre></td>
 <td><pre class="screen">FALSE</pre></td>
-<td>When TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties.</td>
+<td>When TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides "ca-cert" and "phase2-ca-cert" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).</td>
 </tr>
 </tbody>
 </table></div>
@@ -595,6 +595,12 @@
 <td>The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.</td>
 </tr>
 <tr>
+<td><pre class="screen">autoconnect-slaves</pre></td>
+<td><pre class="screen">NMSettingConnectionAutoconnectSlaves (int32)</pre></td>
+<td><pre class="screen"></pre></td>
+<td>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 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 determine the real value. If it is default as well, this fallbacks to 0.</td>
+</tr>
+<tr>
 <td><pre class="screen">gateway-ping-timeout</pre></td>
 <td><pre class="screen">uint32</pre></td>
 <td><pre class="screen">0</pre></td>
@@ -1148,7 +1154,7 @@
 <td><pre class="screen">ip6-privacy</pre></td>
 <td><pre class="screen">NMSettingIP6ConfigPrivacy (int32)</pre></td>
 <td><pre class="screen"></pre></td>
-<td>Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses).</td>
+<td>Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to "-1" (unknown) means fallback to global configuration "ipv6.ip6-privacy". If also global configuration is unspecified or set to "-1", fallback to read "/proc/sys/net/ipv6/conf/default/use_tempaddr".</td>
 </tr>
 <tr>
 <td><pre class="screen">may-fail</pre></td>
@@ -2039,7 +2045,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/api/html/secrets-flags.html b/docs/api/html/secrets-flags.html
index 2b27c7f8..bb727419 100644
--- a/docs/api/html/secrets-flags.html
+++ b/docs/api/html/secrets-flags.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NetworkManager D-Bus Reference Manual: Secret flag types</title>
+<title>Secret flag types: NetworkManager D-Bus Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="NetworkManager D-Bus Reference Manual">
 <link rel="up" href="ref-settings.html" title="Network Configuration Setting Specification">
 <link rel="prev" href="ref-settings.html" title="Network Configuration Setting Specification">
 <link rel="next" href="ref-migrating.html" title="Migrating from NetworkManager 0.8 to NetworkManager 0.9">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -58,7 +58,6 @@
       </p>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index f7992202..bcd634dd 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 1.0.2</title><style type="text/css">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 1.0.4</title><style type="text/css">
 
           body {
             font-family: sans-serif;
@@ -97,7 +97,7 @@
             margin-right: 4em;
           }
 
-        </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 1.0.2</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license">
+        </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 1.0.4</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license">
 <p>This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -811,6 +811,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
           Modem now ready and available.
         </dd><dt><code>NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT = 59</code></dt><dd>
           The SIM PIN was incorrect.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_NEW_ACTIVATION = 60</code></dt><dd>
+          A new connection activation was enqueued.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_PARENT_CHANGED = 61</code></dt><dd>
+          The device's parent changed.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED = 62</code></dt><dd>
+          The device parent's management changed.
         </dd></dl><h2>Sets of flags:</h2><h3 xmlns=""><a name="type-NM_DEVICE_CAP" id="type-NM_DEVICE_CAP">NM_DEVICE_CAP</a></h3><dl><dt><code>NM_DEVICE_CAP_NONE = 0x0</code></dt><dd>Null capability.</dd><dt><code>NM_DEVICE_CAP_NM_SUPPORTED = 0x1</code></dt><dd>The device is supported by NetworkManager.</dd><dt><code>NM_DEVICE_CAP_CARRIER_DETECT = 0x2</code></dt><dd>The device supports carrier detection.</dd></dl><h2>Structure types:</h2><div class="struct"><h3><a name="type-NM_DEVICE_STATE_REASON_STRUCT" id="type-NM_DEVICE_STATE_REASON_STRUCT">NM_DEVICE_STATE_REASON_STRUCT</a> - (
         u: state, u: reason
         )
diff --git a/docs/api/html/style.css b/docs/api/html/style.css
index c141ddd2..36754209 100644
--- a/docs/api/html/style.css
+++ b/docs/api/html/style.css
@@ -60,7 +60,7 @@ a:hover
 div.informaltable table
 {
   border-collapse: separate;
-  border-spacing: 1em 0.5em;
+  border-spacing: 1em 0.3em;
   border: none;
 }
 
@@ -148,6 +148,8 @@ div.table table th
 h4
 {
   color: #555753;
+  margin-top: 1em;
+  margin-bottom: 1em;
 }
 
 hr
@@ -166,17 +168,16 @@ dl.toc dt
   padding-bottom: 0.25em;
 }
 
-dl.toc > dd > dl > dt
+dl.toc > dt
 {
   padding-top: 0.25em;
   padding-bottom: 0.25em;
+  font-weight: bold;
 }
 
-dl.toc > dt
+dl.toc > dl
 {
-  padding-top: 1em;
   padding-bottom: 0.5em;
-  font-weight: bold;
 }
 
 .parameter
@@ -346,7 +347,9 @@ acronym,abbr
 }
 
 @media screen {
-  sup a.footnote
+  /* these have a <sup> as a first child, but since there are no parent selectors
+   * we can't use that. */
+  a.footnote
   {
     position: relative;
     top: 0em ! important;
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index abf8fde1..f1b507fe 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -34,7 +34,7 @@
     <row><entry><screen>private-key-password</screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>The password used to decrypt the private key specified in the "private-key" property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.</entry></row>
     <row><entry><screen>private-key-password-flags</screen></entry><entry><screen>NMSettingSecretFlags (uint32)</screen></entry><entry><screen/></entry><entry>Flags indicating how to handle the "private-key-password" property.</entry></row>
     <row><entry><screen>subject-match</screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.</entry></row>
-    <row><entry><screen>system-ca-certs</screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry>When TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties.</entry></row>
+    <row><entry><screen>system-ca-certs</screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry>When TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides "ca-cert" and "phase2-ca-cert" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).</entry></row>
   </tbody></tgroup></table></para>
   <para><table><title>adsl setting</title><tgroup cols="4"><thead><row><entry>Key Name</entry><entry>Value Type</entry><entry>Default Value</entry><entry>Value Description</entry></row></thead><tbody>
     <row><entry><screen>encapsulation</screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>Encapsulation of ADSL connection.  Can be "vcmux" or "llc".</entry></row>
@@ -83,6 +83,7 @@
   <para><table><title>connection setting</title><tgroup cols="4"><thead><row><entry>Key Name</entry><entry>Value Type</entry><entry>Default Value</entry><entry>Value Description</entry></row></thead><tbody>
     <row><entry><screen>autoconnect</screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry>Whether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection.</entry></row>
     <row><entry><screen>autoconnect-priority</screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.</entry></row>
+    <row><entry><screen>autoconnect-slaves</screen></entry><entry><screen>NMSettingConnectionAutoconnectSlaves (int32)</screen></entry><entry><screen/></entry><entry>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 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 determine the real value. If it is default as well, this fallbacks to 0.</entry></row>
     <row><entry><screen>gateway-ping-timeout</screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry>If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.</entry></row>
     <row><entry><screen>id</screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".</entry></row>
     <row><entry><screen>interface-name</screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>The name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.</entry></row>
@@ -167,7 +168,7 @@
     <row><entry><screen>gateway</screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>The gateway associated with this configuration. This is only meaningful if "addresses" is also set.</entry></row>
     <row><entry><screen>ignore-auto-dns</screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry>When "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.</entry></row>
     <row><entry><screen>ignore-auto-routes</screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry>When "method" is set to "auto" and this property to TRUE, automatically configured routes are ignored and only routes specified in the "routes" property, if any, are used.</entry></row>
-    <row><entry><screen>ip6-privacy</screen></entry><entry><screen>NMSettingIP6ConfigPrivacy (int32)</screen></entry><entry><screen/></entry><entry>Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses).</entry></row>
+    <row><entry><screen>ip6-privacy</screen></entry><entry><screen>NMSettingIP6ConfigPrivacy (int32)</screen></entry><entry><screen/></entry><entry>Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to "-1" (unknown) means fallback to global configuration "ipv6.ip6-privacy". If also global configuration is unspecified or set to "-1", fallback to read "/proc/sys/net/ipv6/conf/default/use_tempaddr".</entry></row>
     <row><entry><screen>may-fail</screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry>If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.</entry></row>
     <row><entry><screen>method</screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration.  The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty.</entry></row>
     <row><entry><screen>name</screen></entry><entry><screen>string</screen></entry><entry><screen>ipv6</screen></entry><entry>The setting's name, which uniquely identifies the setting within the connection.  Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired".</entry></row>
diff --git a/docs/api/spec.html b/docs/api/spec.html
index f7992202..bcd634dd 100644
--- a/docs/api/spec.html
+++ b/docs/api/spec.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 1.0.2</title><style type="text/css">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 1.0.4</title><style type="text/css">
 
           body {
             font-family: sans-serif;
@@ -97,7 +97,7 @@
             margin-right: 4em;
           }
 
-        </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 1.0.2</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license">
+        </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 1.0.4</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license">
 <p>This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -811,6 +811,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
           Modem now ready and available.
         </dd><dt><code>NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT = 59</code></dt><dd>
           The SIM PIN was incorrect.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_NEW_ACTIVATION = 60</code></dt><dd>
+          A new connection activation was enqueued.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_PARENT_CHANGED = 61</code></dt><dd>
+          The device's parent changed.
+        </dd><dt><code>NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED = 62</code></dt><dd>
+          The device parent's management changed.
         </dd></dl><h2>Sets of flags:</h2><h3 xmlns=""><a name="type-NM_DEVICE_CAP" id="type-NM_DEVICE_CAP">NM_DEVICE_CAP</a></h3><dl><dt><code>NM_DEVICE_CAP_NONE = 0x0</code></dt><dd>Null capability.</dd><dt><code>NM_DEVICE_CAP_NM_SUPPORTED = 0x1</code></dt><dd>The device is supported by NetworkManager.</dd><dt><code>NM_DEVICE_CAP_CARRIER_DETECT = 0x2</code></dt><dd>The device supports carrier detection.</dd></dl><h2>Structure types:</h2><div class="struct"><h3><a name="type-NM_DEVICE_STATE_REASON_STRUCT" id="type-NM_DEVICE_STATE_REASON_STRUCT">NM_DEVICE_STATE_REASON_STRUCT</a> - (
         u: state, u: reason
         )
diff --git a/docs/api/tmpl/NetworkManager-unused.sgml b/docs/api/tmpl/NetworkManager-unused.sgml
deleted file mode 100644
index e69de29b..00000000
--- a/docs/api/tmpl/NetworkManager-unused.sgml
+++ /dev/null
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 6d7de6e6..ee90284c 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.0.2
+1.0.4
diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in
index 796e69f2..8c0dbdce 100644
--- a/docs/libnm-glib/Makefile.in
+++ b/docs/libnm-glib/Makefile.in
@@ -142,6 +142,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -255,6 +256,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -480,6 +482,7 @@ GPATH = $(srcdir)
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
 SETUP_FILES = \
 	$(content_files)		\
+	$(expand_content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
@@ -487,9 +490,9 @@ SETUP_FILES = \
 
 # include common portion ...
 EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in
-DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	tmpl.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -524,11 +527,6 @@ GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
 GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
 
-#### templates ####
-GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V))
-GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_TMPL_0 = @echo "  DOC   Rebuilding template files";
-
 #### xml ####
 GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
 GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
@@ -765,18 +763,15 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
-	            destdir=`dirname $(abs_builddir)/$$file` ;\
+	            destdir=`dirname $(abs_builddir)/$$file`; \
 	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
 	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
-	    test -d $(abs_srcdir)/tmpl && \
-	        { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
-	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
 	$(AM_V_at)touch setup-build.stamp
 
@@ -789,7 +784,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$(?)" = "0"; then \
+	    if test "$$?" = "0"; then \
 	        if test "x$(V)" = "x1"; then \
 	            scanobj_options="--verbose"; \
 	        fi; \
@@ -806,23 +801,8 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	$(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	  if test -w $(abs_srcdir) ; then \
-	    cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
-	  fi \
-	fi
-	$(AM_V_at)touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	-$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
@@ -832,17 +812,17 @@ sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(
 sgml.stamp: sgml-build.stamp
 	@true
 
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkhtml_options="$$mkhtml_options --verbose"; \
 	  fi; \
 	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -858,11 +838,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp
 
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
 	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkpdf_options="$$mkpdf_options --verbose"; \
 	  fi; \
@@ -887,13 +867,15 @@ clean-local:
 	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
 	  rm -f $(DOC_MODULE).types; \
 	fi
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+	  rm -f $(DOC_MODULE)-sections.txt; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
-	    rm -rf tmpl; \
+	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local:
@@ -940,9 +922,7 @@ uninstall-local:
 @HAVE_GTK_DOC_FALSE@	@false
 
 dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
-	@mkdir $(distdir)/tmpl
 	@mkdir $(distdir)/html
-	@-cp ./tmpl/*.sgml $(distdir)/tmpl
 	@cp ./html/* $(distdir)/html
 	@-cp ./$(DOC_MODULE).pdf $(distdir)/
 	@-cp ./$(DOC_MODULE).types $(distdir)/
diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index e0e5660a..9182a27a 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMAccessPoint</title>
+<title>NMAccessPoint: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMWimaxNsp.html" title="NMWimaxNsp">
 <link rel="next" href="NMIP4Config.html" title="NMIP4Config">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -270,8 +270,6 @@
 </div>
 <div class="refsect1">
 <a name="NMAccessPoint.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMAccessPoint.functions_details"></a><h2>Functions</h2>
@@ -333,7 +331,6 @@ nm_access_point_get_flags (<em class="parameter"><code><a class="link" href="NMA
 <div class="refsect3">
 <a name="id-1.3.19.8.3.6"></a><h4>Returns</h4>
 <p> the flags</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -360,7 +357,6 @@ nm_access_point_get_wpa_flags (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.3.19.8.4.6"></a><h4>Returns</h4>
 <p> the WPA flags</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -388,7 +384,6 @@ point.</p>
 <div class="refsect3">
 <a name="id-1.3.19.8.5.6"></a><h4>Returns</h4>
 <p> the RSN flags</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -416,7 +411,6 @@ nm_access_point_get_ssid (<em class="parameter"><code><a class="link" href="NMAc
 <a name="id-1.3.19.8.6.6"></a><h4>Returns</h4>
 <p> the <span class="type">GByteArray</span> containing the SSID. This is the internal copy used by the
 access point, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -444,7 +438,6 @@ nm_access_point_get_bssid (<em class="parameter"><code><a class="link" href="NMA
 <a name="id-1.3.19.8.7.6"></a><h4>Returns</h4>
 <p> the BSSID of the access point. This is an internal string and must
 not be modified or freed.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -471,7 +464,6 @@ nm_access_point_get_frequency (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.3.19.8.8.6"></a><h4>Returns</h4>
 <p> the frequency</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -498,7 +490,6 @@ nm_access_point_get_mode (<em class="parameter"><code><a class="link" href="NMAc
 <div class="refsect3">
 <a name="id-1.3.19.8.9.6"></a><h4>Returns</h4>
 <p> the mode</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -525,7 +516,6 @@ nm_access_point_get_max_bitrate (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.3.19.8.10.6"></a><h4>Returns</h4>
 <p> the maximum bit rate (kbit/s)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -552,7 +542,6 @@ nm_access_point_get_strength (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.3.19.8.11.6"></a><h4>Returns</h4>
 <p> the signal strength</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -643,7 +632,6 @@ against</p></td>
 <a name="id-1.3.19.8.13.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection may be activated with this Wi-Fi AP,
 <code class="literal">FALSE</code> if it cannot be.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -675,7 +663,6 @@ nm_access_point_get_hw_address (<em class="parameter"><code><a class="link" href
 <a name="id-1.3.19.8.14.7"></a><h4>Returns</h4>
 <p> the hardware address of the access point. This is the internal string used by the
 access point and must not be modified.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -685,80 +672,60 @@ access point and must not be modified.</p>
 <a name="NM-ACCESS-POINT-FLAGS:CAPS"></a><h3>NM_ACCESS_POINT_FLAGS</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_FLAGS       "flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-WPA-FLAGS:CAPS"></a><h3>NM_ACCESS_POINT_WPA_FLAGS</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-RSN-FLAGS:CAPS"></a><h3>NM_ACCESS_POINT_RSN_FLAGS</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-SSID:CAPS"></a><h3>NM_ACCESS_POINT_SSID</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_SSID        "ssid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-BSSID:CAPS"></a><h3>NM_ACCESS_POINT_BSSID</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_BSSID       "bssid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-FREQUENCY:CAPS"></a><h3>NM_ACCESS_POINT_FREQUENCY</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_FREQUENCY   "frequency"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-MODE:CAPS"></a><h3>NM_ACCESS_POINT_MODE</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_MODE        "mode"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-MAX-BITRATE:CAPS"></a><h3>NM_ACCESS_POINT_MAX_BITRATE</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-STRENGTH:CAPS"></a><h3>NM_ACCESS_POINT_STRENGTH</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_STRENGTH    "strength"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-HW-ADDRESS:CAPS"></a><h3>NM_ACCESS_POINT_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -766,7 +733,7 @@ access point and must not be modified.</p>
 <div class="refsect2">
 <a name="NMAccessPoint--bssid"></a><h3>The <code class="literal">“bssid”</code> property</h3>
 <pre class="programlisting">  “bssid”                    <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The BSSID of the access point.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -774,7 +741,7 @@ access point and must not be modified.</p>
 <div class="refsect2">
 <a name="NMAccessPoint--flags"></a><h3>The <code class="literal">“flags”</code> property</h3>
 <pre class="programlisting">  “flags”                    <span class="type">guint</span></pre>
-<p></p>
+<p>The flags of the access point.</p>
 <p>Flags: Read</p>
 <p>Allowed values: &lt;= 1</p>
 <p>Default value: 0</p>
@@ -783,7 +750,7 @@ access point and must not be modified.</p>
 <div class="refsect2">
 <a name="NMAccessPoint--frequency"></a><h3>The <code class="literal">“frequency”</code> property</h3>
 <pre class="programlisting">  “frequency”                <span class="type">guint</span></pre>
-<p></p>
+<p>The frequency of the access point.</p>
 <p>Flags: Read</p>
 <p>Allowed values: &lt;= 10000</p>
 <p>Default value: 0</p>
@@ -792,7 +759,7 @@ access point and must not be modified.</p>
 <div class="refsect2">
 <a name="NMAccessPoint--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware address of the access point.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -800,7 +767,7 @@ access point and must not be modified.</p>
 <div class="refsect2">
 <a name="NMAccessPoint--max-bitrate"></a><h3>The <code class="literal">“max-bitrate”</code> property</h3>
 <pre class="programlisting">  “max-bitrate”              <span class="type">guint</span></pre>
-<p></p>
+<p>The maximum bit rate of the access point in kbit/s.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -808,7 +775,9 @@ access point and must not be modified.</p>
 <div class="refsect2">
 <a name="NMAccessPoint--mode"></a><h3>The <code class="literal">“mode”</code> property</h3>
 <pre class="programlisting">  “mode”                     <span class="type">guint</span></pre>
-<p></p>
+<p>The mode of the access point; either "infrastructure" (a central
+coordinator of the wireless network allowing clients to connect) or
+"ad-hoc" (a network with no central controller).</p>
 <p>Flags: Read</p>
 <p>Allowed values: [1,2]</p>
 <p>Default value: 2</p>
@@ -817,7 +786,7 @@ access point and must not be modified.</p>
 <div class="refsect2">
 <a name="NMAccessPoint--rsn-flags"></a><h3>The <code class="literal">“rsn-flags”</code> property</h3>
 <pre class="programlisting">  “rsn-flags”                <span class="type">guint</span></pre>
-<p></p>
+<p>The RSN flags of the access point.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -825,14 +794,14 @@ access point and must not be modified.</p>
 <div class="refsect2">
 <a name="NMAccessPoint--ssid"></a><h3>The <code class="literal">“ssid”</code> property</h3>
 <pre class="programlisting">  “ssid”                     <span class="type">NMSsid</span> *</pre>
-<p></p>
+<p>The SSID of the access point.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMAccessPoint--strength"></a><h3>The <code class="literal">“strength”</code> property</h3>
 <pre class="programlisting">  “strength”                 <span class="type">guchar</span></pre>
-<p></p>
+<p>The current signal strength of the access point.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -840,14 +809,13 @@ access point and must not be modified.</p>
 <div class="refsect2">
 <a name="NMAccessPoint--wpa-flags"></a><h3>The <code class="literal">“wpa-flags”</code> property</h3>
 <pre class="programlisting">  “wpa-flags”                <span class="type">guint</span></pre>
-<p></p>
+<p>The WPA flags of the access point.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index d5f1b381..51037dca 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMActiveConnection</title>
+<title>NMActiveConnection: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMClient.html" title="NMClient">
 <link rel="next" href="NMDevice.html" title="NMDevice">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -344,8 +344,6 @@
 </div>
 <div class="refsect1">
 <a name="NMActiveConnection.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMActiveConnection.functions_details"></a><h2>Functions</h2>
@@ -411,7 +409,6 @@ nm_active_connection_get_connection (<em class="parameter"><code><a class="link"
 <p> the object path of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> which this <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>
 is an active instance of.  This is the internal string used by the
 connection, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -439,9 +436,8 @@ nm_active_connection_get_id (<em class="parameter"><code><a class="link" href="N
 <a name="id-1.3.3.8.4.6"></a><h4>Returns</h4>
 <p> the ID of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -468,7 +464,6 @@ nm_active_connection_get_uuid (<em class="parameter"><code><a class="link" href=
 <a name="id-1.3.3.8.5.6"></a><h4>Returns</h4>
 <p> the UUID of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -497,9 +492,8 @@ nm_active_connection_get_connection_type
 <a name="id-1.3.3.8.6.6"></a><h4>Returns</h4>
 <p> the type of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -527,7 +521,6 @@ nm_active_connection_get_specific_object
 <a name="id-1.3.3.8.7.6"></a><h4>Returns</h4>
 <p> the specific object's DBus path. This is the internal string used by the
 connection, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -582,7 +575,6 @@ nm_active_connection_get_state (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.3.3.8.9.6"></a><h4>Returns</h4>
 <p> the state</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -610,7 +602,6 @@ nm_active_connection_get_master (<em class="parameter"><code><a class="link" hre
 <a name="id-1.3.3.8.10.6"></a><h4>Returns</h4>
 <p> the path of the master <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -638,7 +629,6 @@ the default IPv4 route and DNS information).</p>
 <div class="refsect3">
 <a name="id-1.3.3.8.11.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the active connection is the default IPv4 connection</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -665,11 +655,11 @@ nm_active_connection_get_ip4_config (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.3.3.8.12.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a>, or <code class="literal">NULL</code> if the
-connection is not in the <code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code>
+connection is not in the <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
 state. </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -697,10 +687,10 @@ nm_active_connection_get_dhcp4_config (<em class="parameter"><code><a class="lin
 <a name="id-1.3.3.8.13.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a>, or <code class="literal">NULL</code> if the
 connection does not use DHCP, or is not in the
-<code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code> state. </p>
+<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -727,7 +717,6 @@ the default IPv6 route and DNS information).</p>
 <div class="refsect3">
 <a name="id-1.3.3.8.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the active connection is the default IPv6 connection</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -754,11 +743,11 @@ nm_active_connection_get_ip6_config (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.3.3.8.15.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a>, or <code class="literal">NULL</code> if the
-connection is not in the <code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code>
+connection is not in the <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
 state. </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -786,10 +775,10 @@ nm_active_connection_get_dhcp6_config (<em class="parameter"><code><a class="lin
 <a name="id-1.3.3.8.16.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a>, or <code class="literal">NULL</code> if the
 connection does not use DHCPv6, or is not in the
-<code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code> state. </p>
+<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -815,9 +804,8 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.3.3.8.17.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the active connection is a VPN connection</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 <div class="refsect1">
@@ -826,120 +814,90 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <a name="NM-ACTIVE-CONNECTION-CONNECTION:CAPS"></a><h3>NM_ACTIVE_CONNECTION_CONNECTION</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-ID:CAPS"></a><h3>NM_ACTIVE_CONNECTION_ID</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_ID                  "id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-UUID:CAPS"></a><h3>NM_ACTIVE_CONNECTION_UUID</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_UUID                "uuid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-TYPE:CAPS"></a><h3>NM_ACTIVE_CONNECTION_TYPE</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_TYPE                "type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-SPECIFIC-OBJECT:CAPS"></a><h3>NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-DEVICES:CAPS"></a><h3>NM_ACTIVE_CONNECTION_DEVICES</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_DEVICES             "devices"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-STATE:CAPS"></a><h3>NM_ACTIVE_CONNECTION_STATE</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_STATE               "state"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-DEFAULT:CAPS"></a><h3>NM_ACTIVE_CONNECTION_DEFAULT</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_DEFAULT             "default"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-IP4-CONFIG:CAPS"></a><h3>NM_ACTIVE_CONNECTION_IP4_CONFIG</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_IP4_CONFIG          "ip4-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-DHCP4-CONFIG:CAPS"></a><h3>NM_ACTIVE_CONNECTION_DHCP4_CONFIG</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_DHCP4_CONFIG        "dhcp4-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-DEFAULT6:CAPS"></a><h3>NM_ACTIVE_CONNECTION_DEFAULT6</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_DEFAULT6            "default6"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-IP6-CONFIG:CAPS"></a><h3>NM_ACTIVE_CONNECTION_IP6_CONFIG</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_IP6_CONFIG          "ip6-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-DHCP6-CONFIG:CAPS"></a><h3>NM_ACTIVE_CONNECTION_DHCP6_CONFIG</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_DHCP6_CONFIG        "dhcp6-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-VPN:CAPS"></a><h3>NM_ACTIVE_CONNECTION_VPN</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_VPN                 "vpn"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-MASTER:CAPS"></a><h3>NM_ACTIVE_CONNECTION_MASTER</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_MASTER              "master"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -947,7 +905,7 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--connection"></a><h3>The <code class="literal">“connection”</code> property</h3>
 <pre class="programlisting">  “connection”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The connection's path of the active connection.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -955,7 +913,7 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--default"></a><h3>The <code class="literal">“default”</code> property</h3>
 <pre class="programlisting">  “default”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the active connection is the default IPv4 one.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -963,7 +921,7 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--default6"></a><h3>The <code class="literal">“default6”</code> property</h3>
 <pre class="programlisting">  “default6”                 <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the active connection is the default IPv6 one.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -971,55 +929,54 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--devices"></a><h3>The <code class="literal">“devices”</code> property</h3>
 <pre class="programlisting">  “devices”                  <span class="type">NMObjectArray</span> *</pre>
-<p></p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--dhcp4-config"></a><h3>The <code class="literal">“dhcp4-config”</code> property</h3>
 <pre class="programlisting">  “dhcp4-config”             <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a> of the connection.</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--dhcp6-config"></a><h3>The <code class="literal">“dhcp6-config”</code> property</h3>
 <pre class="programlisting">  “dhcp6-config”             <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a> of the connection.</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--id"></a><h3>The <code class="literal">“id”</code> property</h3>
 <pre class="programlisting">  “id”                       <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The active connection's ID</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--ip4-config"></a><h3>The <code class="literal">“ip4-config”</code> property</h3>
 <pre class="programlisting">  “ip4-config”               <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> of the connection.</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--ip6-config"></a><h3>The <code class="literal">“ip6-config”</code> property</h3>
 <pre class="programlisting">  “ip6-config”               <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a> of the connection.</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--master"></a><h3>The <code class="literal">“master”</code> property</h3>
 <pre class="programlisting">  “master”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The path of the master device if one exists.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -1027,7 +984,7 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--specific-object"></a><h3>The <code class="literal">“specific-object”</code> property</h3>
 <pre class="programlisting">  “specific-object”          <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The specific object's path of the active connection.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -1035,7 +992,7 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--state"></a><h3>The <code class="literal">“state”</code> property</h3>
 <pre class="programlisting">  “state”                    <span class="type">guint</span></pre>
-<p></p>
+<p>The state of the active connection.</p>
 <p>Flags: Read</p>
 <p>Allowed values: &lt;= 3</p>
 <p>Default value: 0</p>
@@ -1044,16 +1001,16 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--type"></a><h3>The <code class="literal">“type”</code> property</h3>
 <pre class="programlisting">  “type”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The active connection's type</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--uuid"></a><h3>The <code class="literal">“uuid”</code> property</h3>
 <pre class="programlisting">  “uuid”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The active connection's UUID</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -1061,15 +1018,14 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--vpn"></a><h3>The <code class="literal">“vpn”</code> property</h3>
 <pre class="programlisting">  “vpn”                      <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the active connection is a VPN connection.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 23eca511..1f0d4ae2 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMClient</title>
+<title>NMClient: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="ch02.html" title="libnm-glib API Reference">
 <link rel="next" href="NMActiveConnection.html" title="NMActiveConnection">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -570,8 +570,6 @@
 </div>
 <div class="refsect1">
 <a name="NMClient.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMClient.functions_details"></a><h2>Functions</h2>
@@ -583,9 +581,8 @@ nm_client_error_quark (<em class="parameter"><code><span class="type">void</span
 <div class="refsect3">
 <a name="id-1.3.2.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> errors.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -602,7 +599,6 @@ control them.  To access and modify network configuration data, use the
 <div class="refsect3">
 <a name="id-1.3.2.9.3.7"></a><h4>Returns</h4>
 <p> a new <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> or NULL on an error</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -681,7 +677,6 @@ nm_client_new_finish (<em class="parameter"><code><span class="type">GAsyncResul
 <div class="refsect3">
 <a name="id-1.3.2.9.5.6"></a><h4>Returns</h4>
 <p> a new <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>, or <code class="literal">NULL</code> on error</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -796,8 +791,6 @@ or <code class="literal">NULL</code> if none is found. </p>
                        <em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *active_connection</code></em>,
                        <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                        <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -885,8 +878,6 @@ details of the newly added connection. </p></td>
                           <em class="parameter"><code>const <span class="type">char</span> *new_connection_path</code></em>,
                           <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                           <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1014,7 +1005,6 @@ nm_client_networking_get_enabled (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.3.2.9.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if networking is enabled, <code class="literal">FALSE</code> if networking is disabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1073,7 +1063,6 @@ nm_client_wireless_get_enabled (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.3.2.9.16.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if wireless is enabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1131,7 +1120,6 @@ nm_client_wireless_hardware_get_enabled
 <div class="refsect3">
 <a name="id-1.3.2.9.18.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the wireless hardware is enabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1158,7 +1146,6 @@ nm_client_wwan_get_enabled (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.3.2.9.19.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if WWAN is enabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1215,7 +1202,6 @@ nm_client_wwan_hardware_get_enabled (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.3.2.9.21.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the WWAN hardware is enabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1242,7 +1228,6 @@ nm_client_wimax_get_enabled (<em class="parameter"><code><a class="link" href="N
 <div class="refsect3">
 <a name="id-1.3.2.9.22.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if WiMAX is enabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1299,7 +1284,6 @@ nm_client_wimax_hardware_get_enabled (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.3.2.9.24.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the WiMAX hardware is enabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1326,7 +1310,6 @@ nm_client_get_version (<em class="parameter"><code><a class="link" href="NMClien
 <div class="refsect3">
 <a name="id-1.3.2.9.25.6"></a><h4>Returns</h4>
 <p> string with the version</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1353,7 +1336,6 @@ nm_client_get_state (<em class="parameter"><code><a class="link" href="NMClient.
 <div class="refsect3">
 <a name="id-1.3.2.9.26.6"></a><h4>Returns</h4>
 <p> the current <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMState"><code class="literal">NMState</code></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1381,9 +1363,8 @@ connections at startup.</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.27.6"></a><h4>Returns</h4>
 <p> whether the daemon is still starting up</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1409,7 +1390,6 @@ nm_client_get_manager_running (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.3.2.9.28.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the daemon is running</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1504,7 +1484,6 @@ client can or cannot perform the action the permission represents</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.31.6"></a><h4>Returns</h4>
 <p> the permission's result, one of <a class="link" href="NMClient.html#NMClientPermissionResult" title="enum NMClientPermissionResult"><span class="type">NMClientPermissionResult</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1552,9 +1531,8 @@ a list of domains separated by ",". </p></td>
 <div class="refsect3">
 <a name="id-1.3.2.9.32.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1601,9 +1579,8 @@ domains separated by ",". (<code class="literal">NULL</code> or an empty string
 <div class="refsect3">
 <a name="id-1.3.2.9.33.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1632,9 +1609,8 @@ connectivity state first before returning any information.</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.34.6"></a><h4>Returns</h4>
 <p> the current connectivity state</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8.6</p>
+<p class="since">Since: 0.9.8.6</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1678,9 +1654,8 @@ if you do not want to block.</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.35.7"></a><h4>Returns</h4>
 <p> the (new) current connectivity state</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8.6</p>
+<p class="since">Since: 0.9.8.6</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1728,7 +1703,7 @@ re-checking, and <a class="link" href="NMClient.html#nm-client-check-connectivit
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.8.6</p>
+<p class="since">Since: 0.9.8.6</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1769,9 +1744,8 @@ call.</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.37.6"></a><h4>Returns</h4>
 <p> the (new) current connectivity state</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8.6</p>
+<p class="since">Since: 0.9.8.6</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1808,7 +1782,7 @@ non-NetworkManager-recognized device, this will return <code class="literal">NUL
 any. </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 0.9.8.6</p>
+<p class="since">Since: 0.9.8.6</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1839,7 +1813,7 @@ currently-activating connection that is expected to become the new
 any. </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 0.9.8.6</p>
+<p class="since">Since: 0.9.8.6</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1848,128 +1822,96 @@ any. </p>
 <a name="NM-CLIENT-VERSION:CAPS"></a><h3>NM_CLIENT_VERSION</h3>
 <pre class="programlisting">#define NM_CLIENT_VERSION "version"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-STATE:CAPS"></a><h3>NM_CLIENT_STATE</h3>
 <pre class="programlisting">#define NM_CLIENT_STATE "state"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-STARTUP:CAPS"></a><h3>NM_CLIENT_STARTUP</h3>
 <pre class="programlisting">#define NM_CLIENT_STARTUP "startup"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-MANAGER-RUNNING:CAPS"></a><h3>NM_CLIENT_MANAGER_RUNNING</h3>
 <pre class="programlisting">#define NM_CLIENT_MANAGER_RUNNING "manager-running"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-NETWORKING-ENABLED:CAPS"></a><h3>NM_CLIENT_NETWORKING_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-WIRELESS-ENABLED:CAPS"></a><h3>NM_CLIENT_WIRELESS_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-WIRELESS-HARDWARE-ENABLED:CAPS"></a><h3>NM_CLIENT_WIRELESS_HARDWARE_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WIRELESS_HARDWARE_ENABLED "wireless-hardware-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-WWAN-ENABLED:CAPS"></a><h3>NM_CLIENT_WWAN_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-WWAN-HARDWARE-ENABLED:CAPS"></a><h3>NM_CLIENT_WWAN_HARDWARE_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WWAN_HARDWARE_ENABLED "wwan-hardware-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-WIMAX-ENABLED:CAPS"></a><h3>NM_CLIENT_WIMAX_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-WIMAX-HARDWARE-ENABLED:CAPS"></a><h3>NM_CLIENT_WIMAX_HARDWARE_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WIMAX_HARDWARE_ENABLED "wimax-hardware-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-ACTIVE-CONNECTIONS:CAPS"></a><h3>NM_CLIENT_ACTIVE_CONNECTIONS</h3>
 <pre class="programlisting">#define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-CONNECTIVITY:CAPS"></a><h3>NM_CLIENT_CONNECTIVITY</h3>
 <pre class="programlisting">#define NM_CLIENT_CONNECTIVITY "connectivity"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-PRIMARY-CONNECTION:CAPS"></a><h3>NM_CLIENT_PRIMARY_CONNECTION</h3>
 <pre class="programlisting">#define NM_CLIENT_PRIMARY_CONNECTION "primary-connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-ACTIVATING-CONNECTION:CAPS"></a><h3>NM_CLIENT_ACTIVATING_CONNECTION</h3>
 <pre class="programlisting">#define NM_CLIENT_ACTIVATING_CONNECTION "activating-connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-DEVICES:CAPS"></a><h3>NM_CLIENT_DEVICES</h3>
 <pre class="programlisting">#define NM_CLIENT_DEVICES "devices"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2176,8 +2118,6 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <a name="NM-CLIENT-ERROR:CAPS"></a><h3>NM_CLIENT_ERROR</h3>
 <pre class="programlisting">#define NM_CLIENT_ERROR nm_client_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -2185,40 +2125,42 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--activating-connection"></a><h3>The <code class="literal">“activating-connection”</code> property</h3>
 <pre class="programlisting">  “activating-connection”    <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> of the activating connection that is
+likely to become the new <a class="link" href="NMClient.html#NMClient--primary-connection" title="The “primary-connection” property"><span class="type">“primary-connection”</span></a>.</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.8.6</p>
+<p class="since">Since: 0.9.8.6</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMClient--active-connections"></a><h3>The <code class="literal">“active-connections”</code> property</h3>
 <pre class="programlisting">  “active-connections”       <span class="type">NMObjectArray</span> *</pre>
-<p></p>
+<p>The active connections.
+Type: GLib.PtrArray</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMClient--connectivity"></a><h3>The <code class="literal">“connectivity”</code> property</h3>
 <pre class="programlisting">  “connectivity”             <span class="type">guint</span></pre>
-<p></p>
+<p>The network connectivity state.</p>
 <p>Flags: Read</p>
 <p>Allowed values: &lt;= 4</p>
 <p>Default value: 0</p>
-<p class="since">Since 0.9.8.6</p>
+<p class="since">Since: 0.9.8.6</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMClient--devices"></a><h3>The <code class="literal">“devices”</code> property</h3>
 <pre class="programlisting">  “devices”                  <span class="type">NMObjectArray</span> *</pre>
-<p></p>
+<p>List of known network devices.</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMClient--manager-running"></a><h3>The <code class="literal">“manager-running”</code> property</h3>
 <pre class="programlisting">  “manager-running”          <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the daemon is running.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2226,7 +2168,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--networking-enabled"></a><h3>The <code class="literal">“networking-enabled”</code> property</h3>
 <pre class="programlisting">  “networking-enabled”       <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether networking is enabled.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: TRUE</p>
 </div>
@@ -2234,24 +2176,25 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--primary-connection"></a><h3>The <code class="literal">“primary-connection”</code> property</h3>
 <pre class="programlisting">  “primary-connection”       <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> of the device with the default route;
+see <a class="link" href="NMClient.html#nm-client-get-primary-connection" title="nm_client_get_primary_connection ()"><code class="function">nm_client_get_primary_connection()</code></a> for more details.</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.8.6</p>
+<p class="since">Since: 0.9.8.6</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMClient--startup"></a><h3>The <code class="literal">“startup”</code> property</h3>
 <pre class="programlisting">  “startup”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the daemon is still starting up.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMClient--state"></a><h3>The <code class="literal">“state”</code> property</h3>
 <pre class="programlisting">  “state”                    <span class="type">guint</span></pre>
-<p></p>
+<p>The current daemon state.</p>
 <p>Flags: Read</p>
 <p>Allowed values: &lt;= 70</p>
 <p>Default value: 0</p>
@@ -2260,7 +2203,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--version"></a><h3>The <code class="literal">“version”</code> property</h3>
 <pre class="programlisting">  “version”                  <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The NetworkManager version.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2268,7 +2211,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--wimax-enabled"></a><h3>The <code class="literal">“wimax-enabled”</code> property</h3>
 <pre class="programlisting">  “wimax-enabled”            <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether WiMAX functionality is enabled.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2276,7 +2219,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--wimax-hardware-enabled"></a><h3>The <code class="literal">“wimax-hardware-enabled”</code> property</h3>
 <pre class="programlisting">  “wimax-hardware-enabled”   <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the WiMAX hardware is enabled.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2284,7 +2227,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--wireless-enabled"></a><h3>The <code class="literal">“wireless-enabled”</code> property</h3>
 <pre class="programlisting">  “wireless-enabled”         <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether wireless is enabled.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2292,7 +2235,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--wireless-hardware-enabled"></a><h3>The <code class="literal">“wireless-hardware-enabled”</code> property</h3>
 <pre class="programlisting">  “wireless-hardware-enabled” <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the wireless hardware is enabled.</p>
 <p>Flags: Read</p>
 <p>Default value: TRUE</p>
 </div>
@@ -2300,7 +2243,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--wwan-enabled"></a><h3>The <code class="literal">“wwan-enabled”</code> property</h3>
 <pre class="programlisting">  “wwan-enabled”             <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether WWAN functionality is enabled.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2308,7 +2251,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--wwan-hardware-enabled"></a><h3>The <code class="literal">“wwan-hardware-enabled”</code> property</h3>
 <pre class="programlisting">  “wwan-hardware-enabled”    <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the WWAN hardware is enabled.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2321,6 +2264,34 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 user_function (<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client,
                <span class="type">GObject</span>  *device,
                <span class="type">gpointer</span>  user_data)</pre>
+<p>Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> is added.</p>
+<div class="refsect3">
+<a name="id-1.3.2.12.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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 client that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>device</p></td>
+<td class="parameter_description"><p> the new device. </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> NMDevice]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 <hr>
@@ -2330,6 +2301,34 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
 user_function (<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client,
                <span class="type">GObject</span>  *device,
                <span class="type">gpointer</span>  user_data)</pre>
+<p>Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> is removed.</p>
+<div class="refsect3">
+<a name="id-1.3.2.12.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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 client that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>device</p></td>
+<td class="parameter_description"><p> the removed device. </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> NMDevice]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 <hr>
@@ -2340,12 +2339,44 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
                <span class="type">guint</span>     permission,
                <span class="type">guint</span>     result,
                <span class="type">gpointer</span>  user_data)</pre>
+<p>Notifies that a permission has changed</p>
+<div class="refsect3">
+<a name="id-1.3.2.12.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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 client that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>permission</p></td>
+<td class="parameter_description"><p>a permission from <a class="link" href="NMClient.html#NMClientPermission" title="enum NMClientPermission"><span class="type">NMClientPermission</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 permission's result, one of <a class="link" href="NMClient.html#NMClientPermissionResult" title="enum NMClientPermissionResult"><span class="type">NMClientPermissionResult</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html
index c400cc6a..87c74fef 100644
--- a/docs/libnm-glib/html/NMDHCP4Config.html
+++ b/docs/libnm-glib/html/NMDHCP4Config.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDHCP4Config</title>
+<title>NMDHCP4Config: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMIP6Config.html" title="NMIP6Config">
 <link rel="next" href="NMDHCP6Config.html" title="NMDHCP6Config">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -105,8 +105,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDHCP4Config.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDHCP4Config.functions_details"></a><h2>Functions</h2>
@@ -205,7 +203,6 @@ nm_dhcp4_config_get_one_option (<em class="parameter"><code><a class="link" href
 <a name="id-1.3.22.8.4.6"></a><h4>Returns</h4>
 <p> the configuration option's value. This is the internal string used by the
 configuration, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -215,8 +212,6 @@ configuration, and must not be modified.</p>
 <a name="NM-DHCP4-CONFIG-OPTIONS:CAPS"></a><h3>NM_DHCP4_CONFIG_OPTIONS</h3>
 <pre class="programlisting">#define NM_DHCP4_CONFIG_OPTIONS "options"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -224,13 +219,13 @@ configuration, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMDHCP4Config--options"></a><h3>The <code class="literal">“options”</code> property</h3>
 <pre class="programlisting">  “options”                  <span class="type">GHashTable</span> *</pre>
-<p></p>
+<p>The <span class="type">GHashTable</span> containing options of the configuration.</p>
+<p>Type: GLib.HashTable(utf8,GObject.Value)</p>
 <p>Flags: Read</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html
index c50a23df..7b322c5e 100644
--- a/docs/libnm-glib/html/NMDHCP6Config.html
+++ b/docs/libnm-glib/html/NMDHCP6Config.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDHCP6Config</title>
+<title>NMDHCP6Config: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDHCP4Config.html" title="NMDHCP4Config">
 <link rel="next" href="NMObject.html" title="NMObject">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -105,8 +105,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDHCP6Config.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDHCP6Config.functions_details"></a><h2>Functions</h2>
@@ -205,7 +203,6 @@ nm_dhcp6_config_get_one_option (<em class="parameter"><code><a class="link" href
 <a name="id-1.3.23.8.4.6"></a><h4>Returns</h4>
 <p> the configuration option's value. This is the internal string used by the
 configuration, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -215,8 +212,6 @@ configuration, and must not be modified.</p>
 <a name="NM-DHCP6-CONFIG-OPTIONS:CAPS"></a><h3>NM_DHCP6_CONFIG_OPTIONS</h3>
 <pre class="programlisting">#define NM_DHCP6_CONFIG_OPTIONS "options"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -224,13 +219,13 @@ configuration, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMDHCP6Config--options"></a><h3>The <code class="literal">“options”</code> property</h3>
 <pre class="programlisting">  “options”                  <span class="type">GHashTable</span> *</pre>
-<p></p>
+<p>The <span class="type">GHashTable</span> containing options of the configuration.</p>
+<p>Type: GLib.HashTable(utf8,GObject.Value)</p>
 <p>Flags: Read</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index 2d5281c8..79f87a5d 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDevice</title>
+<title>NMDevice: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMActiveConnection.html" title="NMActiveConnection">
 <link rel="next" href="NMDeviceEthernet.html" title="NMDeviceEthernet">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -634,8 +634,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDevice.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDevice.functions_details"></a><h2>Functions</h2>
@@ -647,9 +645,8 @@ nm_device_error_quark (<em class="parameter"><code><span class="type">void</span
 <div class="refsect3">
 <a name="id-1.3.4.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> errors.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -711,7 +708,6 @@ nm_device_get_iface (<em class="parameter"><code><a class="link" href="NMDevice.
 <a name="id-1.3.4.9.4.6"></a><h4>Returns</h4>
 <p> the interface of the device. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -740,7 +736,6 @@ when the device is in the ACTIVATED state.</p>
 <a name="id-1.3.4.9.5.6"></a><h4>Returns</h4>
 <p> the IP traffic interface of the device. This is the internal string
 used by the device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -767,7 +762,6 @@ nm_device_get_device_type (<em class="parameter"><code><a class="link" href="NMD
 <div class="refsect3">
 <a name="id-1.3.4.9.6.6"></a><h4>Returns</h4>
 <p> the device type</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -796,7 +790,6 @@ nm_device_get_udi (<em class="parameter"><code><a class="link" href="NMDevice.ht
 <p> the Unique Device Identifier of the device.  This identifier may be
 used to gather more information about the device from various operating
 system services like udev or sysfs.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -824,7 +817,6 @@ nm_device_get_driver (<em class="parameter"><code><a class="link" href="NMDevice
 <a name="id-1.3.4.9.8.6"></a><h4>Returns</h4>
 <p> the driver of the device. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -852,7 +844,6 @@ nm_device_get_driver_version (<em class="parameter"><code><a class="link" href="
 <a name="id-1.3.4.9.9.6"></a><h4>Returns</h4>
 <p> the version of the device driver. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -880,7 +871,6 @@ nm_device_get_firmware_version (<em class="parameter"><code><a class="link" href
 <a name="id-1.3.4.9.10.6"></a><h4>Returns</h4>
 <p> the firmware version of the device. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -910,9 +900,8 @@ nm_device_get_type_description (<em class="parameter"><code><a class="link" href
 <a name="id-1.3.4.9.11.6"></a><h4>Returns</h4>
 <p> the type description of the device. This is the internal
 string used by the device, and must not be modified.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -940,9 +929,8 @@ nm_device_get_hw_address (<em class="parameter"><code><a class="link" href="NMDe
 <a name="id-1.3.4.9.12.6"></a><h4>Returns</h4>
 <p> the current MAC of the device, or <code class="literal">NULL</code>.
 This is the internal string used by the device, and must not be modified.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -968,7 +956,6 @@ nm_device_get_capabilities (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.3.4.9.13.6"></a><h4>Returns</h4>
 <p> the capabilities</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -995,7 +982,6 @@ nm_device_get_managed (<em class="parameter"><code><a class="link" href="NMDevic
 <div class="refsect3">
 <a name="id-1.3.4.9.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device is managed by NetworkManager</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1022,7 +1008,6 @@ nm_device_get_autoconnect (<em class="parameter"><code><a class="link" href="NMD
 <div class="refsect3">
 <a name="id-1.3.4.9.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device is allowed to be autoconnected</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1081,7 +1066,6 @@ to be missing.</p>
 <a name="id-1.3.4.9.17.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if firmware required for the device's operation is likely
 to be missing.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1230,7 +1214,6 @@ nm_device_get_state (<em class="parameter"><code><a class="link" href="NMDevice.
 <div class="refsect3">
 <a name="id-1.3.4.9.22.6"></a><h4>Returns</h4>
 <p> the current device state</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1267,7 +1250,6 @@ the state (<em class="parameter"><code>reason</code></em>
 <div class="refsect3">
 <a name="id-1.3.4.9.23.6"></a><h4>Returns</h4>
 <p> the current device state</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1328,7 +1310,7 @@ containing <a href="NMRemoteConnection.html"><span class="type">NMRemoteConnecti
 the connection, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMRemoteConnection]</span></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1359,9 +1341,8 @@ ports on a single physical port. (Eg, NPAR / SR-IOV.)</p>
 <p> the physical port ID of the device, or <code class="literal">NULL</code> if the port
 ID is unknown. This is the internal string used by the device and
 must not be modified.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1387,9 +1368,8 @@ nm_device_get_mtu (<em class="parameter"><code><a class="link" href="NMDevice.ht
 <div class="refsect3">
 <a name="id-1.3.4.9.27.6"></a><h4>Returns</h4>
 <p> the MTU of the device.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1416,9 +1396,8 @@ nm_device_is_software (<em class="parameter"><code><a class="link" href="NMDevic
 <a name="id-1.3.4.9.28.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>device</code></em>
 is a software device, <code class="literal">FALSE</code> if it is a hardware device.</p>
-<p></p>
 </div>
-<p class="since">Since 1.0</p>
+<p class="since">Since: 1.0</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1445,7 +1424,6 @@ nm_device_get_product (<em class="parameter"><code><a class="link" href="NMDevic
 <a name="id-1.3.4.9.29.6"></a><h4>Returns</h4>
 <p> the product name of the device. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1473,7 +1451,6 @@ nm_device_get_vendor (<em class="parameter"><code><a class="link" href="NMDevice
 <a name="id-1.3.4.9.30.6"></a><h4>Returns</h4>
 <p> the vendor name of the device. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1503,9 +1480,8 @@ nm_device_get_description (<em class="parameter"><code><a class="link" href="NMD
 <p> a description of <em class="parameter"><code>device</code></em>
 . If either the vendor or the
 product name is unknown, this returns the interface name.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1544,7 +1520,7 @@ devices in <em class="parameter"><code>devices</code></em>
 <p> the device names. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> zero-terminated=1]</span></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1553,8 +1529,6 @@ devices in <em class="parameter"><code>devices</code></em>
 <span class="c_punctuation">(</span>*NMDeviceCallbackFn<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                        <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                        <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1633,7 +1607,7 @@ operation completes. </p></td>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 1.0</p>
+<p class="since">Since: 1.0</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1726,7 +1700,6 @@ against</p></td>
 <a name="id-1.3.4.9.37.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection may be activated with this device, <code class="literal">FALSE</code>
 if is incompatible with the device's capabilities and characteristics.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1780,7 +1753,6 @@ against</p></td>
 <a name="id-1.3.4.9.38.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection may be activated with this device, <code class="literal">FALSE</code>
 if is incompatible with the device's capabilities and characteristics.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1810,9 +1782,8 @@ that can be used on <em class="parameter"><code>device</code></em>
 <a name="id-1.3.4.9.39.6"></a><h4>Returns</h4>
 <p> <em class="parameter"><code>device</code></em>
 's associated <a href="https://developer.gnome.org/libnm-util/0.9/NMSetting.html"><span class="type">NMSetting</span></a> type</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1822,8 +1793,6 @@ that can be used on <em class="parameter"><code>device</code></em>
                          <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                          <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <div class="warning"><p><code class="literal">NMDeviceDeactivateFn</code> is deprecated and should not be used in newly-written code.</p></div>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1863,192 +1832,144 @@ that can be used on <em class="parameter"><code>device</code></em>
 <a name="NM-DEVICE-ERROR:CAPS"></a><h3>NM_DEVICE_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_ERROR nm_device_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-DEVICE-TYPE:CAPS"></a><h3>NM_DEVICE_DEVICE_TYPE</h3>
 <pre class="programlisting">#define NM_DEVICE_DEVICE_TYPE "device-type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-UDI:CAPS"></a><h3>NM_DEVICE_UDI</h3>
 <pre class="programlisting">#define NM_DEVICE_UDI "udi"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-INTERFACE:CAPS"></a><h3>NM_DEVICE_INTERFACE</h3>
 <pre class="programlisting">#define NM_DEVICE_INTERFACE "interface"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-IP-INTERFACE:CAPS"></a><h3>NM_DEVICE_IP_INTERFACE</h3>
 <pre class="programlisting">#define NM_DEVICE_IP_INTERFACE "ip-interface"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-DRIVER:CAPS"></a><h3>NM_DEVICE_DRIVER</h3>
 <pre class="programlisting">#define NM_DEVICE_DRIVER "driver"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-DRIVER-VERSION:CAPS"></a><h3>NM_DEVICE_DRIVER_VERSION</h3>
 <pre class="programlisting">#define NM_DEVICE_DRIVER_VERSION "driver-version"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-FIRMWARE-VERSION:CAPS"></a><h3>NM_DEVICE_FIRMWARE_VERSION</h3>
 <pre class="programlisting">#define NM_DEVICE_FIRMWARE_VERSION "firmware-version"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_DEVICE_CAPABILITIES "capabilities"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-MANAGED:CAPS"></a><h3>NM_DEVICE_MANAGED</h3>
 <pre class="programlisting">#define NM_DEVICE_MANAGED "managed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-AUTOCONNECT:CAPS"></a><h3>NM_DEVICE_AUTOCONNECT</h3>
 <pre class="programlisting">#define NM_DEVICE_AUTOCONNECT "autoconnect"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-FIRMWARE-MISSING:CAPS"></a><h3>NM_DEVICE_FIRMWARE_MISSING</h3>
 <pre class="programlisting">#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-IP4-CONFIG:CAPS"></a><h3>NM_DEVICE_IP4_CONFIG</h3>
 <pre class="programlisting">#define NM_DEVICE_IP4_CONFIG "ip4-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-DHCP4-CONFIG:CAPS"></a><h3>NM_DEVICE_DHCP4_CONFIG</h3>
 <pre class="programlisting">#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-IP6-CONFIG:CAPS"></a><h3>NM_DEVICE_IP6_CONFIG</h3>
 <pre class="programlisting">#define NM_DEVICE_IP6_CONFIG "ip6-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-DHCP6-CONFIG:CAPS"></a><h3>NM_DEVICE_DHCP6_CONFIG</h3>
 <pre class="programlisting">#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-STATE:CAPS"></a><h3>NM_DEVICE_STATE</h3>
 <pre class="programlisting">#define NM_DEVICE_STATE "state"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-STATE-REASON:CAPS"></a><h3>NM_DEVICE_STATE_REASON</h3>
 <pre class="programlisting">#define NM_DEVICE_STATE_REASON "state-reason"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-ACTIVE-CONNECTION:CAPS"></a><h3>NM_DEVICE_ACTIVE_CONNECTION</h3>
 <pre class="programlisting">#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-AVAILABLE-CONNECTIONS:CAPS"></a><h3>NM_DEVICE_AVAILABLE_CONNECTIONS</h3>
 <pre class="programlisting">#define NM_DEVICE_AVAILABLE_CONNECTIONS "available-connections"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-VENDOR:CAPS"></a><h3>NM_DEVICE_VENDOR</h3>
 <pre class="programlisting">#define NM_DEVICE_VENDOR "vendor"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-PRODUCT:CAPS"></a><h3>NM_DEVICE_PRODUCT</h3>
 <pre class="programlisting">#define NM_DEVICE_PRODUCT "product"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-PHYSICAL-PORT-ID:CAPS"></a><h3>NM_DEVICE_PHYSICAL_PORT_ID</h3>
 <pre class="programlisting">#define NM_DEVICE_PHYSICAL_PORT_ID "physical-port-id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-MTU:CAPS"></a><h3>NM_DEVICE_MTU</h3>
 <pre class="programlisting">#define NM_DEVICE_MTU "mtu"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -2056,14 +1977,14 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--active-connection"></a><h3>The <code class="literal">“active-connection”</code> property</h3>
 <pre class="programlisting">  “active-connection”        <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object that "owns" this device during activation.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--autoconnect"></a><h3>The <code class="literal">“autoconnect”</code> property</h3>
 <pre class="programlisting">  “autoconnect”              <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device can auto-activate a connection.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: TRUE</p>
 </div>
@@ -2071,15 +1992,15 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--available-connections"></a><h3>The <code class="literal">“available-connections”</code> property</h3>
 <pre class="programlisting">  “available-connections”    <span class="type">NMObjectArray</span> *</pre>
-<p></p>
+<p>The available connections (<a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a>) of the device</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--capabilities"></a><h3>The <code class="literal">“capabilities”</code> property</h3>
 <pre class="programlisting">  “capabilities”             <span class="type">guint</span></pre>
-<p></p>
+<p>The capabilities of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -2087,7 +2008,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--device-type"></a><h3>The <code class="literal">“device-type”</code> property</h3>
 <pre class="programlisting">  “device-type”              <span class="type">guint</span></pre>
-<p></p>
+<p>The numeric type of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -2095,21 +2016,21 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--dhcp4-config"></a><h3>The <code class="literal">“dhcp4-config”</code> property</h3>
 <pre class="programlisting">  “dhcp4-config”             <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a> of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--dhcp6-config"></a><h3>The <code class="literal">“dhcp6-config”</code> property</h3>
 <pre class="programlisting">  “dhcp6-config”             <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a> of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--driver"></a><h3>The <code class="literal">“driver”</code> property</h3>
 <pre class="programlisting">  “driver”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The driver of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2117,7 +2038,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--driver-version"></a><h3>The <code class="literal">“driver-version”</code> property</h3>
 <pre class="programlisting">  “driver-version”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The version of the device driver.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2125,7 +2046,8 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--firmware-missing"></a><h3>The <code class="literal">“firmware-missing”</code> property</h3>
 <pre class="programlisting">  “firmware-missing”         <span class="type">gboolean</span></pre>
-<p></p>
+<p>When <code class="literal">TRUE</code> indicates the device is likely missing firmware required
+for its operation.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2133,7 +2055,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--firmware-version"></a><h3>The <code class="literal">“firmware-version”</code> property</h3>
 <pre class="programlisting">  “firmware-version”         <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The firmware version of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2141,7 +2063,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--interface"></a><h3>The <code class="literal">“interface”</code> property</h3>
 <pre class="programlisting">  “interface”                <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The interface of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2149,7 +2071,8 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--ip-interface"></a><h3>The <code class="literal">“ip-interface”</code> property</h3>
 <pre class="programlisting">  “ip-interface”             <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The IP interface of the device which should be used for all IP-related
+operations like addressing and routing.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2157,21 +2080,21 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--ip4-config"></a><h3>The <code class="literal">“ip4-config”</code> property</h3>
 <pre class="programlisting">  “ip4-config”               <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a> of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--ip6-config"></a><h3>The <code class="literal">“ip6-config”</code> property</h3>
 <pre class="programlisting">  “ip6-config”               <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a> of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--managed"></a><h3>The <code class="literal">“managed”</code> property</h3>
 <pre class="programlisting">  “managed”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device is managed by NetworkManager.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2179,25 +2102,26 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--mtu"></a><h3>The <code class="literal">“mtu”</code> property</h3>
 <pre class="programlisting">  “mtu”                      <span class="type">guint</span></pre>
-<p></p>
+<p>The MTU of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: 1500</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--physical-port-id"></a><h3>The <code class="literal">“physical-port-id”</code> property</h3>
 <pre class="programlisting">  “physical-port-id”         <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The physical port ID of the device. (See
+<a class="link" href="NMDevice.html#nm-device-get-physical-port-id" title="nm_device_get_physical_port_id ()"><code class="function">nm_device_get_physical_port_id()</code></a>.)</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--product"></a><h3>The <code class="literal">“product”</code> property</h3>
 <pre class="programlisting">  “product”                  <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The product string of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2205,7 +2129,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--state"></a><h3>The <code class="literal">“state”</code> property</h3>
 <pre class="programlisting">  “state”                    <span class="type">guint</span></pre>
-<p></p>
+<p>The state of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -2213,14 +2137,19 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--state-reason"></a><h3>The <code class="literal">“state-reason”</code> property</h3>
 <pre class="programlisting">  “state-reason”             <span class="type">GValueArray_guint+guint_*</span></pre>
-<p></p>
+<p>The state and reason of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--udi"></a><h3>The <code class="literal">“udi”</code> property</h3>
 <pre class="programlisting">  “udi”                      <span class="type">gchar</span> *</pre>
-<p></p>
+<p>An operating-system specific device hardware identifier; this is not
+unique to a specific hardware device across reboots or hotplugs.  It
+is an opaque string which for some device types (Bluetooth, Modem)
+contains an identifier provided by the underlying hardware service daemon
+such as Bluez or ModemManager, and clients can use this property to
+request more information about the device from those services.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2228,7 +2157,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--vendor"></a><h3>The <code class="literal">“vendor”</code> property</h3>
 <pre class="programlisting">  “vendor”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The vendor string of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2243,12 +2172,49 @@ user_function (<a class="link" href="NMDevice.html" title="NMDevice"><span class
                <span class="type">guint</span>     old_state,
                <span class="type">guint</span>     reason,
                <span class="type">gpointer</span>  user_data)</pre>
+<p>Notifies the state change of a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
+<div class="refsect3">
+<a name="id-1.3.4.12.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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>the device object that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>new_state</p></td>
+<td class="parameter_description"><p>the new state of the device</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>old_state</p></td>
+<td class="parameter_description"><p>the previous state of the device</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>reason</p></td>
+<td class="parameter_description"><p>the reason describing the state change</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceAdsl.html b/docs/libnm-glib/html/NMDeviceAdsl.html
index 404fb121..3f108475 100644
--- a/docs/libnm-glib/html/NMDeviceAdsl.html
+++ b/docs/libnm-glib/html/NMDeviceAdsl.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDeviceAdsl</title>
+<title>NMDeviceAdsl: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceWimax.html" title="NMDeviceWimax">
 <link rel="next" href="NMDeviceBond.html" title="NMDeviceBond">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -116,8 +116,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceAdsl.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceAdsl.functions_details"></a><h2>Functions</h2>
@@ -129,7 +127,6 @@ nm_device_adsl_error_quark (<em class="parameter"><code><span class="type">void<
 <div class="refsect3">
 <a name="id-1.3.10.8.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl"><span class="type">NMDeviceAdsl</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -191,7 +188,6 @@ nm_device_adsl_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.3.10.8.4.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -238,16 +234,12 @@ nm_device_adsl_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <a name="NM-DEVICE-ADSL-ERROR:CAPS"></a><h3>NM_DEVICE_ADSL_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_ADSL_ERROR nm_device_adsl_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-ADSL-CARRIER:CAPS"></a><h3>NM_DEVICE_ADSL_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_ADSL_CARRIER "carrier"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -255,14 +247,13 @@ nm_device_adsl_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect2">
 <a name="NMDeviceAdsl--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html
index c79364a9..7659084c 100644
--- a/docs/libnm-glib/html/NMDeviceBond.html
+++ b/docs/libnm-glib/html/NMDeviceBond.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDeviceBond</title>
+<title>NMDeviceBond: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceAdsl.html" title="NMDeviceAdsl">
 <link rel="next" href="NMDeviceBridge.html" title="NMDeviceBridge">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -152,8 +152,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceBond.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceBond.functions_details"></a><h2>Functions</h2>
@@ -165,7 +163,6 @@ nm_device_bond_error_quark (<em class="parameter"><code><span class="type">void<
 <div class="refsect3">
 <a name="id-1.3.11.8.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDeviceBond.html" title="NMDeviceBond"><span class="type">NMDeviceBond</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -228,7 +225,6 @@ nm_device_bond_get_hw_address (<em class="parameter"><code><a class="link" href=
 <a name="id-1.3.11.8.4.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -255,7 +251,6 @@ nm_device_bond_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.3.11.8.5.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -288,7 +283,7 @@ nm_device_bond_get_slaves (<em class="parameter"><code><a class="link" href="NMD
 copy used by the device, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
 </div>
-<p class="since">Since 0.9.6.4</p>
+<p class="since">Since: 0.9.6.4</p>
 </div>
 </div>
 <div class="refsect1">
@@ -341,32 +336,24 @@ copy used by the device, and must not be modified. </p>
 <a name="NM-DEVICE-BOND-ERROR:CAPS"></a><h3>NM_DEVICE_BOND_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_BOND_ERROR nm_device_bond_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BOND-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_BOND_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_BOND_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BOND-CARRIER:CAPS"></a><h3>NM_DEVICE_BOND_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_BOND_CARRIER     "carrier"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BOND-SLAVES:CAPS"></a><h3>NM_DEVICE_BOND_SLAVES</h3>
 <pre class="programlisting">#define NM_DEVICE_BOND_SLAVES      "slaves"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -374,7 +361,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceBond--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -382,7 +369,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceBond--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -390,14 +377,13 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceBond--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <span class="type">NMObjectArray</span> *</pre>
-<p></p>
+<p>The devices (<a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>) slaved to the bond device.</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html
index 192be733..f0af6d6a 100644
--- a/docs/libnm-glib/html/NMDeviceBridge.html
+++ b/docs/libnm-glib/html/NMDeviceBridge.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDeviceBridge</title>
+<title>NMDeviceBridge: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceBond.html" title="NMDeviceBond">
 <link rel="next" href="NMDeviceTeam.html" title="NMDeviceTeam">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -152,8 +152,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceBridge.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceBridge.functions_details"></a><h2>Functions</h2>
@@ -165,9 +163,8 @@ nm_device_bridge_error_quark (<em class="parameter"><code><span class="type">voi
 <div class="refsect3">
 <a name="id-1.3.12.8.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDeviceBridge.html" title="NMDeviceBridge"><span class="type">NMDeviceBridge</span></a> errors.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -203,7 +200,7 @@ nm_device_bridge_new (<em class="parameter"><code><a href="/usr/share/gtk-doc/ht
 <p> a new device. </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 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -230,9 +227,8 @@ nm_device_bridge_get_hw_address (<em class="parameter"><code><a class="link" hre
 <a name="id-1.3.12.8.4.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -258,9 +254,8 @@ nm_device_bridge_get_carrier (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.3.12.8.5.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -292,7 +287,7 @@ nm_device_bridge_get_slaves (<em class="parameter"><code><a class="link" href="N
 copy used by the device, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 </div>
 <div class="refsect1">
@@ -339,39 +334,31 @@ copy used by the device, and must not be modified. </p>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BRIDGE-ERROR:CAPS"></a><h3>NM_DEVICE_BRIDGE_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_BRIDGE_ERROR nm_device_bridge_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BRIDGE-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_BRIDGE_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_BRIDGE_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BRIDGE-CARRIER:CAPS"></a><h3>NM_DEVICE_BRIDGE_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_BRIDGE_CARRIER     "carrier"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BRIDGE-SLAVES:CAPS"></a><h3>NM_DEVICE_BRIDGE_SLAVES</h3>
 <pre class="programlisting">#define NM_DEVICE_BRIDGE_SLAVES      "slaves"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -379,32 +366,31 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceBridge--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceBridge--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceBridge--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <span class="type">NMObjectArray</span> *</pre>
-<p></p>
+<p>The devices (<a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>) slaved to the bridge device.</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index 816f671d..8a0df6b0 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDeviceBt</title>
+<title>NMDeviceBt: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceModem.html" title="NMDeviceModem">
 <link rel="next" href="NMDeviceWimax.html" title="NMDeviceWimax">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -152,8 +152,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceBt.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceBt.functions_details"></a><h2>Functions</h2>
@@ -165,7 +163,6 @@ nm_device_bt_error_quark (<em class="parameter"><code><span class="type">void</s
 <div class="refsect3">
 <a name="id-1.3.8.8.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><span class="type">NMDeviceBt</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -228,7 +225,6 @@ nm_device_bt_get_hw_address (<em class="parameter"><code><a class="link" href="N
 <a name="id-1.3.8.8.4.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -255,7 +251,6 @@ nm_device_bt_get_name (<em class="parameter"><code><a class="link" href="NMDevic
 <div class="refsect3">
 <a name="id-1.3.8.8.5.6"></a><h4>Returns</h4>
 <p> the name of the device</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -282,7 +277,6 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.3.8.8.6.6"></a><h4>Returns</h4>
 <p> a combination of <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -350,32 +344,24 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <a name="NM-DEVICE-BT-ERROR:CAPS"></a><h3>NM_DEVICE_BT_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_BT_ERROR nm_device_bt_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BT-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_BT_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_BT_HW_ADDRESS   "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BT-NAME:CAPS"></a><h3>NM_DEVICE_BT_NAME</h3>
 <pre class="programlisting">#define NM_DEVICE_BT_NAME         "name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BT-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_BT_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -383,7 +369,7 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <div class="refsect2">
 <a name="NMDeviceBt--bt-capabilities"></a><h3>The <code class="literal">“bt-capabilities”</code> property</h3>
 <pre class="programlisting">  “bt-capabilities”          <span class="type">guint</span></pre>
-<p></p>
+<p>The device's bluetooth capabilities, a combination of <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a>.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -391,7 +377,7 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <div class="refsect2">
 <a name="NMDeviceBt--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -399,14 +385,13 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <div class="refsect2">
 <a name="NMDeviceBt--name"></a><h3>The <code class="literal">“name”</code> property</h3>
 <pre class="programlisting">  “name”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The name of the bluetooth device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html
index 86f4898c..655a0441 100644
--- a/docs/libnm-glib/html/NMDeviceEthernet.html
+++ b/docs/libnm-glib/html/NMDeviceEthernet.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDeviceEthernet</title>
+<title>NMDeviceEthernet: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDevice.html" title="NMDevice">
 <link rel="next" href="NMDeviceWifi.html" title="NMDeviceWifi">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -169,8 +169,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceEthernet.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceEthernet.functions_details"></a><h2>Functions</h2>
@@ -182,7 +180,6 @@ nm_device_ethernet_error_quark (<em class="parameter"><code><span class="type">v
 <div class="refsect3">
 <a name="id-1.3.5.8.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -245,7 +242,6 @@ nm_device_ethernet_get_hw_address (<em class="parameter"><code><a class="link" h
 <a name="id-1.3.5.8.4.6"></a><h4>Returns</h4>
 <p> the active hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -274,7 +270,6 @@ nm_device_ethernet_get_permanent_hw_address
 <a name="id-1.3.5.8.5.6"></a><h4>Returns</h4>
 <p> the permanent hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -301,7 +296,6 @@ nm_device_ethernet_get_speed (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.3.5.8.6.6"></a><h4>Returns</h4>
 <p> the speed of the device</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -328,7 +322,6 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.3.5.8.7.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -389,40 +382,30 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 <a name="NM-DEVICE-ETHERNET-ERROR:CAPS"></a><h3>NM_DEVICE_ETHERNET_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_ERROR nm_device_ethernet_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-ETHERNET-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_ETHERNET_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-ETHERNET-PERMANENT-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS "perm-hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-ETHERNET-SPEED:CAPS"></a><h3>NM_DEVICE_ETHERNET_SPEED</h3>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_SPEED       "speed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-ETHERNET-CARRIER:CAPS"></a><h3>NM_DEVICE_ETHERNET_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -430,7 +413,7 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 <div class="refsect2">
 <a name="NMDeviceEthernet--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -438,7 +421,7 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 <div class="refsect2">
 <a name="NMDeviceEthernet--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The active hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -446,7 +429,7 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 <div class="refsect2">
 <a name="NMDeviceEthernet--perm-hw-address"></a><h3>The <code class="literal">“perm-hw-address”</code> property</h3>
 <pre class="programlisting">  “perm-hw-address”          <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The permanent hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -454,14 +437,13 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 <div class="refsect2">
 <a name="NMDeviceEthernet--speed"></a><h3>The <code class="literal">“speed”</code> property</h3>
 <pre class="programlisting">  “speed”                    <span class="type">guint</span></pre>
-<p></p>
+<p>The speed of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceGeneric.html b/docs/libnm-glib/html/NMDeviceGeneric.html
index e663d8d7..58b7c9ca 100644
--- a/docs/libnm-glib/html/NMDeviceGeneric.html
+++ b/docs/libnm-glib/html/NMDeviceGeneric.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDeviceGeneric</title>
+<title>NMDeviceGeneric: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceTeam.html" title="NMDeviceTeam">
 <link rel="next" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -128,8 +128,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceGeneric.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceGeneric.functions_details"></a><h2>Functions</h2>
@@ -141,9 +139,8 @@ nm_device_generic_error_quark (<em class="parameter"><code><span class="type">vo
 <div class="refsect3">
 <a name="id-1.3.14.8.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDeviceGeneric.html" title="NMDeviceGeneric"><span class="type">NMDeviceGeneric</span></a> errors.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -179,7 +176,7 @@ nm_device_generic_new (<em class="parameter"><code><a href="/usr/share/gtk-doc/h
 <p> a new device. </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -206,9 +203,8 @@ nm_device_generic_get_hw_address (<em class="parameter"><code><a class="link" hr
 <a name="id-1.3.14.8.4.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 <div class="refsect1">
@@ -254,24 +250,18 @@ device, and must not be modified.</p>
 <a name="NM-DEVICE-GENERIC-ERROR:CAPS"></a><h3>NM_DEVICE_GENERIC_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_GENERIC_ERROR nm_device_generic_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-GENERIC-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_GENERIC_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_GENERIC_HW_ADDRESS       "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-GENERIC-TYPE-DESCRIPTION:CAPS"></a><h3>NM_DEVICE_GENERIC_TYPE_DESCRIPTION</h3>
 <pre class="programlisting">#define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -279,7 +269,7 @@ device, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMDeviceGeneric--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -287,14 +277,14 @@ device, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMDeviceGeneric--type-description"></a><h3>The <code class="literal">“type-description”</code> property</h3>
 <pre class="programlisting">  “type-description”         <span class="type">gchar</span> *</pre>
-<p></p>
+<p>A description of the specific type of device this is, or <code class="literal">NULL</code>
+if not known.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceInfiniband.html b/docs/libnm-glib/html/NMDeviceInfiniband.html
index 48b6c887..bb9523d5 100644
--- a/docs/libnm-glib/html/NMDeviceInfiniband.html
+++ b/docs/libnm-glib/html/NMDeviceInfiniband.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDeviceInfiniband</title>
+<title>NMDeviceInfiniband: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceGeneric.html" title="NMDeviceGeneric">
 <link rel="next" href="NMDeviceVlan.html" title="NMDeviceVlan">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -135,8 +135,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceInfiniband.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceInfiniband.functions_details"></a><h2>Functions</h2>
@@ -148,7 +146,6 @@ nm_device_infiniband_error_quark (<em class="parameter"><code><span class="type"
 <div class="refsect3">
 <a name="id-1.3.15.8.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband"><span class="type">NMDeviceInfiniband</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -211,7 +208,6 @@ nm_device_infiniband_get_hw_address (<em class="parameter"><code><a class="link"
 <a name="id-1.3.15.8.4.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -238,7 +234,6 @@ nm_device_infiniband_get_carrier (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.3.15.8.5.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -299,24 +294,18 @@ nm_device_infiniband_get_carrier (<em class="parameter"><code><a class="link" hr
 <a name="NM-DEVICE-INFINIBAND-ERROR:CAPS"></a><h3>NM_DEVICE_INFINIBAND_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_INFINIBAND_ERROR nm_device_infiniband_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-INFINIBAND-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_INFINIBAND_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_INFINIBAND_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-INFINIBAND-CARRIER:CAPS"></a><h3>NM_DEVICE_INFINIBAND_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -324,7 +313,7 @@ nm_device_infiniband_get_carrier (<em class="parameter"><code><a class="link" hr
 <div class="refsect2">
 <a name="NMDeviceInfiniband--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -332,14 +321,13 @@ nm_device_infiniband_get_carrier (<em class="parameter"><code><a class="link" hr
 <div class="refsect2">
 <a name="NMDeviceInfiniband--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index 2503475b..15fe2aa1 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDeviceModem</title>
+<title>NMDeviceModem: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceWifi.html" title="NMDeviceWifi">
 <link rel="next" href="NMDeviceBt.html" title="NMDeviceBt">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -127,8 +127,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceModem.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceModem.functions_details"></a><h2>Functions</h2>
@@ -140,7 +138,6 @@ nm_device_modem_error_quark (<em class="parameter"><code><span class="type">void
 <div class="refsect3">
 <a name="id-1.3.7.8.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDeviceModem.html" title="NMDeviceModem"><span class="type">NMDeviceModem</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -170,7 +167,6 @@ may require a firmware reload or reinitialization.</p>
 <div class="refsect3">
 <a name="id-1.3.7.8.3.6"></a><h4>Returns</h4>
 <p> the generic access technology families the modem supports</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -201,7 +197,6 @@ represents the network types the modem can immediately connect to.</p>
 <a name="id-1.3.7.8.4.6"></a><h4>Returns</h4>
 <p> the generic access technology families the modem supports without
 a firmware reload or other reinitialization</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -255,24 +250,18 @@ a firmware reload or other reinitialization</p>
 <a name="NM-DEVICE-MODEM-ERROR:CAPS"></a><h3>NM_DEVICE_MODEM_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_MODEM_ERROR nm_device_modem_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_MODEM_MODEM_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_MODEM_CURRENT_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -280,7 +269,8 @@ a firmware reload or other reinitialization</p>
 <div class="refsect2">
 <a name="NMDeviceModem--current-capabilities"></a><h3>The <code class="literal">“current-capabilities”</code> property</h3>
 <pre class="programlisting">  “current-capabilities”     <span class="type">guint</span></pre>
-<p></p>
+<p>The generic family of access technologies the modem currently supports
+without a firmware reload or reinitialization.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -288,14 +278,16 @@ a firmware reload or other reinitialization</p>
 <div class="refsect2">
 <a name="NMDeviceModem--modem-capabilities"></a><h3>The <code class="literal">“modem-capabilities”</code> property</h3>
 <pre class="programlisting">  “modem-capabilities”       <span class="type">guint</span></pre>
-<p></p>
+<p>The generic family of access technologies the modem supports.  Not all
+capabilities are available at the same time however; some modems require
+a firmware reload or other reinitialization to switch between eg
+CDMA/EVDO and GSM/UMTS.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceOlpcMesh.html b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
index a505af82..c48c4e36 100644
--- a/docs/libnm-glib/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDeviceOlpcMesh</title>
+<title>NMDeviceOlpcMesh: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceVlan.html" title="NMDeviceVlan">
 <link rel="next" href="NMWimaxNsp.html" title="NMWimaxNsp">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -153,8 +153,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceOlpcMesh.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceOlpcMesh.functions_details"></a><h2>Functions</h2>
@@ -166,7 +164,6 @@ nm_device_olpc_mesh_error_quark (<em class="parameter"><code><span class="type">
 <div class="refsect3">
 <a name="id-1.3.17.8.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh"><span class="type">NMDeviceOlpcMesh</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -229,7 +226,6 @@ nm_device_olpc_mesh_get_hw_address (<em class="parameter"><code><a class="link"
 <a name="id-1.3.17.8.4.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -284,7 +280,6 @@ nm_device_olpc_mesh_get_active_channel
 <div class="refsect3">
 <a name="id-1.3.17.8.6.6"></a><h4>Returns</h4>
 <p> active channel of the device</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -331,32 +326,24 @@ nm_device_olpc_mesh_get_active_channel
 <a name="NM-DEVICE-OLPC-MESH-ERROR:CAPS"></a><h3>NM_DEVICE_OLPC_MESH_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_OLPC_MESH_ERROR nm_device_olpc_mesh_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-OLPC-MESH-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_OLPC_MESH_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_OLPC_MESH_HW_ADDRESS     "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-OLPC-MESH-COMPANION:CAPS"></a><h3>NM_DEVICE_OLPC_MESH_COMPANION</h3>
 <pre class="programlisting">#define NM_DEVICE_OLPC_MESH_COMPANION      "companion"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-OLPC-MESH-ACTIVE-CHANNEL:CAPS"></a><h3>NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL</h3>
 <pre class="programlisting">#define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -364,7 +351,7 @@ nm_device_olpc_mesh_get_active_channel
 <div class="refsect2">
 <a name="NMDeviceOlpcMesh--active-channel"></a><h3>The <code class="literal">“active-channel”</code> property</h3>
 <pre class="programlisting">  “active-channel”           <span class="type">guint</span></pre>
-<p></p>
+<p>The device's active channel.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -372,21 +359,20 @@ nm_device_olpc_mesh_get_active_channel
 <div class="refsect2">
 <a name="NMDeviceOlpcMesh--companion"></a><h3>The <code class="literal">“companion”</code> property</h3>
 <pre class="programlisting">  “companion”                <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *</pre>
-<p></p>
+<p>The companion device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceOlpcMesh--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceTeam.html b/docs/libnm-glib/html/NMDeviceTeam.html
index 0b07f9eb..2195f9aa 100644
--- a/docs/libnm-glib/html/NMDeviceTeam.html
+++ b/docs/libnm-glib/html/NMDeviceTeam.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDeviceTeam</title>
+<title>NMDeviceTeam: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceBridge.html" title="NMDeviceBridge">
 <link rel="next" href="NMDeviceGeneric.html" title="NMDeviceGeneric">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -152,8 +152,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceTeam.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceTeam.functions_details"></a><h2>Functions</h2>
@@ -165,9 +163,8 @@ nm_device_team_error_quark (<em class="parameter"><code><span class="type">void<
 <div class="refsect3">
 <a name="id-1.3.13.8.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDeviceTeam.html" title="NMDeviceTeam"><span class="type">NMDeviceTeam</span></a> errors.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -203,7 +200,7 @@ nm_device_team_new (<em class="parameter"><code><a href="/usr/share/gtk-doc/html
 <p> a new device. </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -230,9 +227,8 @@ nm_device_team_get_hw_address (<em class="parameter"><code><a class="link" href=
 <a name="id-1.3.13.8.4.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -258,9 +254,8 @@ nm_device_team_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.3.13.8.5.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -292,7 +287,7 @@ nm_device_team_get_slaves (<em class="parameter"><code><a class="link" href="NMD
 copy used by the device, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 <div class="refsect1">
@@ -345,32 +340,24 @@ copy used by the device, and must not be modified. </p>
 <a name="NM-DEVICE-TEAM-ERROR:CAPS"></a><h3>NM_DEVICE_TEAM_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_TEAM_ERROR nm_device_team_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-TEAM-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_TEAM_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_TEAM_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-TEAM-CARRIER:CAPS"></a><h3>NM_DEVICE_TEAM_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_TEAM_CARRIER     "carrier"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-TEAM-SLAVES:CAPS"></a><h3>NM_DEVICE_TEAM_SLAVES</h3>
 <pre class="programlisting">#define NM_DEVICE_TEAM_SLAVES      "slaves"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -378,7 +365,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceTeam--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -386,7 +373,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceTeam--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -394,13 +381,12 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceTeam--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <span class="type">NMObjectArray</span> *</pre>
-<p></p>
+<p>The devices (<a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>) enslaved to the team device.</p>
 <p>Flags: Read</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceVlan.html b/docs/libnm-glib/html/NMDeviceVlan.html
index e28b1978..51c89f0d 100644
--- a/docs/libnm-glib/html/NMDeviceVlan.html
+++ b/docs/libnm-glib/html/NMDeviceVlan.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDeviceVlan</title>
+<title>NMDeviceVlan: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband">
 <link rel="next" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -170,8 +170,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceVlan.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceVlan.functions_details"></a><h2>Functions</h2>
@@ -183,7 +181,6 @@ nm_device_vlan_error_quark (<em class="parameter"><code><span class="type">void<
 <div class="refsect3">
 <a name="id-1.3.16.8.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDeviceVlan.html" title="NMDeviceVlan"><span class="type">NMDeviceVlan</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -246,7 +243,6 @@ nm_device_vlan_get_hw_address (<em class="parameter"><code><a class="link" href=
 <a name="id-1.3.16.8.4.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -273,7 +269,6 @@ nm_device_vlan_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.3.16.8.5.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -301,7 +296,7 @@ nm_device_vlan_get_parent (<em class="parameter"><code><a class="link" href="NMD
 <p> the device's parent device. </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.0</p>
+<p class="since">Since: 1.0</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -326,7 +321,6 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.3.16.8.7.5"></a><h4>Returns</h4>
 <p> the device's VLAN ID</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -394,40 +388,30 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 <a name="NM-DEVICE-VLAN-ERROR:CAPS"></a><h3>NM_DEVICE_VLAN_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_VLAN_ERROR nm_device_vlan_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-VLAN-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_VLAN_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_VLAN_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-VLAN-CARRIER:CAPS"></a><h3>NM_DEVICE_VLAN_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_VLAN_CARRIER     "carrier"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-VLAN-PARENT:CAPS"></a><h3>NM_DEVICE_VLAN_PARENT</h3>
 <pre class="programlisting">#define NM_DEVICE_VLAN_PARENT      "parent"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-VLAN-VLAN-ID:CAPS"></a><h3>NM_DEVICE_VLAN_VLAN_ID</h3>
 <pre class="programlisting">#define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -435,7 +419,7 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect2">
 <a name="NMDeviceVlan--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -443,7 +427,7 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect2">
 <a name="NMDeviceVlan--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -451,15 +435,15 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect2">
 <a name="NMDeviceVlan--parent"></a><h3>The <code class="literal">“parent”</code> property</h3>
 <pre class="programlisting">  “parent”                   <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *</pre>
-<p></p>
+<p>The devices's parent device.</p>
 <p>Flags: Read</p>
-<p class="since">Since 1.0</p>
+<p class="since">Since: 1.0</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceVlan--vlan-id"></a><h3>The <code class="literal">“vlan-id”</code> property</h3>
 <pre class="programlisting">  “vlan-id”                  <span class="type">guint</span></pre>
-<p></p>
+<p>The device's VLAN ID.</p>
 <p>Flags: Read</p>
 <p>Allowed values: &lt;= 4095</p>
 <p>Default value: 0</p>
@@ -467,7 +451,6 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index fb153226..d739d92a 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDeviceWifi</title>
+<title>NMDeviceWifi: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceEthernet.html" title="NMDeviceEthernet">
 <link rel="next" href="NMDeviceModem.html" title="NMDeviceModem">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -268,8 +268,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceWifi.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceWifi.functions_details"></a><h2>Functions</h2>
@@ -281,7 +279,6 @@ nm_device_wifi_error_quark (<em class="parameter"><code><span class="type">void<
 <div class="refsect3">
 <a name="id-1.3.6.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -344,7 +341,6 @@ nm_device_wifi_get_hw_address (<em class="parameter"><code><a class="link" href=
 <a name="id-1.3.6.9.4.6"></a><h4>Returns</h4>
 <p> the actual hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -373,7 +369,6 @@ nm_device_wifi_get_permanent_hw_address
 <a name="id-1.3.6.9.5.6"></a><h4>Returns</h4>
 <p> the permanent hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -400,7 +395,6 @@ nm_device_wifi_get_mode (<em class="parameter"><code><a class="link" href="NMDev
 <div class="refsect3">
 <a name="id-1.3.6.9.6.6"></a><h4>Returns</h4>
 <p> the mode</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -427,7 +421,6 @@ nm_device_wifi_get_bitrate (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.3.6.9.7.6"></a><h4>Returns</h4>
 <p> the bit rate (kbit/s)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -454,7 +447,6 @@ nm_device_wifi_get_capabilities (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.3.6.9.8.6"></a><h4>Returns</h4>
 <p> the capabilities</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -557,8 +549,6 @@ The returned array is owned by the client and should not be modified. </p>
 <span class="c_punctuation">(</span>*NMDeviceWifiRequestScanFn<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>,
                               <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                               <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -597,7 +587,7 @@ to get available access points.</p>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 </div>
 <div class="refsect1">
@@ -673,64 +663,48 @@ required by the connection</p>
 <a name="NM-DEVICE-WIFI-ERROR:CAPS"></a><h3>NM_DEVICE_WIFI_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_ERROR nm_device_wifi_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIFI-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_WIFI_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIFI-PERMANENT-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIFI-MODE:CAPS"></a><h3>NM_DEVICE_WIFI_MODE</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_MODE                "mode"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIFI-BITRATE:CAPS"></a><h3>NM_DEVICE_WIFI_BITRATE</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_BITRATE             "bitrate"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIFI-ACTIVE-ACCESS-POINT:CAPS"></a><h3>NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIFI-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_WIFI_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIFI-ACCESS-POINTS:CAPS"></a><h3>NM_DEVICE_WIFI_ACCESS_POINTS</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_ACCESS_POINTS       "access-points"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -738,22 +712,22 @@ required by the connection</p>
 <div class="refsect2">
 <a name="NMDeviceWifi--access-points"></a><h3>The <code class="literal">“access-points”</code> property</h3>
 <pre class="programlisting">  “access-points”            <span class="type">NMObjectArray</span> *</pre>
-<p></p>
+<p>List of all Wi-Fi access points the device can see.</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceWifi--active-access-point"></a><h3>The <code class="literal">“active-access-point”</code> property</h3>
 <pre class="programlisting">  “active-access-point”      <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *</pre>
-<p></p>
+<p>The active <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceWifi--bitrate"></a><h3>The <code class="literal">“bitrate”</code> property</h3>
 <pre class="programlisting">  “bitrate”                  <span class="type">guint</span></pre>
-<p></p>
+<p>The bit rate of the device in kbit/s.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -761,7 +735,7 @@ required by the connection</p>
 <div class="refsect2">
 <a name="NMDeviceWifi--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -769,7 +743,7 @@ required by the connection</p>
 <div class="refsect2">
 <a name="NMDeviceWifi--mode"></a><h3>The <code class="literal">“mode”</code> property</h3>
 <pre class="programlisting">  “mode”                     <span class="type">guint</span></pre>
-<p></p>
+<p>The mode of the device.</p>
 <p>Flags: Read</p>
 <p>Allowed values: &lt;= 3</p>
 <p>Default value: 2</p>
@@ -778,7 +752,7 @@ required by the connection</p>
 <div class="refsect2">
 <a name="NMDeviceWifi--perm-hw-address"></a><h3>The <code class="literal">“perm-hw-address”</code> property</h3>
 <pre class="programlisting">  “perm-hw-address”          <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -786,7 +760,7 @@ required by the connection</p>
 <div class="refsect2">
 <a name="NMDeviceWifi--wireless-capabilities"></a><h3>The <code class="literal">“wireless-capabilities”</code> property</h3>
 <pre class="programlisting">  “wireless-capabilities”    <span class="type">guint</span></pre>
-<p></p>
+<p>The wireless capabilities of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -799,6 +773,34 @@ required by the connection</p>
 user_function (<a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device,
                <span class="type">GObject</span>      *ap,
                <span class="type">gpointer</span>      user_data)</pre>
+<p>Notifies that a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> is added to the Wi-Fi device.</p>
+<div class="refsect3">
+<a name="id-1.3.6.12.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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>the Wi-Fi device that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>ap</p></td>
+<td class="parameter_description"><p>the new access point</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 <hr>
@@ -808,12 +810,39 @@ user_function (<a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><sp
 user_function (<a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device,
                <span class="type">GObject</span>      *ap,
                <span class="type">gpointer</span>      user_data)</pre>
+<p>Notifies that a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> is removed from the Wi-Fi device.</p>
+<div class="refsect3">
+<a name="id-1.3.6.12.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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>the Wi-Fi device that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>ap</p></td>
+<td class="parameter_description"><p>the removed access point</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html
index 911ec29b..3ec917bc 100644
--- a/docs/libnm-glib/html/NMDeviceWimax.html
+++ b/docs/libnm-glib/html/NMDeviceWimax.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMDeviceWimax</title>
+<title>NMDeviceWimax: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceBt.html" title="NMDeviceBt">
 <link rel="next" href="NMDeviceAdsl.html" title="NMDeviceAdsl">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -269,8 +269,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceWimax.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceWimax.functions_details"></a><h2>Functions</h2>
@@ -282,7 +280,6 @@ nm_device_wimax_error_quark (<em class="parameter"><code><span class="type">void
 <div class="refsect3">
 <a name="id-1.3.9.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -345,7 +342,6 @@ nm_device_wimax_get_hw_address (<em class="parameter"><code><a class="link" href
 <a name="id-1.3.9.9.4.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -465,7 +461,6 @@ device is not connected.</p>
 <div class="refsect3">
 <a name="id-1.3.9.9.8.6"></a><h4>Returns</h4>
 <p> the center frequency in KHz, or 0</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -495,7 +490,6 @@ device is not connected.</p>
 <div class="refsect3">
 <a name="id-1.3.9.9.9.6"></a><h4>Returns</h4>
 <p> the RSSI in dBm, or 0</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -524,7 +518,6 @@ meaning when the device is not connected.</p>
 <div class="refsect3">
 <a name="id-1.3.9.9.10.6"></a><h4>Returns</h4>
 <p> the CINR in dB, or 0</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -553,7 +546,6 @@ nm_device_wimax_get_tx_power (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.3.9.9.11.6"></a><h4>Returns</h4>
 <p> the TX power in dBm, or 0</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -580,7 +572,6 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect3">
 <a name="id-1.3.9.9.12.6"></a><h4>Returns</h4>
 <p> the ID of the serving Base Station, or <code class="literal">NULL</code></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -641,72 +632,54 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <a name="NM-DEVICE-WIMAX-ERROR:CAPS"></a><h3>NM_DEVICE_WIMAX_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_ERROR nm_device_wimax_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_WIMAX_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-ACTIVE-NSP:CAPS"></a><h3>NM_DEVICE_WIMAX_ACTIVE_NSP</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-CENTER-FREQUENCY:CAPS"></a><h3>NM_DEVICE_WIMAX_CENTER_FREQUENCY</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-RSSI:CAPS"></a><h3>NM_DEVICE_WIMAX_RSSI</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_RSSI             "rssi"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-CINR:CAPS"></a><h3>NM_DEVICE_WIMAX_CINR</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_CINR             "cinr"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-TX-POWER:CAPS"></a><h3>NM_DEVICE_WIMAX_TX_POWER</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_TX_POWER         "tx-power"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-BSID:CAPS"></a><h3>NM_DEVICE_WIMAX_BSID</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_BSID             "bsid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-NSPS:CAPS"></a><h3>NM_DEVICE_WIMAX_NSPS</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_NSPS             "nsps"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -714,14 +687,15 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect2">
 <a name="NMDeviceWimax--active-nsp"></a><h3>The <code class="literal">“active-nsp”</code> property</h3>
 <pre class="programlisting">  “active-nsp”               <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *</pre>
-<p></p>
+<p>The active <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceWimax--bsid"></a><h3>The <code class="literal">“bsid”</code> property</h3>
 <pre class="programlisting">  “bsid”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The ID of the serving base station as received from the network.  Has
+no meaning when the device is not connected.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -729,7 +703,9 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect2">
 <a name="NMDeviceWimax--center-frequency"></a><h3>The <code class="literal">“center-frequency”</code> property</h3>
 <pre class="programlisting">  “center-frequency”         <span class="type">guint</span></pre>
-<p></p>
+<p>The center frequency (in KHz) of the radio channel the device is using to
+communicate with the network when connected.  Has no meaning when the
+device is not connected.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -737,7 +713,9 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect2">
 <a name="NMDeviceWimax--cinr"></a><h3>The <code class="literal">“cinr”</code> property</h3>
 <pre class="programlisting">  “cinr”                     <span class="type">gint</span></pre>
-<p></p>
+<p>CINR (Carrier to Interference + Noise Ratio) of the current radio link
+in dB.  CINR is a more accurate measure of radio link quality.  Has no
+meaning when the device is not connected.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -745,7 +723,7 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect2">
 <a name="NMDeviceWimax--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -753,15 +731,18 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect2">
 <a name="NMDeviceWimax--nsps"></a><h3>The <code class="literal">“nsps”</code> property</h3>
 <pre class="programlisting">  “nsps”                     <span class="type">NMObjectArray</span> *</pre>
-<p></p>
+<p>List of all WiMAX Network Service Providers the device can see.</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceWimax--rssi"></a><h3>The <code class="literal">“rssi”</code> property</h3>
 <pre class="programlisting">  “rssi”                     <span class="type">gint</span></pre>
-<p></p>
+<p>RSSI of the current radio link in dBm.  This value indicates how strong
+the raw received RF signal from the base station is, but does not
+indicate the overall quality of the radio link.  Has no meaning when the
+device is not connected.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -769,7 +750,9 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect2">
 <a name="NMDeviceWimax--tx-power"></a><h3>The <code class="literal">“tx-power”</code> property</h3>
 <pre class="programlisting">  “tx-power”                 <span class="type">gint</span></pre>
-<p></p>
+<p>Average power of the last burst transmitted by the device, in units of
+0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+-5.5 dBm.  Has no meaning when the device is not connected.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -782,6 +765,34 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 user_function (<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self,
                <span class="type">GObject</span>       *nsp,
                <span class="type">gpointer</span>       user_data)</pre>
+<p>Notifies that a <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> is added to the wimax device.</p>
+<div class="refsect3">
+<a name="id-1.3.9.12.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the wimax device that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>nsp</p></td>
+<td class="parameter_description"><p>the new NSP</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 <hr>
@@ -791,12 +802,39 @@ user_function (<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><
 user_function (<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self,
                <span class="type">GObject</span>       *nsp,
                <span class="type">gpointer</span>       user_data)</pre>
+<p>Notifies that a <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> is removed from the wimax device.</p>
+<div class="refsect3">
+<a name="id-1.3.9.12.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the wimax device that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>nsp</p></td>
+<td class="parameter_description"><p>the removed NSP</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index fec85cac..b7b318e1 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMIP4Config</title>
+<title>NMIP4Config: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMAccessPoint.html" title="NMAccessPoint">
 <link rel="next" href="NMIP6Config.html" title="NMIP6Config">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -201,8 +201,6 @@
 </div>
 <div class="refsect1">
 <a name="NMIP4Config.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMIP4Config.functions_details"></a><h2>Functions</h2>
@@ -264,9 +262,8 @@ nm_ip4_config_get_gateway (<em class="parameter"><code><a class="link" href="NMI
 <div class="refsect3">
 <a name="id-1.3.20.8.3.6"></a><h4>Returns</h4>
 <p> the IP4 address of the gateway.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -409,7 +406,7 @@ nm_ip4_config_get_searches (<em class="parameter"><code><a class="link" href="NM
 internal copy used by the configuration, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -447,56 +444,42 @@ modified. </p>
 <a name="NM-IP4-CONFIG-GATEWAY:CAPS"></a><h3>NM_IP4_CONFIG_GATEWAY</h3>
 <pre class="programlisting">#define NM_IP4_CONFIG_GATEWAY "gateway"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP4-CONFIG-ADDRESSES:CAPS"></a><h3>NM_IP4_CONFIG_ADDRESSES</h3>
 <pre class="programlisting">#define NM_IP4_CONFIG_ADDRESSES "addresses"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP4-CONFIG-ROUTES:CAPS"></a><h3>NM_IP4_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_IP4_CONFIG_ROUTES "routes"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP4-CONFIG-NAMESERVERS:CAPS"></a><h3>NM_IP4_CONFIG_NAMESERVERS</h3>
 <pre class="programlisting">#define NM_IP4_CONFIG_NAMESERVERS "nameservers"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP4-CONFIG-DOMAINS:CAPS"></a><h3>NM_IP4_CONFIG_DOMAINS</h3>
 <pre class="programlisting">#define NM_IP4_CONFIG_DOMAINS "domains"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP4-CONFIG-SEARCHES:CAPS"></a><h3>NM_IP4_CONFIG_SEARCHES</h3>
 <pre class="programlisting">#define NM_IP4_CONFIG_SEARCHES "searches"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP4-CONFIG-WINS-SERVERS:CAPS"></a><h3>NM_IP4_CONFIG_WINS_SERVERS</h3>
 <pre class="programlisting">#define NM_IP4_CONFIG_WINS_SERVERS "wins-servers"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -504,58 +487,57 @@ modified. </p>
 <div class="refsect2">
 <a name="NMIP4Config--addresses"></a><h3>The <code class="literal">“addresses”</code> property</h3>
 <pre class="programlisting">  “addresses”                <span class="type">gpointer</span></pre>
-<p></p>
+<p>The <span class="type">GPtrArray</span> containing <a href="https://developer.gnome.org/libnm-util/0.9/NMSettingIP4Config.html#NMIP4Address"><span class="type">NMIP4Address</span></a>es of the configuration.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIP4Config--domains"></a><h3>The <code class="literal">“domains”</code> property</h3>
 <pre class="programlisting">  “domains”                  <span class="type">NMStringArray</span> *</pre>
-<p></p>
+<p>The <span class="type">GPtrArray</span> containing domain strings of the configuration.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIP4Config--gateway"></a><h3>The <code class="literal">“gateway”</code> property</h3>
 <pre class="programlisting">  “gateway”                  <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The IP4 gateway address of the configuration as string.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIP4Config--nameservers"></a><h3>The <code class="literal">“nameservers”</code> property</h3>
 <pre class="programlisting">  “nameservers”              <span class="type">NMUintArray</span> *</pre>
-<p></p>
+<p>The <span class="type">GArray</span> containing name servers (<span class="type">guint32s</span>) of the configuration.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIP4Config--routes"></a><h3>The <code class="literal">“routes”</code> property</h3>
 <pre class="programlisting">  “routes”                   <span class="type">gpointer</span></pre>
-<p></p>
+<p>The <span class="type">GPtrArray</span> containing <span class="type">NMSettingIP4Routes</span> of the configuration.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIP4Config--searches"></a><h3>The <code class="literal">“searches”</code> property</h3>
 <pre class="programlisting">  “searches”                 <span class="type">NMStringArray</span> *</pre>
-<p></p>
+<p>The <span class="type">GPtrArray</span> containing dns search strings of the configuration.</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIP4Config--wins-servers"></a><h3>The <code class="literal">“wins-servers”</code> property</h3>
 <pre class="programlisting">  “wins-servers”             <span class="type">NMUintArray</span> *</pre>
-<p></p>
+<p>The <span class="type">GArray</span> containing WINS servers (<span class="type">guint32s</span>) of the configuration.</p>
 <p>Flags: Read</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index 83f5f473..ed97f3e5 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMIP6Config</title>
+<title>NMIP6Config: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMIP4Config.html" title="NMIP4Config">
 <link rel="next" href="NMDHCP4Config.html" title="NMDHCP4Config">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -201,8 +201,6 @@
 </div>
 <div class="refsect1">
 <a name="NMIP6Config.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMIP6Config.functions_details"></a><h2>Functions</h2>
@@ -264,9 +262,8 @@ nm_ip6_config_get_gateway (<em class="parameter"><code><a class="link" href="NMI
 <div class="refsect3">
 <a name="id-1.3.21.8.3.6"></a><h4>Returns</h4>
 <p> the IPv6 gateway of the configuration.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -350,9 +347,8 @@ nm_ip6_config_get_num_nameservers (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.3.21.8.6.6"></a><h4>Returns</h4>
 <p> the number of domain name servers</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -390,7 +386,7 @@ nm_ip6_config_get_nameserver (<em class="parameter"><code><a class="link" href="
 . </p>
 <p><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> fixed-size=16][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> guint8][<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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -398,8 +394,9 @@ nm_ip6_config_get_nameserver (<em class="parameter"><code><a class="link" href="
 <pre class="programlisting">const <span class="returnvalue">GSList</span> *
 nm_ip6_config_get_nameservers (<em class="parameter"><code><a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a> *config</code></em>);</pre>
 <p>Gets the domain name servers (DNS).</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.3.21.8.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.21.8.8.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -414,11 +411,10 @@ nm_ip6_config_get_nameservers (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.21.8.8.6"></a><h4>Returns</h4>
+<a name="id-1.3.21.8.8.7"></a><h4>Returns</h4>
 <p> a <span class="type">GSList</span> containing elements of type 'struct in6_addr' which
 contain the addresses of nameservers of the configuration.  This is the
 internal copy used by the configuration and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -476,7 +472,7 @@ nm_ip6_config_get_searches (<em class="parameter"><code><a class="link" href="NM
 This is the internal copy used by the configuration, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 <div class="refsect1">
@@ -485,48 +481,36 @@ This is the internal copy used by the configuration, and must not be modified. <
 <a name="NM-IP6-CONFIG-GATEWAY:CAPS"></a><h3>NM_IP6_CONFIG_GATEWAY</h3>
 <pre class="programlisting">#define NM_IP6_CONFIG_GATEWAY "gateway"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP6-CONFIG-ADDRESSES:CAPS"></a><h3>NM_IP6_CONFIG_ADDRESSES</h3>
 <pre class="programlisting">#define NM_IP6_CONFIG_ADDRESSES "addresses"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP6-CONFIG-ROUTES:CAPS"></a><h3>NM_IP6_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_IP6_CONFIG_ROUTES "routes"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP6-CONFIG-NAMESERVERS:CAPS"></a><h3>NM_IP6_CONFIG_NAMESERVERS</h3>
 <pre class="programlisting">#define NM_IP6_CONFIG_NAMESERVERS "nameservers"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP6-CONFIG-DOMAINS:CAPS"></a><h3>NM_IP6_CONFIG_DOMAINS</h3>
 <pre class="programlisting">#define NM_IP6_CONFIG_DOMAINS "domains"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP6-CONFIG-SEARCHES:CAPS"></a><h3>NM_IP6_CONFIG_SEARCHES</h3>
 <pre class="programlisting">#define NM_IP6_CONFIG_SEARCHES "searches"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -534,51 +518,55 @@ This is the internal copy used by the configuration, and must not be modified. <
 <div class="refsect2">
 <a name="NMIP6Config--addresses"></a><h3>The <code class="literal">“addresses”</code> property</h3>
 <pre class="programlisting">  “addresses”                <span class="type">NMIP6AddressObjectArray</span> *</pre>
-<p></p>
+<p>The <span class="type">GPtrArray</span> containing the IPv6 addresses;  use
+<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-nm-utils.html#nm-utils-ip6-addresses-from-gvalue"><code class="function">nm_utils_ip6_addresses_from_gvalue()</code></a> to return a <span class="type">GSList</span> of
+<span class="type">NMSettingIP6Address</span> objects that is more usable than the raw data.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIP6Config--domains"></a><h3>The <code class="literal">“domains”</code> property</h3>
 <pre class="programlisting">  “domains”                  <span class="type">NMStringArray</span> *</pre>
-<p></p>
+<p>The <span class="type">GPtrArray</span> containing domain strings of the configuration.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIP6Config--gateway"></a><h3>The <code class="literal">“gateway”</code> property</h3>
 <pre class="programlisting">  “gateway”                  <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The IPv6 gateway as string</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIP6Config--nameservers"></a><h3>The <code class="literal">“nameservers”</code> property</h3>
 <pre class="programlisting">  “nameservers”              <span class="type">NMIP6AddressArray</span> *</pre>
-<p></p>
+<p>The <span class="type">GPtrArray</span> containing elements of type 'struct ip6_addr' which
+contain the addresses of nameservers of the configuration.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIP6Config--routes"></a><h3>The <code class="literal">“routes”</code> property</h3>
 <pre class="programlisting">  “routes”                   <span class="type">NMIP6RouteObjectArray</span> *</pre>
-<p></p>
+<p>The <span class="type">GPtrArray</span> containing the IPv6 routes;  use
+<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-nm-utils.html#nm-utils-ip6-routes-from-gvalue"><code class="function">nm_utils_ip6_routes_from_gvalue()</code></a> to return a <span class="type">GSList</span> of
+<span class="type">NMSettingIP6Address</span> objects that is more usable than the raw data.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIP6Config--searches"></a><h3>The <code class="literal">“searches”</code> property</h3>
 <pre class="programlisting">  “searches”                 <span class="type">NMStringArray</span> *</pre>
-<p></p>
+<p>The <span class="type">GPtrArray</span> containing dns search strings of the configuration.</p>
 <p>Flags: Read</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index 9cc58a6f..296e0b0c 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMObject</title>
+<title>NMObject: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDHCP6Config.html" title="NMDHCP6Config">
 <link rel="next" href="NMRemoteConnection.html" title="NMRemoteConnection">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -151,8 +151,6 @@
 </div>
 <div class="refsect1">
 <a name="NMObject.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMObject.functions_details"></a><h2>Functions</h2>
@@ -164,7 +162,6 @@ nm_object_error_quark (<em class="parameter"><code><span class="type">void</span
 <div class="refsect3">
 <a name="id-1.3.24.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMObject.html" title="NMObject"><span class="type">NMObject</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -219,7 +216,6 @@ nm_object_get_path (<em class="parameter"><code><a class="link" href="NMObject.h
 <a name="id-1.3.24.9.4.6"></a><h4>Returns</h4>
 <p> the object's path. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -260,24 +256,18 @@ device, and must not be modified.</p>
 <a name="NM-OBJECT-ERROR:CAPS"></a><h3>NM_OBJECT_ERROR</h3>
 <pre class="programlisting">#define NM_OBJECT_ERROR nm_object_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-OBJECT-DBUS-CONNECTION:CAPS"></a><h3>NM_OBJECT_DBUS_CONNECTION</h3>
 <pre class="programlisting">#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-OBJECT-DBUS-PATH:CAPS"></a><h3>NM_OBJECT_DBUS_PATH</h3>
 <pre class="programlisting">#define NM_OBJECT_DBUS_PATH "dbus-path"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -285,14 +275,12 @@ device, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMObject--dbus-connection"></a><h3>The <code class="literal">“dbus-connection”</code> property</h3>
 <pre class="programlisting">  “dbus-connection”          <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *</pre>
-<p></p>
 <p>Flags: Read / Write / Construct Only</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMObject--dbus-path"></a><h3>The <code class="literal">“dbus-path”</code> property</h3>
 <pre class="programlisting">  “dbus-path”                <span class="type">gchar</span> *</pre>
-<p></p>
 <p>Flags: Read / Write / Construct Only</p>
 <p>Default value: NULL</p>
 </div>
@@ -306,12 +294,48 @@ user_function (<a class="link" href="NMObject.html" title="NMObject"><span class
                <span class="type">gpointer</span>  error,
                <span class="type">gpointer</span>  failed_path,
                <span class="type">gpointer</span>  user_data)</pre>
+<p>Indicates that an error occured while creating an <a class="link" href="NMObject.html" title="NMObject"><span class="type">NMObject</span></a> object
+during property handling of <em class="parameter"><code>master_object</code></em>
+.</p>
+<p>Note: Be aware that the signal is private for libnm-glib's internal
+      use.</p>
+<div class="refsect3">
+<a name="id-1.3.24.12.2.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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>master_object</p></td>
+<td class="parameter_description"><p>the object that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>the error that occured while creating object</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>failed_path</p></td>
+<td class="parameter_description"><p>object path of the failed object</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index 64cd7154..c099c3df 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMRemoteConnection</title>
+<title>NMRemoteConnection: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMObject.html" title="NMObject">
 <link rel="next" href="NMRemoteSettings.html" title="NMRemoteSettings">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -235,8 +235,6 @@
 </div>
 <div class="refsect1">
 <a name="NMRemoteConnection.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMRemoteConnection.functions_details"></a><h2>Functions</h2>
@@ -244,8 +242,6 @@
 <a name="NM-REMOTE-CONNECTION-ERROR:CAPS"></a><h3>NM_REMOTE_CONNECTION_ERROR</h3>
 <pre class="programlisting">#define NM_REMOTE_CONNECTION_ERROR (nm_remote_connection_error_quark ())
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -256,7 +252,6 @@ nm_remote_connection_error_quark (<em class="parameter"><code><span class="type"
 <div class="refsect3">
 <a name="id-1.3.25.9.3.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -373,7 +368,6 @@ nm_remote_connection_new (<em class="parameter"><code><a href="/usr/share/gtk-do
 <div class="refsect3">
 <a name="id-1.3.25.9.6.6"></a><h4>Returns</h4>
 <p> the new remote connection object on success, or <code class="literal">NULL</code> on failure</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -456,7 +450,7 @@ commit completes. </p></td>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -496,7 +490,7 @@ save completes. </p></td>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -604,9 +598,8 @@ nm_remote_connection_get_unsaved (<em class="parameter"><code><a class="link" hr
 <p> <code class="literal">TRUE</code> if the remote connection contains changes that have not
 been saved to disk, <code class="literal">FALSE</code> if the connection is the same as its on-disk
 representation.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 <div class="refsect1">
@@ -645,40 +638,30 @@ representation.</p>
 <a name="NM-REMOTE-CONNECTION-UNSAVED:CAPS"></a><h3>NM_REMOTE_CONNECTION_UNSAVED</h3>
 <pre class="programlisting">#define NM_REMOTE_CONNECTION_UNSAVED         "unsaved"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-REMOTE-CONNECTION-UPDATED:CAPS"></a><h3>NM_REMOTE_CONNECTION_UPDATED</h3>
 <pre class="programlisting">#define NM_REMOTE_CONNECTION_UPDATED         "updated"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-REMOTE-CONNECTION-REMOVED:CAPS"></a><h3>NM_REMOTE_CONNECTION_REMOVED</h3>
 <pre class="programlisting">#define NM_REMOTE_CONNECTION_REMOVED         "removed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMRemoteConnectionCommitFunc"></a><h3>NMRemoteConnectionCommitFunc</h3>
 <pre class="programlisting">typedef NMRemoteConnectionResultFunc NMRemoteConnectionCommitFunc;
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMRemoteConnectionDeleteFunc"></a><h3>NMRemoteConnectionDeleteFunc</h3>
 <pre class="programlisting">typedef NMRemoteConnectionResultFunc NMRemoteConnectionDeleteFunc;
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -686,21 +669,19 @@ representation.</p>
 <div class="refsect2">
 <a name="NMRemoteConnection--bus"></a><h3>The <code class="literal">“bus”</code> property</h3>
 <pre class="programlisting">  “bus”                      <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *</pre>
-<p></p>
+<p>The <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> that the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> is connected to.</p>
 <p>Flags: Write / Construct Only</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMRemoteConnection--dbus-connection"></a><h3>The <code class="literal">“dbus-connection”</code> property</h3>
 <pre class="programlisting">  “dbus-connection”          <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *</pre>
-<p></p>
 <p>Flags: Write / Construct Only</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMRemoteConnection--dbus-path"></a><h3>The <code class="literal">“dbus-path”</code> property</h3>
 <pre class="programlisting">  “dbus-path”                <span class="type">gchar</span> *</pre>
-<p></p>
 <p>Flags: Write / Construct Only</p>
 <p>Default value: NULL</p>
 </div>
@@ -708,10 +689,11 @@ representation.</p>
 <div class="refsect2">
 <a name="NMRemoteConnection--unsaved"></a><h3>The <code class="literal">“unsaved”</code> property</h3>
 <pre class="programlisting">  “unsaved”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p><code class="literal">TRUE</code> if the remote connection contains changes that have not been saved
+to disk, <code class="literal">FALSE</code> if the connection is the same as its on-disk representation.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 <div class="refsect1">
@@ -721,6 +703,30 @@ representation.</p>
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection,
                <span class="type">gpointer</span>            user_data)</pre>
+<p>This signal is emitted when a connection is either deleted or becomes
+invisible to the current user.</p>
+<div class="refsect3">
+<a name="id-1.3.25.12.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 <hr>
@@ -729,6 +735,30 @@ user_function (<a class="link" href="NMRemoteConnection.html" title="NMRemoteCon
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection,
                <span class="type">gpointer</span>            user_data)</pre>
+<p>This signal is emitted when a connection changes, and it is
+still visible to the user.</p>
+<div class="refsect3">
+<a name="id-1.3.25.12.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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>a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 <hr>
@@ -743,7 +773,6 @@ user_function (<a class="link" href="NMRemoteConnection.html" title="NMRemoteCon
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index 7f333eb5..10d37ade 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMRemoteSettings</title>
+<title>NMRemoteSettings: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMRemoteConnection.html" title="NMRemoteConnection">
 <link rel="next" href="libnm-glib-nm-types.html" title="nm-types">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -435,7 +435,6 @@ nm_remote_settings_error_quark (<em class="parameter"><code><span class="type">v
 <div class="refsect3">
 <a name="id-1.3.26.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -446,8 +445,6 @@ nm_remote_settings_error_quark (<em class="parameter"><code><span class="type">v
                                       <em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>,
                                       <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                                       <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -458,8 +455,6 @@ nm_remote_settings_error_quark (<em class="parameter"><code><span class="type">v
                                 <em class="parameter"><code><span class="type">char</span> **failures</code></em>,
                                 <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                                 <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -468,8 +463,6 @@ nm_remote_settings_error_quark (<em class="parameter"><code><span class="type">v
 <span class="c_punctuation">(</span>*NMRemoteSettingsSaveHostnameFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
                                      <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                                      <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -498,7 +491,6 @@ want to avoid that.</p>
 <div class="refsect3">
 <a name="id-1.3.26.9.6.7"></a><h4>Returns</h4>
 <p> the new remote settings object on success, or <code class="literal">NULL</code> on failure</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -580,7 +572,6 @@ nm_remote_settings_new_finish (<em class="parameter"><code><span class="type">GA
 <div class="refsect3">
 <a name="id-1.3.26.9.8.6"></a><h4>Returns</h4>
 <p> a new <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> object, or <code class="literal">NULL</code> on error</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -651,7 +642,7 @@ nm_remote_settings_get_connection_by_id
 matching object was found. </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -786,7 +777,6 @@ added, not the object itself</p></td>
 <div class="refsect3">
 <a name="id-1.3.26.9.13.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the request was successful, <code class="literal">FALSE</code> if it failed</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -839,9 +829,8 @@ added, not the object itself</p></td>
 <div class="refsect3">
 <a name="id-1.3.26.9.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the request was successful, <code class="literal">FALSE</code> if it failed</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -901,9 +890,8 @@ filenames that failed to load. </p></td>
 <p> <code class="literal">TRUE</code> if NetworkManager at least tried to load <em class="parameter"><code>filenames</code></em>
 ,
 <code class="literal">FALSE</code> if an error occurred (eg, permission denied).</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -939,9 +927,8 @@ the in-memory state matches the on-disk state.</p>
 <div class="refsect3">
 <a name="id-1.3.26.9.16.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on failure</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -991,7 +978,6 @@ hostname operation completes. </p></td>
 <div class="refsect3">
 <a name="id-1.3.26.9.17.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the request was successful, <code class="literal">FALSE</code> if it failed</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -1049,56 +1035,42 @@ hostname operation completes. </p></td>
 <a name="NM-REMOTE-SETTINGS-ERROR:CAPS"></a><h3>NM_REMOTE_SETTINGS_ERROR</h3>
 <pre class="programlisting">#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-REMOTE-SETTINGS-BUS:CAPS"></a><h3>NM_REMOTE_SETTINGS_BUS</h3>
 <pre class="programlisting">#define NM_REMOTE_SETTINGS_BUS             "bus"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-REMOTE-SETTINGS-SERVICE-RUNNING:CAPS"></a><h3>NM_REMOTE_SETTINGS_SERVICE_RUNNING</h3>
 <pre class="programlisting">#define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-REMOTE-SETTINGS-HOSTNAME:CAPS"></a><h3>NM_REMOTE_SETTINGS_HOSTNAME</h3>
 <pre class="programlisting">#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-REMOTE-SETTINGS-CAN-MODIFY:CAPS"></a><h3>NM_REMOTE_SETTINGS_CAN_MODIFY</h3>
 <pre class="programlisting">#define NM_REMOTE_SETTINGS_CAN_MODIFY      "can-modify"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-REMOTE-SETTINGS-NEW-CONNECTION:CAPS"></a><h3>NM_REMOTE_SETTINGS_NEW_CONNECTION</h3>
 <pre class="programlisting">#define NM_REMOTE_SETTINGS_NEW_CONNECTION    "new-connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-REMOTE-SETTINGS-CONNECTIONS-READ:CAPS"></a><h3>NM_REMOTE_SETTINGS_CONNECTIONS_READ</h3>
 <pre class="programlisting">#define NM_REMOTE_SETTINGS_CONNECTIONS_READ  "connections-read"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1106,14 +1078,15 @@ hostname operation completes. </p></td>
 <div class="refsect2">
 <a name="NMRemoteSettings--bus"></a><h3>The <code class="literal">“bus”</code> property</h3>
 <pre class="programlisting">  “bus”                      <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *</pre>
-<p></p>
+<p>The <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> that the <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> is connected to. Defaults
+to the system bus if not specified.</p>
 <p>Flags: Read / Write / Construct Only</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMRemoteSettings--can-modify"></a><h3>The <code class="literal">“can-modify”</code> property</h3>
 <pre class="programlisting">  “can-modify”               <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, adding and modifying connections is supported.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1121,7 +1094,8 @@ hostname operation completes. </p></td>
 <div class="refsect2">
 <a name="NMRemoteSettings--hostname"></a><h3>The <code class="literal">“hostname”</code> property</h3>
 <pre class="programlisting">  “hostname”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The machine hostname stored in persistent configuration. This can be
+modified by calling <a class="link" href="NMRemoteSettings.html#nm-remote-settings-save-hostname" title="nm_remote_settings_save_hostname ()"><code class="function">nm_remote_settings_save_hostname()</code></a>.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -1129,7 +1103,7 @@ hostname operation completes. </p></td>
 <div class="refsect2">
 <a name="NMRemoteSettings--service-running"></a><h3>The <code class="literal">“service-running”</code> property</h3>
 <pre class="programlisting">  “service-running”          <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the settings service is running.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1159,7 +1133,6 @@ user_function (<a class="link" href="NMRemoteSettings.html" title="NMRemoteSetti
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index 367c6450..8acd02c1 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMSecretAgent</title>
+<title>NMSecretAgent: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="libnm-glib-nm-types.html" title="nm-types">
 <link rel="next" href="NMVPNConnection.html" title="NMVPNConnection">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -228,8 +228,6 @@
 </div>
 <div class="refsect1">
 <a name="NMSecretAgent.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMSecretAgent.functions_details"></a><h2>Functions</h2>
@@ -237,20 +235,12 @@
 <a name="NM-SECRET-AGENT-ERROR:CAPS"></a><h3>NM_SECRET_AGENT_ERROR</h3>
 <pre class="programlisting">#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-secret-agent-error-quark"></a><h3>nm_secret_agent_error_quark ()</h3>
 <pre class="programlisting"><span class="returnvalue">GQuark</span>
 nm_secret_agent_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.28.9.3.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -299,7 +289,7 @@ something like this:</p>
 <span class="normal">              <a href="https://developer.gnome.org/libnm-util/0.9/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS">NM_SETTING_WIRELESS_SECURITY_PSK</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"my really cool PSK"</span><span class="symbol">,</span>
 <span class="normal">              NULL</span><span class="symbol">);</span>
 <span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_wsec</span><span class="symbol">));</span>
-<span class="normal">secrets_hash </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html#nm-connection-to-hash">nm_connection_to_hash</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> NM_SETTING_HASH_FLAG_ALL</span><span class="symbol">);</span>
+<span class="normal">secrets_hash </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html#nm-connection-to-hash">nm_connection_to_hash</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> <a href="https://developer.gnome.org/libnm-util/0.9/NMSetting.html#NM-SETTING-HASH-FLAG-ALL:CAPS">NM_SETTING_HASH_FLAG_ALL</a></span><span class="symbol">);</span>
 
 <span class="symbol">(</span><span class="normal">call the NMSecretAgentGetSecretsFunc </span><span class="usertype">with</span><span class="normal"> secrets_hash</span><span class="symbol">)</span>
 
@@ -482,7 +472,6 @@ asynchronous operation and its success or failure is indicated via the
 <p> a new <code class="literal">TRUE</code> if registration was successfully requested (this does
 not mean registration itself was successful), <code class="literal">FALSE</code> if registration was not
 successfully requested.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -511,7 +500,6 @@ store secrets on behalf of this user.</p>
 <div class="refsect3">
 <a name="id-1.3.28.9.8.6"></a><h4>Returns</h4>
 <p> a new <code class="literal">TRUE</code> if unregistration was successful, <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -537,7 +525,6 @@ nm_secret_agent_get_registered (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.3.28.9.9.5"></a><h4>Returns</h4>
 <p> a <code class="literal">TRUE</code> if the agent is registered, <code class="literal">FALSE</code> if it is not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -807,7 +794,7 @@ authentication dialogs.</p>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -869,40 +856,30 @@ results or carrier changes.</p>
 <a name="NM-SECRET-AGENT-IDENTIFIER:CAPS"></a><h3>NM_SECRET_AGENT_IDENTIFIER</h3>
 <pre class="programlisting">#define NM_SECRET_AGENT_IDENTIFIER          "identifier"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SECRET-AGENT-AUTO-REGISTER:CAPS"></a><h3>NM_SECRET_AGENT_AUTO_REGISTER</h3>
 <pre class="programlisting">#define NM_SECRET_AGENT_AUTO_REGISTER       "auto-register"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SECRET-AGENT-REGISTERED:CAPS"></a><h3>NM_SECRET_AGENT_REGISTERED</h3>
 <pre class="programlisting">#define NM_SECRET_AGENT_REGISTERED          "registered"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SECRET-AGENT-CAPABILITIES:CAPS"></a><h3>NM_SECRET_AGENT_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_SECRET_AGENT_CAPABILITIES        "capabilities"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SECRET-AGENT-REGISTRATION-RESULT:CAPS"></a><h3>NM_SECRET_AGENT_REGISTRATION_RESULT</h3>
 <pre class="programlisting">#define NM_SECRET_AGENT_REGISTRATION_RESULT "registration-result"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -910,7 +887,13 @@ results or carrier changes.</p>
 <div class="refsect2">
 <a name="NMSecretAgent--auto-register"></a><h3>The <code class="literal">“auto-register”</code> property</h3>
 <pre class="programlisting">  “auto-register”            <span class="type">gboolean</span></pre>
-<p></p>
+<p>If TRUE, the agent will attempt to automatically register itself after
+it is created (via an idle handler) and to re-register itself if
+NetworkManager restarts.  If FALSE, the agent does not automatically
+register with NetworkManager, and <a class="link" href="NMSecretAgent.html#nm-secret-agent-register" title="nm_secret_agent_register ()"><code class="function">nm_secret_agent_register()</code></a> must be
+called.  If 'auto-register' is TRUE, calling <a class="link" href="NMSecretAgent.html#nm-secret-agent-unregister" title="nm_secret_agent_unregister ()"><code class="function">nm_secret_agent_unregister()</code></a>
+will suppress auto-registration until <a class="link" href="NMSecretAgent.html#nm-secret-agent-register" title="nm_secret_agent_register ()"><code class="function">nm_secret_agent_register()</code></a> is
+called, which re-enables auto-registration.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
@@ -918,14 +901,20 @@ results or carrier changes.</p>
 <div class="refsect2">
 <a name="NMSecretAgent--capabilities"></a><h3>The <code class="literal">“capabilities”</code> property</h3>
 <pre class="programlisting">  “capabilities”             <a class="link" href="NMSecretAgent.html#NMSecretAgentCapabilities" title="enum NMSecretAgentCapabilities"><span class="type">NMSecretAgentCapabilities</span></a></pre>
-<p></p>
+<p>A bitfield of <a class="link" href="NMSecretAgent.html#NMSecretAgentCapabilities" title="enum NMSecretAgentCapabilities"><code class="literal">NMSecretAgentCapabilities</code></a>.</p>
 <p>Flags: Read / Write / Construct</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSecretAgent--identifier"></a><h3>The <code class="literal">“identifier”</code> property</h3>
 <pre class="programlisting">  “identifier”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Identifies this agent; only one agent in each user session may use the
+same identifier.  Identifier formatting follows the same rules as
+D-Bus bus names with the exception that the ':' character is not
+allowed.  The valid set of characters is "A-Z[0-9]_-." and the
+identifier is limited in length to 255 characters with a minimum
+of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
+(without quotes).</p>
 <p>Flags: Read / Write / Construct Only</p>
 <p>Default value: NULL</p>
 </div>
@@ -933,7 +922,7 @@ results or carrier changes.</p>
 <div class="refsect2">
 <a name="NMSecretAgent--registered"></a><h3>The <code class="literal">“registered”</code> property</h3>
 <pre class="programlisting">  “registered”               <span class="type">gboolean</span></pre>
-<p></p>
+<p><code class="literal">TRUE</code> if the agent is registered with NetworkManager, <code class="literal">FALSE</code> if not.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -946,12 +935,41 @@ results or carrier changes.</p>
 user_function (<a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent,
                <span class="type">gpointer</span>       error,
                <span class="type">gpointer</span>       user_data)</pre>
+<p>Indicates the result of a registration request; if <em class="parameter"><code>error</code></em>
+ is NULL the
+request was successful.</p>
+<div class="refsect3">
+<a name="id-1.3.28.12.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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>agent</p></td>
+<td class="parameter_description"><p>the agent that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>the error, if any, that occured while registering</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index c74274ea..7562a519 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMVPNConnection</title>
+<title>NMVPNConnection: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMSecretAgent.html" title="NMSecretAgent">
 <link rel="next" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -135,8 +135,6 @@
 </div>
 <div class="refsect1">
 <a name="NMVPNConnection.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMVPNConnection.functions_details"></a><h2>Functions</h2>
@@ -198,7 +196,6 @@ nm_vpn_connection_get_vpn_state (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.3.29.9.3.6"></a><h4>Returns</h4>
 <p> the VPN state of the active VPN connection.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -226,7 +223,6 @@ nm_vpn_connection_get_banner (<em class="parameter"><code><a class="link" href="
 <a name="id-1.3.29.9.4.6"></a><h4>Returns</h4>
 <p> the VPN login banner of the VPN connection. This is the internal
 string used by the connection, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -236,16 +232,12 @@ string used by the connection, and must not be modified.</p>
 <a name="NM-VPN-CONNECTION-VPN-STATE:CAPS"></a><h3>NM_VPN_CONNECTION_VPN_STATE</h3>
 <pre class="programlisting">#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-CONNECTION-BANNER:CAPS"></a><h3>NM_VPN_CONNECTION_BANNER</h3>
 <pre class="programlisting">#define NM_VPN_CONNECTION_BANNER "banner"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -253,7 +245,7 @@ string used by the connection, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMVPNConnection--banner"></a><h3>The <code class="literal">“banner”</code> property</h3>
 <pre class="programlisting">  “banner”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The VPN login banner of the active VPN connection.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -261,7 +253,7 @@ string used by the connection, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMVPNConnection--vpn-state"></a><h3>The <code class="literal">“vpn-state”</code> property</h3>
 <pre class="programlisting">  “vpn-state”                <span class="type">guint</span></pre>
-<p></p>
+<p>The VPN state of the active VPN connection.</p>
 <p>Flags: Read</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -281,7 +273,6 @@ user_function (<a class="link" href="NMVPNConnection.html" title="NMVPNConnectio
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index a83434a5..91cdbfee 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMWimaxNsp</title>
+<title>NMWimaxNsp: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">
 <link rel="next" href="NMAccessPoint.html" title="NMAccessPoint">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -155,8 +155,6 @@
 </div>
 <div class="refsect1">
 <a name="NMWimaxNsp.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMWimaxNsp.functions_details"></a><h2>Functions</h2>
@@ -218,7 +216,6 @@ nm_wimax_nsp_get_name (<em class="parameter"><code><a class="link" href="NMWimax
 <div class="refsect3">
 <a name="id-1.3.18.8.3.6"></a><h4>Returns</h4>
 <p> the name</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -245,7 +242,6 @@ nm_wimax_nsp_get_signal_quality (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.3.18.8.4.6"></a><h4>Returns</h4>
 <p> the signal quality</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -272,7 +268,6 @@ nm_wimax_nsp_get_network_type (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.3.18.8.5.6"></a><h4>Returns</h4>
 <p> the network type</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -357,7 +352,6 @@ against</p></td>
 <a name="id-1.3.18.8.7.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection may be activated with this WiMAX NSP,
 <code class="literal">FALSE</code> if it cannot be.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -367,24 +361,18 @@ against</p></td>
 <a name="NM-WIMAX-NSP-NAME:CAPS"></a><h3>NM_WIMAX_NSP_NAME</h3>
 <pre class="programlisting">#define NM_WIMAX_NSP_NAME           "name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS"></a><h3>NM_WIMAX_NSP_SIGNAL_QUALITY</h3>
 <pre class="programlisting">#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-WIMAX-NSP-NETWORK-TYPE:CAPS"></a><h3>NM_WIMAX_NSP_NETWORK_TYPE</h3>
 <pre class="programlisting">#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -437,7 +425,7 @@ against</p></td>
 <div class="refsect2">
 <a name="NMWimaxNsp--name"></a><h3>The <code class="literal">“name”</code> property</h3>
 <pre class="programlisting">  “name”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The name of the WiMAX NSP.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -445,7 +433,7 @@ against</p></td>
 <div class="refsect2">
 <a name="NMWimaxNsp--network-type"></a><h3>The <code class="literal">“network-type”</code> property</h3>
 <pre class="programlisting">  “network-type”             <span class="type">guint</span></pre>
-<p></p>
+<p>The network type of the WiMAX NSP.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -453,7 +441,7 @@ against</p></td>
 <div class="refsect2">
 <a name="NMWimaxNsp--signal-quality"></a><h3>The <code class="literal">“signal-quality”</code> property</h3>
 <pre class="programlisting">  “signal-quality”           <span class="type">guint</span></pre>
-<p></p>
+<p>The signal quality of the WiMAX NSP.</p>
 <p>Flags: Read</p>
 <p>Allowed values: &lt;= 100</p>
 <p>Default value: 0</p>
@@ -461,7 +449,6 @@ against</p></td>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/annotation-glossary.html b/docs/libnm-glib/html/annotation-glossary.html
index 03f6d263..52e56c4d 100644
--- a/docs/libnm-glib/html/annotation-glossary.html
+++ b/docs/libnm-glib/html/annotation-glossary.html
@@ -2,12 +2,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: Annotation Glossary</title>
+<title>Annotation Glossary: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="index.html" title="libnm-glib Reference Manual">
 <link rel="prev" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -48,6 +48,8 @@
 <a name="glsS"></a><h3 class="title">S</h3>
 <dt><span class="glossterm"><a name="annotation-glossterm-scope%20async"></a>scope async</span></dt>
 <dd class="glossdef"><p>The callback is valid until first called.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-skip"></a>skip</span></dt>
+<dd class="glossdef"><p>Exposed in C code, not necessarily available in other languages.</p></dd>
 <a name="glsT"></a><h3 class="title">T</h3>
 <dt><span class="glossterm"><a name="annotation-glossterm-transfer%20container"></a>transfer container</span></dt>
 <dd class="glossdef"><p>Free data container after the code is done.</p></dd>
@@ -55,9 +57,10 @@
 <dd class="glossdef"><p>Free data after the code is done.</p></dd>
 <dt><span class="glossterm"><a name="annotation-glossterm-transfer%20none"></a>transfer none</span></dt>
 <dd class="glossdef"><p>Don't free data after the code is done.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-type"></a>type</span></dt>
+<dd class="glossdef"><p>Override the parsed C type with given type.</p></dd>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html
index 59052d84..1f09388c 100644
--- a/docs/libnm-glib/html/api-index-full.html
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: API Index</title>
+<title>API Index: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="index.html" title="libnm-glib Reference Manual">
 <link rel="prev" href="object-tree.html" title="Object Hierarchy">
 <link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -2573,7 +2573,6 @@
 <dd></dd>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html
index 80d259a7..18b6b1ab 100644
--- a/docs/libnm-glib/html/ch02.html
+++ b/docs/libnm-glib/html/ch02.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: libnm-glib API Reference</title>
+<title>libnm-glib API Reference: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="index.html" title="libnm-glib Reference Manual">
 <link rel="prev" href="ref-overview.html" title="Object Overview">
 <link rel="next" href="NMClient.html" title="NMClient">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -119,7 +119,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index fb5c1c38..bec4797c 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="next" href="ref-overview.html" title="Object Overview">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -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-glib Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-glib 1.0.2
+      for libnm-glib 1.0.4
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm-glib/0.9/" target="_top">https://developer.gnome.org/libnm-glib/0.9/</a>.
@@ -150,7 +150,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index 7e412917..5b020fd0 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -63,8 +63,27 @@
 <ANCHOR id="NM-CLIENT-ACTIVATING-CONNECTION:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-ACTIVATING-CONNECTION:CAPS">
 <ANCHOR id="NM-CLIENT-DEVICES:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-DEVICES:CAPS">
 <ANCHOR id="NMClientPermission" href="libnm-glib/NMClient.html#NMClientPermission">
+<ANCHOR id="NM-CLIENT-PERMISSION-NONE:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-NONE:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-ENABLE-DISABLE-NETWORK:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-NETWORK:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIFI:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIFI:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-ENABLE-DISABLE-WWAN:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WWAN:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIMAX:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIMAX:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-SLEEP-WAKE:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-SLEEP-WAKE:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-NETWORK-CONTROL:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-NETWORK-CONTROL:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-WIFI-SHARE-PROTECTED:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-WIFI-SHARE-PROTECTED:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-WIFI-SHARE-OPEN:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-WIFI-SHARE-OPEN:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-SETTINGS-MODIFY-SYSTEM:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-SYSTEM:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-SETTINGS-MODIFY-OWN:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-OWN:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-SETTINGS-MODIFY-HOSTNAME:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-HOSTNAME:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-LAST:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-LAST:CAPS">
 <ANCHOR id="NMClientPermissionResult" href="libnm-glib/NMClient.html#NMClientPermissionResult">
+<ANCHOR id="NM-CLIENT-PERMISSION-RESULT-UNKNOWN:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-RESULT-UNKNOWN:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-RESULT-YES:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-RESULT-YES:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-RESULT-AUTH:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-RESULT-AUTH:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-RESULT-NO:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-RESULT-NO:CAPS">
 <ANCHOR id="NMClientError" href="libnm-glib/NMClient.html#NMClientError">
+<ANCHOR id="NM-CLIENT-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-CLIENT-ERROR-MANAGER-NOT-RUNNING:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-ERROR-MANAGER-NOT-RUNNING:CAPS">
 <ANCHOR id="NM-CLIENT-ERROR:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-ERROR:CAPS">
 <ANCHOR id="NMClient.property-details" href="libnm-glib/NMClient.html#NMClient.property-details">
 <ANCHOR id="NMClient--activating-connection" href="libnm-glib/NMClient.html#NMClient--activating-connection">
@@ -191,6 +210,8 @@
 <ANCHOR id="NMDeviceDeactivateFn" href="libnm-glib/NMDevice.html#NMDeviceDeactivateFn">
 <ANCHOR id="NMDevice.other_details" href="libnm-glib/NMDevice.html#NMDevice.other_details">
 <ANCHOR id="NMDeviceError" href="libnm-glib/NMDevice.html#NMDeviceError">
+<ANCHOR id="NM-DEVICE-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDevice.html#NM-DEVICE-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-ERROR-INTERFACE-MISMATCH:CAPS" href="libnm-glib/NMDevice.html#NM-DEVICE-ERROR-INTERFACE-MISMATCH:CAPS">
 <ANCHOR id="NM-DEVICE-ERROR:CAPS" href="libnm-glib/NMDevice.html#NM-DEVICE-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-DEVICE-TYPE:CAPS" href="libnm-glib/NMDevice.html#NM-DEVICE-DEVICE-TYPE:CAPS">
 <ANCHOR id="NM-DEVICE-UDI:CAPS" href="libnm-glib/NMDevice.html#NM-DEVICE-UDI:CAPS">
@@ -256,6 +277,11 @@
 <ANCHOR id="nm-device-ethernet-get-carrier" href="libnm-glib/NMDeviceEthernet.html#nm-device-ethernet-get-carrier">
 <ANCHOR id="NMDeviceEthernet.other_details" href="libnm-glib/NMDeviceEthernet.html#NMDeviceEthernet.other_details">
 <ANCHOR id="NMDeviceEthernetError" href="libnm-glib/NMDeviceEthernet.html#NMDeviceEthernetError">
+<ANCHOR id="NM-DEVICE-ETHERNET-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-ETHERNET-ERROR-NOT-ETHERNET-CONNECTION:CAPS" href="libnm-glib/NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR-NOT-ETHERNET-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-ETHERNET-ERROR-INVALID-ETHERNET-CONNECTION:CAPS" href="libnm-glib/NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR-INVALID-ETHERNET-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-ETHERNET-ERROR-INVALID-DEVICE-MAC:CAPS" href="libnm-glib/NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR-INVALID-DEVICE-MAC:CAPS">
+<ANCHOR id="NM-DEVICE-ETHERNET-ERROR-MAC-MISMATCH:CAPS" href="libnm-glib/NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR-MAC-MISMATCH:CAPS">
 <ANCHOR id="NM-DEVICE-ETHERNET-ERROR:CAPS" href="libnm-glib/NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-ETHERNET-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceEthernet.html#NM-DEVICE-ETHERNET-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-ETHERNET-PERMANENT-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceEthernet.html#NM-DEVICE-ETHERNET-PERMANENT-HW-ADDRESS:CAPS">
@@ -288,6 +314,13 @@
 <ANCHOR id="nm-device-wifi-request-scan-simple" href="libnm-glib/NMDeviceWifi.html#nm-device-wifi-request-scan-simple">
 <ANCHOR id="NMDeviceWifi.other_details" href="libnm-glib/NMDeviceWifi.html#NMDeviceWifi.other_details">
 <ANCHOR id="NMDeviceWifiError" href="libnm-glib/NMDeviceWifi.html#NMDeviceWifiError">
+<ANCHOR id="NM-DEVICE-WIFI-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-WIFI-ERROR-NOT-WIFI-CONNECTION:CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-NOT-WIFI-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-WIFI-ERROR-INVALID-WIFI-CONNECTION:CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-INVALID-WIFI-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-WIFI-ERROR-INVALID-DEVICE-MAC:CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-INVALID-DEVICE-MAC:CAPS">
+<ANCHOR id="NM-DEVICE-WIFI-ERROR-MAC-MISMATCH:CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-MAC-MISMATCH:CAPS">
+<ANCHOR id="NM-DEVICE-WIFI-ERROR-MISSING-DEVICE-WPA-CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-MISSING-DEVICE-WPA-CAPS">
+<ANCHOR id="NM-DEVICE-WIFI-ERROR-MISSING-DEVICE-RSN-CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-MISSING-DEVICE-RSN-CAPS">
 <ANCHOR id="NM-DEVICE-WIFI-ERROR:CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-WIFI-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-WIFI-PERMANENT-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceWifi.html#NM-DEVICE-WIFI-PERMANENT-HW-ADDRESS:CAPS">
@@ -319,6 +352,10 @@
 <ANCHOR id="nm-device-modem-get-current-capabilities" href="libnm-glib/NMDeviceModem.html#nm-device-modem-get-current-capabilities">
 <ANCHOR id="NMDeviceModem.other_details" href="libnm-glib/NMDeviceModem.html#NMDeviceModem.other_details">
 <ANCHOR id="NMDeviceModemError" href="libnm-glib/NMDeviceModem.html#NMDeviceModemError">
+<ANCHOR id="NM-DEVICE-MODEM-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceModem.html#NM-DEVICE-MODEM-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-MODEM-ERROR-NOT-MODEM-CONNECTION:CAPS" href="libnm-glib/NMDeviceModem.html#NM-DEVICE-MODEM-ERROR-NOT-MODEM-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-MODEM-ERROR-INVALID-MODEM-CONNECTION:CAPS" href="libnm-glib/NMDeviceModem.html#NM-DEVICE-MODEM-ERROR-INVALID-MODEM-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-MODEM-ERROR-MISSING-DEVICE-CAPS" href="libnm-glib/NMDeviceModem.html#NM-DEVICE-MODEM-ERROR-MISSING-DEVICE-CAPS">
 <ANCHOR id="NM-DEVICE-MODEM-ERROR:CAPS" href="libnm-glib/NMDeviceModem.html#NM-DEVICE-MODEM-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS" href="libnm-glib/NMDeviceModem.html#NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS">
 <ANCHOR id="NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS" href="libnm-glib/NMDeviceModem.html#NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS">
@@ -339,6 +376,12 @@
 <ANCHOR id="nm-device-bt-get-capabilities" href="libnm-glib/NMDeviceBt.html#nm-device-bt-get-capabilities">
 <ANCHOR id="NMDeviceBt.other_details" href="libnm-glib/NMDeviceBt.html#NMDeviceBt.other_details">
 <ANCHOR id="NMDeviceBtError" href="libnm-glib/NMDeviceBt.html#NMDeviceBtError">
+<ANCHOR id="NM-DEVICE-BT-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceBt.html#NM-DEVICE-BT-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-BT-ERROR-NOT-BT-CONNECTION:CAPS" href="libnm-glib/NMDeviceBt.html#NM-DEVICE-BT-ERROR-NOT-BT-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-BT-ERROR-INVALID-BT-CONNECTION:CAPS" href="libnm-glib/NMDeviceBt.html#NM-DEVICE-BT-ERROR-INVALID-BT-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-BT-ERROR-INVALID-DEVICE-MAC:CAPS" href="libnm-glib/NMDeviceBt.html#NM-DEVICE-BT-ERROR-INVALID-DEVICE-MAC:CAPS">
+<ANCHOR id="NM-DEVICE-BT-ERROR-MAC-MISMATCH:CAPS" href="libnm-glib/NMDeviceBt.html#NM-DEVICE-BT-ERROR-MAC-MISMATCH:CAPS">
+<ANCHOR id="NM-DEVICE-BT-ERROR-MISSING-DEVICE-CAPS" href="libnm-glib/NMDeviceBt.html#NM-DEVICE-BT-ERROR-MISSING-DEVICE-CAPS">
 <ANCHOR id="NM-DEVICE-BT-ERROR:CAPS" href="libnm-glib/NMDeviceBt.html#NM-DEVICE-BT-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-BT-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceBt.html#NM-DEVICE-BT-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-BT-NAME:CAPS" href="libnm-glib/NMDeviceBt.html#NM-DEVICE-BT-NAME:CAPS">
@@ -368,6 +411,11 @@
 <ANCHOR id="nm-device-wimax-get-bsid" href="libnm-glib/NMDeviceWimax.html#nm-device-wimax-get-bsid">
 <ANCHOR id="NMDeviceWimax.other_details" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax.other_details">
 <ANCHOR id="NMDeviceWimaxError" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimaxError">
+<ANCHOR id="NM-DEVICE-WIMAX-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-WIMAX-ERROR-NOT-WIMAX-CONNECTION:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR-NOT-WIMAX-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-WIMAX-ERROR-INVALID-WIMAX-CONNECTION:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR-INVALID-WIMAX-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-WIMAX-ERROR-INVALID-DEVICE-MAC:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR-INVALID-DEVICE-MAC:CAPS">
+<ANCHOR id="NM-DEVICE-WIMAX-ERROR-MAC-MISMATCH:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR-MAC-MISMATCH:CAPS">
 <ANCHOR id="NM-DEVICE-WIMAX-ERROR:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-WIMAX-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-WIMAX-ACTIVE-NSP:CAPS" href="libnm-glib/NMDeviceWimax.html#NM-DEVICE-WIMAX-ACTIVE-NSP:CAPS">
@@ -401,6 +449,9 @@
 <ANCHOR id="nm-device-adsl-get-carrier" href="libnm-glib/NMDeviceAdsl.html#nm-device-adsl-get-carrier">
 <ANCHOR id="NMDeviceAdsl.other_details" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdsl.other_details">
 <ANCHOR id="NMDeviceAdslError" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdslError">
+<ANCHOR id="NM-DEVICE-ADSL-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-ADSL-ERROR-NOT-ADSL-CONNECTION:CAPS" href="libnm-glib/NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR-NOT-ADSL-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-ADSL-ERROR-INVALID-ADSL-CONNECTION:CAPS" href="libnm-glib/NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR-INVALID-ADSL-CONNECTION:CAPS">
 <ANCHOR id="NM-DEVICE-ADSL-ERROR:CAPS" href="libnm-glib/NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-ADSL-CARRIER:CAPS" href="libnm-glib/NMDeviceAdsl.html#NM-DEVICE-ADSL-CARRIER:CAPS">
 <ANCHOR id="NMDeviceAdsl.property-details" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdsl.property-details">
@@ -419,6 +470,10 @@
 <ANCHOR id="nm-device-bond-get-slaves" href="libnm-glib/NMDeviceBond.html#nm-device-bond-get-slaves">
 <ANCHOR id="NMDeviceBond.other_details" href="libnm-glib/NMDeviceBond.html#NMDeviceBond.other_details">
 <ANCHOR id="NMDeviceBondError" href="libnm-glib/NMDeviceBond.html#NMDeviceBondError">
+<ANCHOR id="NM-DEVICE-BOND-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceBond.html#NM-DEVICE-BOND-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-BOND-ERROR-NOT-BOND-CONNECTION:CAPS" href="libnm-glib/NMDeviceBond.html#NM-DEVICE-BOND-ERROR-NOT-BOND-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-BOND-ERROR-INVALID-BOND-CONNECTION:CAPS" href="libnm-glib/NMDeviceBond.html#NM-DEVICE-BOND-ERROR-INVALID-BOND-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-BOND-ERROR-INTERFACE-MISMATCH:CAPS" href="libnm-glib/NMDeviceBond.html#NM-DEVICE-BOND-ERROR-INTERFACE-MISMATCH:CAPS">
 <ANCHOR id="NM-DEVICE-BOND-ERROR:CAPS" href="libnm-glib/NMDeviceBond.html#NM-DEVICE-BOND-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-BOND-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceBond.html#NM-DEVICE-BOND-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-BOND-CARRIER:CAPS" href="libnm-glib/NMDeviceBond.html#NM-DEVICE-BOND-CARRIER:CAPS">
@@ -441,6 +496,10 @@
 <ANCHOR id="nm-device-bridge-get-slaves" href="libnm-glib/NMDeviceBridge.html#nm-device-bridge-get-slaves">
 <ANCHOR id="NMDeviceBridge.other_details" href="libnm-glib/NMDeviceBridge.html#NMDeviceBridge.other_details">
 <ANCHOR id="NMDeviceBridgeError" href="libnm-glib/NMDeviceBridge.html#NMDeviceBridgeError">
+<ANCHOR id="NM-DEVICE-BRIDGE-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceBridge.html#NM-DEVICE-BRIDGE-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-BRIDGE-ERROR-NOT-BRIDGE-CONNECTION:CAPS" href="libnm-glib/NMDeviceBridge.html#NM-DEVICE-BRIDGE-ERROR-NOT-BRIDGE-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-BRIDGE-ERROR-INVALID-BRIDGE-CONNECTION:CAPS" href="libnm-glib/NMDeviceBridge.html#NM-DEVICE-BRIDGE-ERROR-INVALID-BRIDGE-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-BRIDGE-ERROR-INTERFACE-MISMATCH:CAPS" href="libnm-glib/NMDeviceBridge.html#NM-DEVICE-BRIDGE-ERROR-INTERFACE-MISMATCH:CAPS">
 <ANCHOR id="NM-DEVICE-BRIDGE-ERROR:CAPS" href="libnm-glib/NMDeviceBridge.html#NM-DEVICE-BRIDGE-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-BRIDGE-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceBridge.html#NM-DEVICE-BRIDGE-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-BRIDGE-CARRIER:CAPS" href="libnm-glib/NMDeviceBridge.html#NM-DEVICE-BRIDGE-CARRIER:CAPS">
@@ -463,6 +522,10 @@
 <ANCHOR id="nm-device-team-get-slaves" href="libnm-glib/NMDeviceTeam.html#nm-device-team-get-slaves">
 <ANCHOR id="NMDeviceTeam.other_details" href="libnm-glib/NMDeviceTeam.html#NMDeviceTeam.other_details">
 <ANCHOR id="NMDeviceTeamError" href="libnm-glib/NMDeviceTeam.html#NMDeviceTeamError">
+<ANCHOR id="NM-DEVICE-TEAM-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceTeam.html#NM-DEVICE-TEAM-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-TEAM-ERROR-NOT-TEAM-CONNECTION:CAPS" href="libnm-glib/NMDeviceTeam.html#NM-DEVICE-TEAM-ERROR-NOT-TEAM-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-TEAM-ERROR-INVALID-TEAM-CONNECTION:CAPS" href="libnm-glib/NMDeviceTeam.html#NM-DEVICE-TEAM-ERROR-INVALID-TEAM-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-TEAM-ERROR-INTERFACE-MISMATCH:CAPS" href="libnm-glib/NMDeviceTeam.html#NM-DEVICE-TEAM-ERROR-INTERFACE-MISMATCH:CAPS">
 <ANCHOR id="NM-DEVICE-TEAM-ERROR:CAPS" href="libnm-glib/NMDeviceTeam.html#NM-DEVICE-TEAM-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-TEAM-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceTeam.html#NM-DEVICE-TEAM-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-TEAM-CARRIER:CAPS" href="libnm-glib/NMDeviceTeam.html#NM-DEVICE-TEAM-CARRIER:CAPS">
@@ -483,6 +546,9 @@
 <ANCHOR id="nm-device-generic-get-hw-address" href="libnm-glib/NMDeviceGeneric.html#nm-device-generic-get-hw-address">
 <ANCHOR id="NMDeviceGeneric.other_details" href="libnm-glib/NMDeviceGeneric.html#NMDeviceGeneric.other_details">
 <ANCHOR id="NMDeviceGenericError" href="libnm-glib/NMDeviceGeneric.html#NMDeviceGenericError">
+<ANCHOR id="NM-DEVICE-GENERIC-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceGeneric.html#NM-DEVICE-GENERIC-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-GENERIC-ERROR-NOT-GENERIC-CONNECTION:CAPS" href="libnm-glib/NMDeviceGeneric.html#NM-DEVICE-GENERIC-ERROR-NOT-GENERIC-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-GENERIC-ERROR-MISSING-INTERFACE-NAME:CAPS" href="libnm-glib/NMDeviceGeneric.html#NM-DEVICE-GENERIC-ERROR-MISSING-INTERFACE-NAME:CAPS">
 <ANCHOR id="NM-DEVICE-GENERIC-ERROR:CAPS" href="libnm-glib/NMDeviceGeneric.html#NM-DEVICE-GENERIC-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-GENERIC-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceGeneric.html#NM-DEVICE-GENERIC-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-GENERIC-TYPE-DESCRIPTION:CAPS" href="libnm-glib/NMDeviceGeneric.html#NM-DEVICE-GENERIC-TYPE-DESCRIPTION:CAPS">
@@ -502,6 +568,11 @@
 <ANCHOR id="nm-device-infiniband-get-carrier" href="libnm-glib/NMDeviceInfiniband.html#nm-device-infiniband-get-carrier">
 <ANCHOR id="NMDeviceInfiniband.other_details" href="libnm-glib/NMDeviceInfiniband.html#NMDeviceInfiniband.other_details">
 <ANCHOR id="NMDeviceInfinibandError" href="libnm-glib/NMDeviceInfiniband.html#NMDeviceInfinibandError">
+<ANCHOR id="NM-DEVICE-INFINIBAND-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-INFINIBAND-ERROR-NOT-INFINIBAND-CONNECTION:CAPS" href="libnm-glib/NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-ERROR-NOT-INFINIBAND-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-INFINIBAND-ERROR-INVALID-INFINIBAND-CONNECTION:CAPS" href="libnm-glib/NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-ERROR-INVALID-INFINIBAND-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-INFINIBAND-ERROR-INVALID-DEVICE-MAC:CAPS" href="libnm-glib/NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-ERROR-INVALID-DEVICE-MAC:CAPS">
+<ANCHOR id="NM-DEVICE-INFINIBAND-ERROR-MAC-MISMATCH:CAPS" href="libnm-glib/NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-ERROR-MAC-MISMATCH:CAPS">
 <ANCHOR id="NM-DEVICE-INFINIBAND-ERROR:CAPS" href="libnm-glib/NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-INFINIBAND-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-INFINIBAND-CARRIER:CAPS" href="libnm-glib/NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-CARRIER:CAPS">
@@ -523,6 +594,12 @@
 <ANCHOR id="nm-device-vlan-get-vlan-id" href="libnm-glib/NMDeviceVlan.html#nm-device-vlan-get-vlan-id">
 <ANCHOR id="NMDeviceVlan.other_details" href="libnm-glib/NMDeviceVlan.html#NMDeviceVlan.other_details">
 <ANCHOR id="NMDeviceVlanError" href="libnm-glib/NMDeviceVlan.html#NMDeviceVlanError">
+<ANCHOR id="NM-DEVICE-VLAN-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceVlan.html#NM-DEVICE-VLAN-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-VLAN-ERROR-NOT-VLAN-CONNECTION:CAPS" href="libnm-glib/NMDeviceVlan.html#NM-DEVICE-VLAN-ERROR-NOT-VLAN-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-VLAN-ERROR-INVALID-VLAN-CONNECTION:CAPS" href="libnm-glib/NMDeviceVlan.html#NM-DEVICE-VLAN-ERROR-INVALID-VLAN-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-VLAN-ERROR-ID-MISMATCH:CAPS" href="libnm-glib/NMDeviceVlan.html#NM-DEVICE-VLAN-ERROR-ID-MISMATCH:CAPS">
+<ANCHOR id="NM-DEVICE-VLAN-ERROR-INTERFACE-MISMATCH:CAPS" href="libnm-glib/NMDeviceVlan.html#NM-DEVICE-VLAN-ERROR-INTERFACE-MISMATCH:CAPS">
+<ANCHOR id="NM-DEVICE-VLAN-ERROR-MAC-MISMATCH:CAPS" href="libnm-glib/NMDeviceVlan.html#NM-DEVICE-VLAN-ERROR-MAC-MISMATCH:CAPS">
 <ANCHOR id="NM-DEVICE-VLAN-ERROR:CAPS" href="libnm-glib/NMDeviceVlan.html#NM-DEVICE-VLAN-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-VLAN-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceVlan.html#NM-DEVICE-VLAN-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-VLAN-CARRIER:CAPS" href="libnm-glib/NMDeviceVlan.html#NM-DEVICE-VLAN-CARRIER:CAPS">
@@ -547,6 +624,9 @@
 <ANCHOR id="nm-device-olpc-mesh-get-active-channel" href="libnm-glib/NMDeviceOlpcMesh.html#nm-device-olpc-mesh-get-active-channel">
 <ANCHOR id="NMDeviceOlpcMesh.other_details" href="libnm-glib/NMDeviceOlpcMesh.html#NMDeviceOlpcMesh.other_details">
 <ANCHOR id="NMDeviceOlpcMeshError" href="libnm-glib/NMDeviceOlpcMesh.html#NMDeviceOlpcMeshError">
+<ANCHOR id="NM-DEVICE-OLPC-MESH-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-OLPC-MESH-ERROR-NOT-OLPC-MESH-CONNECTION:CAPS" href="libnm-glib/NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-ERROR-NOT-OLPC-MESH-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-OLPC-MESH-ERROR-INVALID-OLPC-MESH-CONNECTION:CAPS" href="libnm-glib/NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-ERROR-INVALID-OLPC-MESH-CONNECTION:CAPS">
 <ANCHOR id="NM-DEVICE-OLPC-MESH-ERROR:CAPS" href="libnm-glib/NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-ERROR:CAPS">
 <ANCHOR id="NM-DEVICE-OLPC-MESH-HW-ADDRESS:CAPS" href="libnm-glib/NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-OLPC-MESH-COMPANION:CAPS" href="libnm-glib/NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-COMPANION:CAPS">
@@ -573,6 +653,10 @@
 <ANCHOR id="NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS" href="libnm-glib/NMWimaxNsp.html#NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS">
 <ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE:CAPS" href="libnm-glib/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE:CAPS">
 <ANCHOR id="NMWimaxNspNetworkType" href="libnm-glib/NMWimaxNsp.html#NMWimaxNspNetworkType">
+<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS" href="libnm-glib/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS">
+<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS" href="libnm-glib/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS">
+<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS" href="libnm-glib/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS">
+<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS" href="libnm-glib/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS">
 <ANCHOR id="NMWimaxNsp.property-details" href="libnm-glib/NMWimaxNsp.html#NMWimaxNsp.property-details">
 <ANCHOR id="NMWimaxNsp--name" href="libnm-glib/NMWimaxNsp.html#NMWimaxNsp--name">
 <ANCHOR id="NMWimaxNsp--network-type" href="libnm-glib/NMWimaxNsp.html#NMWimaxNsp--network-type">
@@ -721,6 +805,8 @@
 <ANCHOR id="nm-object-get-path" href="libnm-glib/NMObject.html#nm-object-get-path">
 <ANCHOR id="NMObject.other_details" href="libnm-glib/NMObject.html#NMObject.other_details">
 <ANCHOR id="NMObjectError" href="libnm-glib/NMObject.html#NMObjectError">
+<ANCHOR id="NM-OBJECT-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMObject.html#NM-OBJECT-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-OBJECT-ERROR-OBJECT-CREATION-FAILURE:CAPS" href="libnm-glib/NMObject.html#NM-OBJECT-ERROR-OBJECT-CREATION-FAILURE:CAPS">
 <ANCHOR id="NM-OBJECT-ERROR:CAPS" href="libnm-glib/NMObject.html#NM-OBJECT-ERROR:CAPS">
 <ANCHOR id="NM-OBJECT-DBUS-CONNECTION:CAPS" href="libnm-glib/NMObject.html#NM-OBJECT-DBUS-CONNECTION:CAPS">
 <ANCHOR id="NM-OBJECT-DBUS-PATH:CAPS" href="libnm-glib/NMObject.html#NM-OBJECT-DBUS-PATH:CAPS">
@@ -750,6 +836,8 @@
 <ANCHOR id="nm-remote-connection-get-unsaved" href="libnm-glib/NMRemoteConnection.html#nm-remote-connection-get-unsaved">
 <ANCHOR id="NMRemoteConnection.other_details" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnection.other_details">
 <ANCHOR id="NMRemoteConnectionError" href="libnm-glib/NMRemoteConnection.html#NMRemoteConnectionError">
+<ANCHOR id="NM-REMOTE-CONNECTION-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMRemoteConnection.html#NM-REMOTE-CONNECTION-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-REMOTE-CONNECTION-ERROR-DISCONNECTED:CAPS" href="libnm-glib/NMRemoteConnection.html#NM-REMOTE-CONNECTION-ERROR-DISCONNECTED:CAPS">
 <ANCHOR id="NM-REMOTE-CONNECTION-UNSAVED:CAPS" href="libnm-glib/NMRemoteConnection.html#NM-REMOTE-CONNECTION-UNSAVED:CAPS">
 <ANCHOR id="NM-REMOTE-CONNECTION-UPDATED:CAPS" href="libnm-glib/NMRemoteConnection.html#NM-REMOTE-CONNECTION-UPDATED:CAPS">
 <ANCHOR id="NM-REMOTE-CONNECTION-REMOVED:CAPS" href="libnm-glib/NMRemoteConnection.html#NM-REMOTE-CONNECTION-REMOVED:CAPS">
@@ -790,6 +878,10 @@
 <ANCHOR id="nm-remote-settings-save-hostname" href="libnm-glib/NMRemoteSettings.html#nm-remote-settings-save-hostname">
 <ANCHOR id="NMRemoteSettings.other_details" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettings.other_details">
 <ANCHOR id="NMRemoteSettingsError" href="libnm-glib/NMRemoteSettings.html#NMRemoteSettingsError">
+<ANCHOR id="NM-REMOTE-SETTINGS-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-REMOTE-SETTINGS-ERROR-CONNECTION-REMOVED:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-CONNECTION-REMOVED:CAPS">
+<ANCHOR id="NM-REMOTE-SETTINGS-ERROR-CONNECTION-UNAVAILABLE:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-CONNECTION-UNAVAILABLE:CAPS">
+<ANCHOR id="NM-REMOTE-SETTINGS-ERROR-SERVICE-UNAVAILABLE:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-SERVICE-UNAVAILABLE:CAPS">
 <ANCHOR id="NM-REMOTE-SETTINGS-ERROR:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR:CAPS">
 <ANCHOR id="NM-REMOTE-SETTINGS-BUS:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-BUS:CAPS">
 <ANCHOR id="NM-REMOTE-SETTINGS-SERVICE-RUNNING:CAPS" href="libnm-glib/NMRemoteSettings.html#NM-REMOTE-SETTINGS-SERVICE-RUNNING:CAPS">
@@ -831,8 +923,21 @@
 <ANCHOR id="nm-secret-agent-delete-secrets" href="libnm-glib/NMSecretAgent.html#nm-secret-agent-delete-secrets">
 <ANCHOR id="NMSecretAgent.other_details" href="libnm-glib/NMSecretAgent.html#NMSecretAgent.other_details">
 <ANCHOR id="NMSecretAgentError" href="libnm-glib/NMSecretAgent.html#NMSecretAgentError">
+<ANCHOR id="NM-SECRET-AGENT-ERROR-NOT-AUTHORIZED:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-ERROR-NOT-AUTHORIZED:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-ERROR-INVALID-CONNECTION:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-ERROR-INVALID-CONNECTION:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-ERROR-USER-CANCELED:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-ERROR-USER-CANCELED:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-ERROR-AGENT-CANCELED:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-ERROR-AGENT-CANCELED:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-ERROR-INTERNAL-ERROR:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-ERROR-INTERNAL-ERROR:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-ERROR-NO-SECRETS:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-ERROR-NO-SECRETS:CAPS">
 <ANCHOR id="NMSecretAgentCapabilities" href="libnm-glib/NMSecretAgent.html#NMSecretAgentCapabilities">
+<ANCHOR id="NM-SECRET-AGENT-CAPABILITY-NONE:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-CAPABILITY-NONE:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-CAPABILITY-VPN-HINTS:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-CAPABILITY-VPN-HINTS:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-CAPABILITY-LAST:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-CAPABILITY-LAST:CAPS">
 <ANCHOR id="NMSecretAgentGetSecretsFlags" href="libnm-glib/NMSecretAgent.html#NMSecretAgentGetSecretsFlags">
+<ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-NONE:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-NONE:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-ALLOW-INTERACTION:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-ALLOW-INTERACTION:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-REQUEST-NEW:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-REQUEST-NEW:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-USER-REQUESTED:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-USER-REQUESTED:CAPS">
 <ANCHOR id="NM-SECRET-AGENT-IDENTIFIER:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-IDENTIFIER:CAPS">
 <ANCHOR id="NM-SECRET-AGENT-AUTO-REGISTER:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-AUTO-REGISTER:CAPS">
 <ANCHOR id="NM-SECRET-AGENT-REGISTERED:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-REGISTERED:CAPS">
@@ -884,6 +989,16 @@
 <ANCHOR id="NM-VPN-PLUGIN-DBUS-SERVICE-NAME:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-DBUS-SERVICE-NAME:CAPS">
 <ANCHOR id="NM-VPN-PLUGIN-STATE:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-STATE:CAPS">
 <ANCHOR id="NMVPNPluginError" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NMVPNPluginError">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-GENERAL:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-GENERAL:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-STARTING-IN-PROGRESS:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-STARTING-IN-PROGRESS:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-ALREADY-STARTED:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-ALREADY-STARTED:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-STOPPING-IN-PROGRESS:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-STOPPING-IN-PROGRESS:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-ALREADY-STOPPED:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-ALREADY-STOPPED:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-WRONG-STATE:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-WRONG-STATE:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-BAD-ARGUMENTS:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-BAD-ARGUMENTS:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-LAUNCH-FAILED:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-LAUNCH-FAILED:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-CONNECTION-INVALID:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-CONNECTION-INVALID:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-INTERACTIVE-NOT-SUPPORTED:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-INTERACTIVE-NOT-SUPPORTED:CAPS">
 <ANCHOR id="libnm-glib-NMVpnPluginUiWidget" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html">
 <ANCHOR id="libnm-glib-NMVpnPluginUiWidget.functions" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#libnm-glib-NMVpnPluginUiWidget.functions">
 <ANCHOR id="libnm-glib-NMVpnPluginUiWidget.other" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#libnm-glib-NMVpnPluginUiWidget.other">
@@ -902,10 +1017,18 @@
 <ANCHOR id="nm-vpn-plugin-ui-widget-interface-save-secrets" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#nm-vpn-plugin-ui-widget-interface-save-secrets">
 <ANCHOR id="libnm-glib-NMVpnPluginUiWidget.other_details" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#libnm-glib-NMVpnPluginUiWidget.other_details">
 <ANCHOR id="NMVpnPluginUiCapability" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiCapability">
+<ANCHOR id="NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-UI-CAPABILITY-IPV6:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IPV6:CAPS">
 <ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-NAME:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-NAME:CAPS">
 <ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS">
 <ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS">
 <ANCHOR id="NMVpnPluginUiInterfaceProp" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiInterfaceProp">
+<ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-PROP-FIRST:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-FIRST:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-PROP-NAME:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-NAME:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-PROP-DESC:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-DESC:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-PROP-SERVICE:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-SERVICE:CAPS">
 <ANCHOR id="libnm-glib-nm-vpn-plugin-utils" href="libnm-glib/libnm-glib-nm-vpn-plugin-utils.html">
 <ANCHOR id="libnm-glib-nm-vpn-plugin-utils.functions" href="libnm-glib/libnm-glib-nm-vpn-plugin-utils.html#libnm-glib-nm-vpn-plugin-utils.functions">
 <ANCHOR id="libnm-glib-nm-vpn-plugin-utils.description" href="libnm-glib/libnm-glib-nm-vpn-plugin-utils.html#libnm-glib-nm-vpn-plugin-utils.description">
@@ -919,6 +1042,8 @@
 <ANCHOR id="annotation-glossterm-element-type" href="libnm-glib/annotation-glossary.html#annotation-glossterm-element-type">
 <ANCHOR id="annotation-glossterm-out" href="libnm-glib/annotation-glossary.html#annotation-glossterm-out">
 <ANCHOR id="annotation-glossterm-scope async" href="libnm-glib/annotation-glossary.html#annotation-glossterm-scope async">
+<ANCHOR id="annotation-glossterm-skip" href="libnm-glib/annotation-glossary.html#annotation-glossterm-skip">
 <ANCHOR id="annotation-glossterm-transfer container" href="libnm-glib/annotation-glossary.html#annotation-glossterm-transfer container">
 <ANCHOR id="annotation-glossterm-transfer full" href="libnm-glib/annotation-glossary.html#annotation-glossterm-transfer full">
 <ANCHOR id="annotation-glossterm-transfer none" href="libnm-glib/annotation-glossary.html#annotation-glossterm-transfer none">
+<ANCHOR id="annotation-glossterm-type" href="libnm-glib/annotation-glossary.html#annotation-glossterm-type">
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index b64ade5b..e0523b6f 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMVPNPlugin</title>
+<title>NMVPNPlugin: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMVPNConnection.html" title="NMVPNConnection">
 <link rel="next" href="libnm-glib-NMVpnPluginUiWidget.html" title="NMVpnPluginUiWidget">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -155,8 +155,6 @@
 </div>
 <div class="refsect1">
 <a name="libnm-glib-NMVPNPlugin.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="libnm-glib-NMVPNPlugin.functions_details"></a><h2>Functions</h2>
@@ -164,36 +162,18 @@
 <a name="nm-vpn-plugin-error-quark"></a><h3>nm_vpn_plugin_error_quark ()</h3>
 <pre class="programlisting"><span class="returnvalue">GQuark</span>
 nm_vpn_plugin_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.30.6.2.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-plugin-get-connection"></a><h3>nm_vpn_plugin_get_connection ()</h3>
 <pre class="programlisting"><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="returnvalue">DBusGConnection</span></a> *
 nm_vpn_plugin_get_connection (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.30.6.3.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-plugin-get-state"></a><h3>nm_vpn_plugin_get_state ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="returnvalue">NMVPNServiceState</span></a>
 nm_vpn_plugin_get_state (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.30.6.4.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -201,8 +181,6 @@ nm_vpn_plugin_get_state (<em class="parameter"><code><span class="type">NMVPNPlu
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_set_state (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>,
                          <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="type">NMVPNServiceState</span></a> state</code></em>);</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -243,7 +221,7 @@ information to complete the request.</p>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -251,8 +229,6 @@ information to complete the request.</p>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_set_login_banner (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>,
                                 <em class="parameter"><code>const <span class="type">char</span> *banner</code></em>);</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -260,8 +236,6 @@ nm_vpn_plugin_set_login_banner (<em class="parameter"><code><span class="type">N
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_failure (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>,
                        <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManagerVPN.html#NMVPNPluginFailure"><span class="type">NMVPNPluginFailure</span></a> reason</code></em>);</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -269,8 +243,6 @@ nm_vpn_plugin_failure (<em class="parameter"><code><span class="type">NMVPNPlugi
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_set_config (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>,
                           <em class="parameter"><code><span class="type">GHashTable</span> *config</code></em>);</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -278,8 +250,6 @@ nm_vpn_plugin_set_config (<em class="parameter"><code><span class="type">NMVPNPl
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_set_ip4_config (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>,
                               <em class="parameter"><code><span class="type">GHashTable</span> *ip4_config</code></em>);</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -287,8 +257,6 @@ nm_vpn_plugin_set_ip4_config (<em class="parameter"><code><span class="type">NMV
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_set_ip6_config (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>,
                               <em class="parameter"><code><span class="type">GHashTable</span> *ip6_config</code></em>);</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -296,12 +264,6 @@ nm_vpn_plugin_set_ip6_config (<em class="parameter"><code><span class="type">NMV
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_vpn_plugin_disconnect (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>,
                           <em class="parameter"><code><span class="type">GError</span> **err</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.30.6.12.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 </div>
 <div class="refsect1">
@@ -310,16 +272,12 @@ nm_vpn_plugin_disconnect (<em class="parameter"><code><span class="type">NMVPNPl
 <a name="NM-VPN-PLUGIN-DBUS-SERVICE-NAME:CAPS"></a><h3>NM_VPN_PLUGIN_DBUS_SERVICE_NAME</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-STATE:CAPS"></a><h3>NM_VPN_PLUGIN_STATE</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_STATE             "state"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -423,7 +381,6 @@ nm_vpn_plugin_disconnect (<em class="parameter"><code><span class="type">NMVPNPl
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
index 95d75061..e4630fed 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: NMVpnPluginUiWidget</title>
+<title>NMVpnPluginUiWidget: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">
 <link rel="next" href="libnm-glib-nm-vpn-plugin-utils.html" title="nm-vpn-plugin-utils">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -163,8 +163,6 @@
 </div>
 <div class="refsect1">
 <a name="libnm-glib-NMVpnPluginUiWidget.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="libnm-glib-NMVpnPluginUiWidget.functions_details"></a><h2>Functions</h2>
@@ -172,24 +170,12 @@
 <a name="NMVpnPluginUiFactory"></a><h3>NMVpnPluginUiFactory ()</h3>
 <pre class="programlisting"><span class="returnvalue">NMVpnPluginUiInterface</span> *
 <span class="c_punctuation">(</span>*NMVpnPluginUiFactory<span class="c_punctuation">)</span> (<em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.31.6.2.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-plugin-ui-factory"></a><h3>nm_vpn_plugin_ui_factory ()</h3>
 <pre class="programlisting"><span class="returnvalue">NMVpnPluginUiInterface</span> *
 nm_vpn_plugin_ui_factory (<em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.31.6.3.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -198,12 +184,6 @@ nm_vpn_plugin_ui_factory (<em class="parameter"><code><span class="type">GError<
 nm_vpn_plugin_ui_interface_ui_factory (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
                                        <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                        <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.31.6.4.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -211,12 +191,6 @@ nm_vpn_plugin_ui_interface_ui_factory (<em class="parameter"><code><span class="
 <pre class="programlisting"><span class="returnvalue">guint32</span>
 nm_vpn_plugin_ui_interface_get_capabilities
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.31.6.5.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -225,12 +199,6 @@ nm_vpn_plugin_ui_interface_get_capabilities
 nm_vpn_plugin_ui_interface_import (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
                                    <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
                                    <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.31.6.6.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -240,12 +208,6 @@ nm_vpn_plugin_ui_interface_export (<em class="parameter"><code><span class="type
                                    <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
                                    <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.31.6.7.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -254,12 +216,6 @@ nm_vpn_plugin_ui_interface_export (<em class="parameter"><code><span class="type
 nm_vpn_plugin_ui_interface_get_suggested_name
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.31.6.8.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -270,12 +226,6 @@ nm_vpn_plugin_ui_interface_delete_connection
                                 <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <div class="warning"><p><code class="literal">nm_vpn_plugin_ui_interface_delete_connection</code> is deprecated and should not be used in newly-written code.</p></div>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.31.6.9.6"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -283,12 +233,6 @@ nm_vpn_plugin_ui_interface_delete_connection
 <pre class="programlisting"><span class="returnvalue">GObject</span> *
 nm_vpn_plugin_ui_widget_interface_get_widget
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiWidgetInterface</span> *iface</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.31.6.10.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -298,12 +242,6 @@ nm_vpn_plugin_ui_widget_interface_update_connection
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiWidgetInterface</span> *iface</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.31.6.11.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -314,12 +252,6 @@ nm_vpn_plugin_ui_widget_interface_save_secrets
                                 <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <div class="warning"><p><code class="literal">nm_vpn_plugin_ui_widget_interface_save_secrets</code> is deprecated and should not be used in newly-written code.</p></div>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.31.6.12.6"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 </div>
 <div class="refsect1">
@@ -373,24 +305,18 @@ nm_vpn_plugin_ui_widget_interface_save_secrets
 <a name="NM-VPN-PLUGIN-UI-INTERFACE-NAME:CAPS"></a><h3>NM_VPN_PLUGIN_UI_INTERFACE_NAME</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS"></a><h3>NM_VPN_PLUGIN_UI_INTERFACE_DESC</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS"></a><h3>NM_VPN_PLUGIN_UI_INTERFACE_SERVICE</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_UI_INTERFACE_SERVICE "service"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -408,8 +334,8 @@ information to UI programs.</p>
 <tbody>
 <tr>
 <td class="enum_member_name"><p><a name="NM-VPN-PLUGIN-UI-INTERFACE-PROP-FIRST:CAPS"></a>NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST</p></td>
-<td class="enum_member_description"> </td>
-<td class="enum_member_annotations"> </td>
+<td> </td>
+<td> </td>
 </tr>
 <tr>
 <td class="enum_member_name"><p><a name="NM-VPN-PLUGIN-UI-INTERFACE-PROP-NAME:CAPS"></a>NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME</p></td>
@@ -441,7 +367,6 @@ plugin's VPN service daemon</p>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-types.html b/docs/libnm-glib/html/libnm-glib-nm-types.html
index c8ee10a3..9c3dce35 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-types.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-types.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: nm-types</title>
+<title>nm-types: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMRemoteSettings.html" title="NMRemoteSettings">
 <link rel="next" href="NMSecretAgent.html" title="NMSecretAgent">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -33,18 +33,16 @@
 </tr></table></div>
 <div class="refsect1">
 <a name="libnm-glib-nm-types.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="libnm-glib-nm-types.functions_details"></a><h2>Functions</h2>
+<p></p>
 </div>
 <div class="refsect1">
 <a name="libnm-glib-nm-types.other_details"></a><h2>Types and Values</h2>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
index 0a53334e..b03e5987 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: nm-vpn-plugin-utils</title>
+<title>nm-vpn-plugin-utils: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="libnm-glib-NMVpnPluginUiWidget.html" title="NMVpnPluginUiWidget">
 <link rel="next" href="object-tree.html" title="Object Hierarchy">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -60,8 +60,6 @@
 </div>
 <div class="refsect1">
 <a name="libnm-glib-nm-vpn-plugin-utils.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="libnm-glib-nm-vpn-plugin-utils.functions_details"></a><h2>Functions</h2>
@@ -105,7 +103,6 @@ an applet when the applet calls the authentication dialog of the VPN plugin.</p>
 <div class="refsect3">
 <a name="id-1.3.32.5.2.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if reading values was successful, <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -151,7 +148,6 @@ item in <em class="parameter"><code>data</code></em>
 <a name="id-1.3.32.5.3.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the flag data item was found and successfully converted
 to flags, <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -160,7 +156,6 @@ to flags, <code class="literal">FALSE</code> if not</p>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index 8c4d8202..00b0f075 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
 <book xmlns="http://www.devhelp.net/book" title="libnm-glib Reference Manual" link="index.html" author="" name="libnm-glib" version="2" language="c">
   <chapters>
     <sub name="Object Overview" link="ref-overview.html"/>
@@ -672,5 +671,128 @@
     <keyword type="enum" name="enum NMVpnPluginUiInterfaceProp" link="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiInterfaceProp"/>
     <keyword type="function" name="nm_vpn_plugin_utils_read_vpn_details ()" link="libnm-glib-nm-vpn-plugin-utils.html#nm-vpn-plugin-utils-read-vpn-details"/>
     <keyword type="function" name="nm_vpn_plugin_utils_get_secret_flags ()" link="libnm-glib-nm-vpn-plugin-utils.html#nm-vpn-plugin-utils-get-secret-flags"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_NONE" link="NMClient.html#NM-CLIENT-PERMISSION-NONE:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-NETWORK:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIFI:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WWAN:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIMAX:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_SLEEP_WAKE" link="NMClient.html#NM-CLIENT-PERMISSION-SLEEP-WAKE:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_NETWORK_CONTROL" link="NMClient.html#NM-CLIENT-PERMISSION-NETWORK-CONTROL:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED" link="NMClient.html#NM-CLIENT-PERMISSION-WIFI-SHARE-PROTECTED:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN" link="NMClient.html#NM-CLIENT-PERMISSION-WIFI-SHARE-OPEN:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM" link="NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-SYSTEM:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN" link="NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-OWN:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME" link="NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-HOSTNAME:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_LAST" link="NMClient.html#NM-CLIENT-PERMISSION-LAST:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_UNKNOWN" link="NMClient.html#NM-CLIENT-PERMISSION-RESULT-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_YES" link="NMClient.html#NM-CLIENT-PERMISSION-RESULT-YES:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_AUTH" link="NMClient.html#NM-CLIENT-PERMISSION-RESULT-AUTH:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_NO" link="NMClient.html#NM-CLIENT-PERMISSION-RESULT-NO:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_ERROR_UNKNOWN" link="NMClient.html#NM-CLIENT-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_ERROR_MANAGER_NOT_RUNNING" link="NMClient.html#NM-CLIENT-ERROR-MANAGER-NOT-RUNNING:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ERROR_UNKNOWN" link="NMDevice.html#NM-DEVICE-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ERROR_INTERFACE_MISMATCH" link="NMDevice.html#NM-DEVICE-ERROR-INTERFACE-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ETHERNET_ERROR_UNKNOWN" link="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION" link="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR-NOT-ETHERNET-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION" link="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR-INVALID-ETHERNET-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC" link="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR-INVALID-DEVICE-MAC:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH" link="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR-MAC-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_WIFI_ERROR_UNKNOWN" link="NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION" link="NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-NOT-WIFI-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION" link="NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-INVALID-WIFI-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC" link="NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-INVALID-DEVICE-MAC:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_WIFI_ERROR_MAC_MISMATCH" link="NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-MAC-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS" link="NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-MISSING-DEVICE-WPA-CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS" link="NMDeviceWifi.html#NM-DEVICE-WIFI-ERROR-MISSING-DEVICE-RSN-CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_ERROR_UNKNOWN" link="NMDeviceModem.html#NM-DEVICE-MODEM-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION" link="NMDeviceModem.html#NM-DEVICE-MODEM-ERROR-NOT-MODEM-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION" link="NMDeviceModem.html#NM-DEVICE-MODEM-ERROR-INVALID-MODEM-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS" link="NMDeviceModem.html#NM-DEVICE-MODEM-ERROR-MISSING-DEVICE-CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BT_ERROR_UNKNOWN" link="NMDeviceBt.html#NM-DEVICE-BT-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION" link="NMDeviceBt.html#NM-DEVICE-BT-ERROR-NOT-BT-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION" link="NMDeviceBt.html#NM-DEVICE-BT-ERROR-INVALID-BT-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC" link="NMDeviceBt.html#NM-DEVICE-BT-ERROR-INVALID-DEVICE-MAC:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BT_ERROR_MAC_MISMATCH" link="NMDeviceBt.html#NM-DEVICE-BT-ERROR-MAC-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS" link="NMDeviceBt.html#NM-DEVICE-BT-ERROR-MISSING-DEVICE-CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_WIMAX_ERROR_UNKNOWN" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR-NOT-WIMAX-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR-INVALID-WIMAX-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR-INVALID-DEVICE-MAC:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR-MAC-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ADSL_ERROR_UNKNOWN" link="NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION" link="NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR-NOT-ADSL-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION" link="NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR-INVALID-ADSL-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BOND_ERROR_UNKNOWN" link="NMDeviceBond.html#NM-DEVICE-BOND-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION" link="NMDeviceBond.html#NM-DEVICE-BOND-ERROR-NOT-BOND-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION" link="NMDeviceBond.html#NM-DEVICE-BOND-ERROR-INVALID-BOND-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH" link="NMDeviceBond.html#NM-DEVICE-BOND-ERROR-INTERFACE-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BRIDGE_ERROR_UNKNOWN" link="NMDeviceBridge.html#NM-DEVICE-BRIDGE-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION" link="NMDeviceBridge.html#NM-DEVICE-BRIDGE-ERROR-NOT-BRIDGE-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION" link="NMDeviceBridge.html#NM-DEVICE-BRIDGE-ERROR-INVALID-BRIDGE-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH" link="NMDeviceBridge.html#NM-DEVICE-BRIDGE-ERROR-INTERFACE-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TEAM_ERROR_UNKNOWN" link="NMDeviceTeam.html#NM-DEVICE-TEAM-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TEAM_ERROR_NOT_TEAM_CONNECTION" link="NMDeviceTeam.html#NM-DEVICE-TEAM-ERROR-NOT-TEAM-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TEAM_ERROR_INVALID_TEAM_CONNECTION" link="NMDeviceTeam.html#NM-DEVICE-TEAM-ERROR-INVALID-TEAM-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TEAM_ERROR_INTERFACE_MISMATCH" link="NMDeviceTeam.html#NM-DEVICE-TEAM-ERROR-INTERFACE-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_GENERIC_ERROR_UNKNOWN" link="NMDeviceGeneric.html#NM-DEVICE-GENERIC-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_GENERIC_ERROR_NOT_GENERIC_CONNECTION" link="NMDeviceGeneric.html#NM-DEVICE-GENERIC-ERROR-NOT-GENERIC-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_GENERIC_ERROR_MISSING_INTERFACE_NAME" link="NMDeviceGeneric.html#NM-DEVICE-GENERIC-ERROR-MISSING-INTERFACE-NAME:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_INFINIBAND_ERROR_UNKNOWN" link="NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION" link="NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-ERROR-NOT-INFINIBAND-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION" link="NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-ERROR-INVALID-INFINIBAND-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC" link="NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-ERROR-INVALID-DEVICE-MAC:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH" link="NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-ERROR-MAC-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_VLAN_ERROR_UNKNOWN" link="NMDeviceVlan.html#NM-DEVICE-VLAN-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION" link="NMDeviceVlan.html#NM-DEVICE-VLAN-ERROR-NOT-VLAN-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION" link="NMDeviceVlan.html#NM-DEVICE-VLAN-ERROR-INVALID-VLAN-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_VLAN_ERROR_ID_MISMATCH" link="NMDeviceVlan.html#NM-DEVICE-VLAN-ERROR-ID-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH" link="NMDeviceVlan.html#NM-DEVICE-VLAN-ERROR-INTERFACE-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_VLAN_ERROR_MAC_MISMATCH" link="NMDeviceVlan.html#NM-DEVICE-VLAN-ERROR-MAC-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN" link="NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION" link="NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-ERROR-NOT-OLPC-MESH-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION" link="NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-ERROR-INVALID-OLPC-MESH-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_HOME" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_PARTNER" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS"/>
+    <keyword type="constant" name="NM_OBJECT_ERROR_UNKNOWN" link="NMObject.html#NM-OBJECT-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE" link="NMObject.html#NM-OBJECT-ERROR-OBJECT-CREATION-FAILURE:CAPS"/>
+    <keyword type="constant" name="NM_REMOTE_CONNECTION_ERROR_UNKNOWN" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_REMOTE_CONNECTION_ERROR_DISCONNECTED" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-ERROR-DISCONNECTED:CAPS"/>
+    <keyword type="constant" name="NM_REMOTE_SETTINGS_ERROR_UNKNOWN" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-CONNECTION-REMOVED:CAPS"/>
+    <keyword type="constant" name="NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-CONNECTION-UNAVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_REMOTE_SETTINGS_ERROR_SERVICE_UNAVAILABLE" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-SERVICE-UNAVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR-NOT-AUTHORIZED:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_ERROR_INVALID_CONNECTION" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR-INVALID-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_ERROR_USER_CANCELED" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR-USER-CANCELED:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_ERROR_AGENT_CANCELED" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR-AGENT-CANCELED:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_ERROR_INTERNAL_ERROR" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR-INTERNAL-ERROR:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_ERROR_NO_SECRETS" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR-NO-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_CAPABILITY_NONE" link="NMSecretAgent.html#NM-SECRET-AGENT-CAPABILITY-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_CAPABILITY_VPN_HINTS" link="NMSecretAgent.html#NM-SECRET-AGENT-CAPABILITY-VPN-HINTS:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_CAPABILITY_LAST" link="NMSecretAgent.html#NM-SECRET-AGENT-CAPABILITY-LAST:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE" link="NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION" link="NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-ALLOW-INTERACTION:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW" link="NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-REQUEST-NEW:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED" link="NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-USER-REQUESTED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_GENERAL" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-GENERAL:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-STARTING-IN-PROGRESS:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_ALREADY_STARTED" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-ALREADY-STARTED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-STOPPING-IN-PROGRESS:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-ALREADY-STOPPED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_WRONG_STATE" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-WRONG-STATE:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-BAD-ARGUMENTS:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-LAUNCH-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-CONNECTION-INVALID:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-INTERACTIVE-NOT-SUPPORTED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_UI_CAPABILITY_NONE" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_UI_CAPABILITY_IPV6" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IPV6:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-FIRST:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-NAME:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-DESC:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-SERVICE:CAPS"/>
   </functions>
 </book>
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index 500f78d4..c6ea9297 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: Object Hierarchy</title>
+<title>Object Hierarchy: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="index.html" title="libnm-glib Reference Manual">
 <link rel="prev" href="libnm-glib-nm-vpn-plugin-utils.html" title="nm-vpn-plugin-utils">
 <link rel="next" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -55,7 +55,6 @@
 </pre>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ref-overview.html b/docs/libnm-glib/html/ref-overview.html
index d3a8c516..fcd4ec99 100644
--- a/docs/libnm-glib/html/ref-overview.html
+++ b/docs/libnm-glib/html/ref-overview.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-glib Reference Manual: Object Overview</title>
+<title>Object Overview: libnm-glib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="index.html" title="libnm-glib Reference Manual">
 <link rel="prev" href="index.html" title="libnm-glib Reference Manual">
 <link rel="next" href="ch02.html" title="libnm-glib API Reference">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -41,7 +41,6 @@
     </p>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/style.css b/docs/libnm-glib/html/style.css
index c141ddd2..36754209 100644
--- a/docs/libnm-glib/html/style.css
+++ b/docs/libnm-glib/html/style.css
@@ -60,7 +60,7 @@ a:hover
 div.informaltable table
 {
   border-collapse: separate;
-  border-spacing: 1em 0.5em;
+  border-spacing: 1em 0.3em;
   border: none;
 }
 
@@ -148,6 +148,8 @@ div.table table th
 h4
 {
   color: #555753;
+  margin-top: 1em;
+  margin-bottom: 1em;
 }
 
 hr
@@ -166,17 +168,16 @@ dl.toc dt
   padding-bottom: 0.25em;
 }
 
-dl.toc > dd > dl > dt
+dl.toc > dt
 {
   padding-top: 0.25em;
   padding-bottom: 0.25em;
+  font-weight: bold;
 }
 
-dl.toc > dt
+dl.toc > dl
 {
-  padding-top: 1em;
   padding-bottom: 0.5em;
-  font-weight: bold;
 }
 
 .parameter
@@ -346,7 +347,9 @@ acronym,abbr
 }
 
 @media screen {
-  sup a.footnote
+  /* these have a <sup> as a first child, but since there are no parent selectors
+   * we can't use that. */
+  a.footnote
   {
     position: relative;
     top: 0em ! important;
diff --git a/docs/libnm-glib/tmpl/libnm-glib-unused.sgml b/docs/libnm-glib/tmpl/libnm-glib-unused.sgml
deleted file mode 100644
index e69de29b..00000000
--- a/docs/libnm-glib/tmpl/libnm-glib-unused.sgml
+++ /dev/null
diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml
deleted file mode 100644
index 2a2ecb1c..00000000
--- a/docs/libnm-glib/tmpl/nm-access-point.sgml
+++ /dev/null
@@ -1,214 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMAccessPoint
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_WPA_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_RSN_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_SSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_BSSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_FREQUENCY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_MAX_BITRATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_STRENGTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_access_point_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_flags ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_wpa_flags ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_rsn_flags ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_ssid ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_bssid ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_frequency ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_mode ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_max_bitrate ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_strength ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_filter_connections ##### -->
-<para>
-
-</para>
-
-@ap: 
-@connections: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_connection_valid ##### -->
-<para>
-
-</para>
-
-@ap: 
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_hw_address ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml
deleted file mode 100644
index 8b52c825..00000000
--- a/docs/libnm-glib/tmpl/nm-active-connection.sgml
+++ /dev/null
@@ -1,274 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMActiveConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_UUID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEVICES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_IP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_DHCP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEFAULT6 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_IP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_DHCP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_VPN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_MASTER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_active_connection_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_connection ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_id ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_uuid ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_connection_type ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_specific_object ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_devices ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_state ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_master ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_default ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_ip4_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_dhcp4_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_default6 ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_ip6_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_dhcp6_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_vpn ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml
deleted file mode 100644
index cb1adf09..00000000
--- a/docs/libnm-glib/tmpl/nm-client.sgml
+++ /dev/null
@@ -1,552 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMClient
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_CLIENT_VERSION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_STARTUP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_MANAGER_RUNNING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_NETWORKING_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WIRELESS_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WIRELESS_HARDWARE_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WWAN_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WWAN_HARDWARE_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WIMAX_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WIMAX_HARDWARE_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_ACTIVE_CONNECTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_CONNECTIVITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_PRIMARY_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_ACTIVATING_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_DEVICES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMClientPermission ##### -->
-<para>
-
-</para>
-
-@NM_CLIENT_PERMISSION_NONE: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX: 
-@NM_CLIENT_PERMISSION_SLEEP_WAKE: 
-@NM_CLIENT_PERMISSION_NETWORK_CONTROL: 
-@NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED: 
-@NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN: 
-@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM: 
-@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN: 
-@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME: 
-@NM_CLIENT_PERMISSION_LAST: 
-
-<!-- ##### ENUM NMClientPermissionResult ##### -->
-<para>
-
-</para>
-
-@NM_CLIENT_PERMISSION_RESULT_UNKNOWN: 
-@NM_CLIENT_PERMISSION_RESULT_YES: 
-@NM_CLIENT_PERMISSION_RESULT_AUTH: 
-@NM_CLIENT_PERMISSION_RESULT_NO: 
-
-<!-- ##### ENUM NMClientError ##### -->
-<para>
-
-</para>
-
-@NM_CLIENT_ERROR_UNKNOWN: 
-@NM_CLIENT_ERROR_MANAGER_NOT_RUNNING: 
-
-<!-- ##### MACRO NM_CLIENT_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_client_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_new_async ##### -->
-<para>
-
-</para>
-
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_new_finish ##### -->
-<para>
-
-</para>
-
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_devices ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_device_by_path ##### -->
-<para>
-
-</para>
-
-@client: 
-@object_path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_device_by_iface ##### -->
-<para>
-
-</para>
-
-@client: 
-@iface: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION NMClientActivateFn ##### -->
-<para>
-
-</para>
-
-@client: 
-@active_connection: 
-@error: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_activate_connection ##### -->
-<para>
-
-</para>
-
-@client: 
-@connection: 
-@device: 
-@specific_object: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### USER_FUNCTION NMClientAddActivateFn ##### -->
-<para>
-
-</para>
-
-@client: 
-@connection: 
-@new_connection_path: 
-@error: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_add_and_activate_connection ##### -->
-<para>
-
-</para>
-
-@client: 
-@partial: 
-@device: 
-@specific_object: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_deactivate_connection ##### -->
-<para>
-
-</para>
-
-@client: 
-@active: 
-
-
-<!-- ##### FUNCTION nm_client_networking_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_networking_set_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@enabled: 
-
-
-<!-- ##### FUNCTION nm_client_wireless_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wireless_set_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@enabled: 
-
-
-<!-- ##### FUNCTION nm_client_wireless_hardware_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wwan_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wwan_set_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@enabled: 
-
-
-<!-- ##### FUNCTION nm_client_wwan_hardware_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wimax_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wimax_set_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@enabled: 
-
-
-<!-- ##### FUNCTION nm_client_wimax_hardware_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_version ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_state ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_startup ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_manager_running ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_active_connections ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_sleep ##### -->
-<para>
-
-</para>
-
-@client: 
-@sleep_: 
-
-
-<!-- ##### FUNCTION nm_client_get_permission_result ##### -->
-<para>
-
-</para>
-
-@client: 
-@permission: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_logging ##### -->
-<para>
-
-</para>
-
-@client: 
-@level: 
-@domains: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_set_logging ##### -->
-<para>
-
-</para>
-
-@client: 
-@level: 
-@domains: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_connectivity ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_check_connectivity ##### -->
-<para>
-
-</para>
-
-@client: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_check_connectivity_async ##### -->
-<para>
-
-</para>
-
-@client: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_check_connectivity_finish ##### -->
-<para>
-
-</para>
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_primary_connection ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_activating_connection ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-adsl.sgml b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
deleted file mode 100644
index 1c7e14c2..00000000
--- a/docs/libnm-glib/tmpl/nm-device-adsl.sgml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceAdsl
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceAdslError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_ADSL_ERROR_UNKNOWN: 
-@NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION: 
-@NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION: 
-
-<!-- ##### MACRO NM_DEVICE_ADSL_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_adsl_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_ADSL_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_adsl_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_adsl_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-bond.sgml b/docs/libnm-glib/tmpl/nm-device-bond.sgml
deleted file mode 100644
index 3270d995..00000000
--- a/docs/libnm-glib/tmpl/nm-device-bond.sgml
+++ /dev/null
@@ -1,108 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceBond
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceBondError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_BOND_ERROR_UNKNOWN: 
-@NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION: 
-@NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION: 
-@NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH: 
-
-<!-- ##### MACRO NM_DEVICE_BOND_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_bond_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_BOND_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BOND_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BOND_SLAVES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_bond_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bond_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bond_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bond_get_slaves ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-bridge.sgml b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
deleted file mode 100644
index 65094577..00000000
--- a/docs/libnm-glib/tmpl/nm-device-bridge.sgml
+++ /dev/null
@@ -1,108 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceBridge
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceBridgeError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_BRIDGE_ERROR_UNKNOWN: 
-@NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION: 
-@NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION: 
-@NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH: 
-
-<!-- ##### MACRO NM_DEVICE_BRIDGE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_bridge_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_BRIDGE_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BRIDGE_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BRIDGE_SLAVES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_bridge_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bridge_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bridge_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bridge_get_slaves ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml
deleted file mode 100644
index 44a6f692..00000000
--- a/docs/libnm-glib/tmpl/nm-device-bt.sgml
+++ /dev/null
@@ -1,110 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceBt
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceBtError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_BT_ERROR_UNKNOWN: 
-@NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION: 
-@NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION: 
-@NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_BT_ERROR_MAC_MISMATCH: 
-@NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS: 
-
-<!-- ##### MACRO NM_DEVICE_BT_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_bt_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_BT_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BT_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BT_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_bt_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bt_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bt_get_name ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bt_get_capabilities ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
deleted file mode 100644
index 4d97c189..00000000
--- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
+++ /dev/null
@@ -1,125 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceEthernet
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceEthernetError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_ETHERNET_ERROR_UNKNOWN: 
-@NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION: 
-@NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION: 
-@NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH: 
-
-<!-- ##### MACRO NM_DEVICE_ETHERNET_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_ethernet_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_ETHERNET_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_ETHERNET_SPEED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_ETHERNET_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_ethernet_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_ethernet_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_ethernet_get_permanent_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_ethernet_get_speed ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_ethernet_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-generic.sgml b/docs/libnm-glib/tmpl/nm-device-generic.sgml
deleted file mode 100644
index c20500bf..00000000
--- a/docs/libnm-glib/tmpl/nm-device-generic.sgml
+++ /dev/null
@@ -1,82 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceGeneric
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceGenericError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_GENERIC_ERROR_UNKNOWN: 
-@NM_DEVICE_GENERIC_ERROR_NOT_GENERIC_CONNECTION: 
-@NM_DEVICE_GENERIC_ERROR_MISSING_INTERFACE_NAME: 
-
-<!-- ##### MACRO NM_DEVICE_GENERIC_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_generic_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_GENERIC_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_GENERIC_TYPE_DESCRIPTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_generic_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_generic_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
deleted file mode 100644
index 73a3f3c4..00000000
--- a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
+++ /dev/null
@@ -1,93 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceInfiniband
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceInfinibandError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_INFINIBAND_ERROR_UNKNOWN: 
-@NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION: 
-@NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION: 
-@NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH: 
-
-<!-- ##### MACRO NM_DEVICE_INFINIBAND_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_infiniband_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_INFINIBAND_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_INFINIBAND_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_infiniband_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_infiniband_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_infiniband_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-modem.sgml b/docs/libnm-glib/tmpl/nm-device-modem.sgml
deleted file mode 100644
index 007c3b42..00000000
--- a/docs/libnm-glib/tmpl/nm-device-modem.sgml
+++ /dev/null
@@ -1,82 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceModem
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceModemError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_MODEM_ERROR_UNKNOWN: 
-@NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION: 
-@NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION: 
-@NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS: 
-
-<!-- ##### MACRO NM_DEVICE_MODEM_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_modem_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_MODEM_MODEM_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_MODEM_CURRENT_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_modem_get_modem_capabilities ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_modem_get_current_capabilities ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
deleted file mode 100644
index c8cccb2f..00000000
--- a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
+++ /dev/null
@@ -1,107 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceOlpcMesh
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceOlpcMeshError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN: 
-@NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION: 
-@NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION: 
-
-<!-- ##### MACRO NM_DEVICE_OLPC_MESH_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_olpc_mesh_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_OLPC_MESH_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_OLPC_MESH_COMPANION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_olpc_mesh_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_olpc_mesh_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_olpc_mesh_get_companion ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_olpc_mesh_get_active_channel ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-team.sgml b/docs/libnm-glib/tmpl/nm-device-team.sgml
deleted file mode 100644
index abf5ab69..00000000
--- a/docs/libnm-glib/tmpl/nm-device-team.sgml
+++ /dev/null
@@ -1,108 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceTeam
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceTeamError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_TEAM_ERROR_UNKNOWN: 
-@NM_DEVICE_TEAM_ERROR_NOT_TEAM_CONNECTION: 
-@NM_DEVICE_TEAM_ERROR_INVALID_TEAM_CONNECTION: 
-@NM_DEVICE_TEAM_ERROR_INTERFACE_MISMATCH: 
-
-<!-- ##### MACRO NM_DEVICE_TEAM_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_team_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_TEAM_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_TEAM_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_TEAM_SLAVES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_team_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_team_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_team_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_team_get_slaves ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-vlan.sgml b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
deleted file mode 100644
index 5397d204..00000000
--- a/docs/libnm-glib/tmpl/nm-device-vlan.sgml
+++ /dev/null
@@ -1,126 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceVlan
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceVlanError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_VLAN_ERROR_UNKNOWN: 
-@NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION: 
-@NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION: 
-@NM_DEVICE_VLAN_ERROR_ID_MISMATCH: 
-@NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH: 
-@NM_DEVICE_VLAN_ERROR_MAC_MISMATCH: 
-
-<!-- ##### MACRO NM_DEVICE_VLAN_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_vlan_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_VLAN_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_VLAN_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_VLAN_PARENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_VLAN_VLAN_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_vlan_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_vlan_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_vlan_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_vlan_get_parent ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_vlan_get_vlan_id ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
deleted file mode 100644
index b694b822..00000000
--- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml
+++ /dev/null
@@ -1,205 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceWifi
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceWifiError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_WIFI_ERROR_UNKNOWN: 
-@NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION: 
-@NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION: 
-@NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_WIFI_ERROR_MAC_MISMATCH: 
-@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS: 
-@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS: 
-
-<!-- ##### MACRO NM_DEVICE_WIFI_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_wifi_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_BITRATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_ACCESS_POINTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_wifi_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_permanent_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_mode ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_bitrate ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_capabilities ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_active_access_point ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_access_point_by_path ##### -->
-<para>
-
-</para>
-
-@device: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_access_points ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION NMDeviceWifiRequestScanFn ##### -->
-<para>
-
-</para>
-
-@device: 
-@error: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_request_scan_simple ##### -->
-<para>
-
-</para>
-
-@device: 
-@callback: 
-@user_data: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-wimax.sgml b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
deleted file mode 100644
index acf1ab91..00000000
--- a/docs/libnm-glib/tmpl/nm-device-wimax.sgml
+++ /dev/null
@@ -1,199 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceWimax
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceWimaxError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_WIMAX_ERROR_UNKNOWN: 
-@NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION: 
-@NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION: 
-@NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH: 
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_wimax_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_ACTIVE_NSP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_CENTER_FREQUENCY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_RSSI ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_CINR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_TX_POWER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_BSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_NSPS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_wimax_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_hw_address ##### -->
-<para>
-
-</para>
-
-@wimax: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_active_nsp ##### -->
-<para>
-
-</para>
-
-@wimax: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_nsp_by_path ##### -->
-<para>
-
-</para>
-
-@wimax: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_nsps ##### -->
-<para>
-
-</para>
-
-@wimax: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_center_frequency ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_rssi ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_cinr ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_tx_power ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_bsid ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
deleted file mode 100644
index ef5443e1..00000000
--- a/docs/libnm-glib/tmpl/nm-device.sgml
+++ /dev/null
@@ -1,562 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDevice
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMDeviceError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_ERROR_UNKNOWN: 
-@NM_DEVICE_ERROR_INTERFACE_MISMATCH: 
-
-<!-- ##### MACRO NM_DEVICE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_DEVICE_DEVICE_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_UDI ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_INTERFACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_IP_INTERFACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_DRIVER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_DRIVER_VERSION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_FIRMWARE_VERSION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_MANAGED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_AUTOCONNECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_FIRMWARE_MISSING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_IP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_DHCP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_IP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_DHCP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_STATE_REASON ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_ACTIVE_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_AVAILABLE_CONNECTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_VENDOR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_PRODUCT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_PHYSICAL_PORT_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_iface ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_ip_iface ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_device_type ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_udi ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_driver ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_driver_version ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_firmware_version ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_type_description ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_capabilities ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_managed ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_autoconnect ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_set_autoconnect ##### -->
-<para>
-
-</para>
-
-@device: 
-@autoconnect: 
-
-
-<!-- ##### FUNCTION nm_device_get_firmware_missing ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_ip4_config ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_dhcp4_config ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_ip6_config ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_dhcp6_config ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_state ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_state_reason ##### -->
-<para>
-
-</para>
-
-@device: 
-@reason: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_active_connection ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_available_connections ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_physical_port_id ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_mtu ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_is_software ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_product ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_vendor ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_description ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_disambiguate_names ##### -->
-<para>
-
-</para>
-
-@devices: 
-@num_devices: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION NMDeviceCallbackFn ##### -->
-<para>
-
-</para>
-
-@device: 
-@error: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_device_disconnect ##### -->
-<para>
-
-</para>
-
-@device: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_device_delete ##### -->
-<para>
-
-</para>
-
-@device: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_device_filter_connections ##### -->
-<para>
-
-</para>
-
-@device: 
-@connections: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_connection_valid ##### -->
-<para>
-
-</para>
-
-@device: 
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_connection_compatible ##### -->
-<para>
-
-</para>
-
-@device: 
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_setting_type ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION NMDeviceDeactivateFn ##### -->
-<para>
-
-</para>
-
-@device: 
-@error: 
-@user_data: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
deleted file mode 100644
index 4f3d8602..00000000
--- a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDHCP4Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DHCP4_CONFIG_OPTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_dhcp4_config_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_dhcp4_config_get_options ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_dhcp4_config_get_one_option ##### -->
-<para>
-
-</para>
-
-@config: 
-@option: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
deleted file mode 100644
index 7679b7d9..00000000
--- a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDHCP6Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DHCP6_CONFIG_OPTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_dhcp6_config_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_dhcp6_config_get_options ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_dhcp6_config_get_one_option ##### -->
-<para>
-
-</para>
-
-@config: 
-@option: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml b/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
deleted file mode 100644
index b81a00af..00000000
--- a/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-glib-enum-types
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
deleted file mode 100644
index 6b5f91f3..00000000
--- a/docs/libnm-glib/tmpl/nm-ip4-config.sgml
+++ /dev/null
@@ -1,146 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMIP4Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_IP4_CONFIG_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP4_CONFIG_ADDRESSES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP4_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP4_CONFIG_NAMESERVERS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP4_CONFIG_DOMAINS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP4_CONFIG_SEARCHES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP4_CONFIG_WINS_SERVERS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_ip4_config_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_config_get_gateway ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_config_get_addresses ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_config_get_routes ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_config_get_nameservers ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_config_get_domains ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_config_get_searches ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_config_get_wins_servers ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
deleted file mode 100644
index f0a95e52..00000000
--- a/docs/libnm-glib/tmpl/nm-ip6-config.sgml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMIP6Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_IP6_CONFIG_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP6_CONFIG_ADDRESSES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP6_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP6_CONFIG_NAMESERVERS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP6_CONFIG_DOMAINS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP6_CONFIG_SEARCHES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_ip6_config_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_config_get_gateway ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_config_get_addresses ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_config_get_routes ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_config_get_num_nameservers ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_config_get_nameserver ##### -->
-<para>
-
-</para>
-
-@config: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_config_get_nameservers ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_config_get_domains ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_config_get_searches ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml
deleted file mode 100644
index 7d99e2c0..00000000
--- a/docs/libnm-glib/tmpl/nm-object.sgml
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMObject
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMObjectError ##### -->
-<para>
-
-</para>
-
-@NM_OBJECT_ERROR_UNKNOWN: 
-@NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE: 
-
-<!-- ##### MACRO NM_OBJECT_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_object_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_OBJECT_DBUS_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_OBJECT_DBUS_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_object_get_connection ##### -->
-<para>
-
-</para>
-
-@object: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_object_get_path ##### -->
-<para>
-
-</para>
-
-@object: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
deleted file mode 100644
index f20ef680..00000000
--- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml
+++ /dev/null
@@ -1,172 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMRemoteConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMRemoteConnectionError ##### -->
-<para>
-
-</para>
-
-@NM_REMOTE_CONNECTION_ERROR_UNKNOWN: 
-@NM_REMOTE_CONNECTION_ERROR_DISCONNECTED: 
-
-<!-- ##### MACRO NM_REMOTE_CONNECTION_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_remote_connection_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_REMOTE_CONNECTION_UNSAVED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_REMOTE_CONNECTION_UPDATED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_REMOTE_CONNECTION_REMOVED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### USER_FUNCTION NMRemoteConnectionResultFunc ##### -->
-<para>
-
-</para>
-
-@connection: 
-@error: 
-@user_data: 
-
-
-<!-- ##### TYPEDEF NMRemoteConnectionCommitFunc ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF NMRemoteConnectionDeleteFunc ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### USER_FUNCTION NMRemoteConnectionGetSecretsFunc ##### -->
-<para>
-
-</para>
-
-@connection: 
-@secrets: 
-@error: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_new ##### -->
-<para>
-
-</para>
-
-@bus: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_commit_changes ##### -->
-<para>
-
-</para>
-
-@connection: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_commit_changes_unsaved ##### -->
-<para>
-
-</para>
-
-@connection: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_save ##### -->
-<para>
-
-</para>
-
-@connection: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_delete ##### -->
-<para>
-
-</para>
-
-@connection: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_get_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_name: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_get_unsaved ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
deleted file mode 100644
index 4500e38f..00000000
--- a/docs/libnm-glib/tmpl/nm-remote-settings.sgml
+++ /dev/null
@@ -1,251 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMRemoteSettings
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMRemoteSettingsError ##### -->
-<para>
-
-</para>
-
-@NM_REMOTE_SETTINGS_ERROR_UNKNOWN: 
-@NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED: 
-@NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE: 
-@NM_REMOTE_SETTINGS_ERROR_SERVICE_UNAVAILABLE: 
-
-<!-- ##### MACRO NM_REMOTE_SETTINGS_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_remote_settings_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_REMOTE_SETTINGS_BUS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_REMOTE_SETTINGS_SERVICE_RUNNING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_REMOTE_SETTINGS_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_REMOTE_SETTINGS_CAN_MODIFY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_REMOTE_SETTINGS_NEW_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_REMOTE_SETTINGS_CONNECTIONS_READ ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### USER_FUNCTION NMRemoteSettingsAddConnectionFunc ##### -->
-<para>
-
-</para>
-
-@settings: 
-@connection: 
-@error: 
-@user_data: 
-
-
-<!-- ##### USER_FUNCTION NMRemoteSettingsLoadConnectionsFunc ##### -->
-<para>
-
-</para>
-
-@settings: 
-@failures: 
-@error: 
-@user_data: 
-
-
-<!-- ##### USER_FUNCTION NMRemoteSettingsSaveHostnameFunc ##### -->
-<para>
-
-</para>
-
-@settings: 
-@error: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_remote_settings_new ##### -->
-<para>
-
-</para>
-
-@bus: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_settings_new_async ##### -->
-<para>
-
-</para>
-
-@bus: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_remote_settings_new_finish ##### -->
-<para>
-
-</para>
-
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_settings_list_connections ##### -->
-<para>
-
-</para>
-
-@settings: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_settings_get_connection_by_id ##### -->
-<para>
-
-</para>
-
-@settings: 
-@id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_settings_get_connection_by_path ##### -->
-<para>
-
-</para>
-
-@settings: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_settings_get_connection_by_uuid ##### -->
-<para>
-
-</para>
-
-@settings: 
-@uuid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_settings_add_connection ##### -->
-<para>
-
-</para>
-
-@settings: 
-@connection: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_settings_add_connection_unsaved ##### -->
-<para>
-
-</para>
-
-@settings: 
-@connection: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_settings_load_connections ##### -->
-<para>
-
-</para>
-
-@settings: 
-@filenames: 
-@failures: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_settings_reload_connections ##### -->
-<para>
-
-</para>
-
-@settings: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_settings_save_hostname ##### -->
-<para>
-
-</para>
-
-@settings: 
-@hostname: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent.sgml b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
deleted file mode 100644
index 72f5a573..00000000
--- a/docs/libnm-glib/tmpl/nm-secret-agent.sgml
+++ /dev/null
@@ -1,203 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSecretAgent
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SECRET_AGENT_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_secret_agent_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### ENUM NMSecretAgentError ##### -->
-<para>
-
-</para>
-
-@NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED: 
-@NM_SECRET_AGENT_ERROR_INVALID_CONNECTION: 
-@NM_SECRET_AGENT_ERROR_USER_CANCELED: 
-@NM_SECRET_AGENT_ERROR_AGENT_CANCELED: 
-@NM_SECRET_AGENT_ERROR_INTERNAL_ERROR: 
-@NM_SECRET_AGENT_ERROR_NO_SECRETS: 
-
-<!-- ##### ENUM NMSecretAgentCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_SECRET_AGENT_CAPABILITY_NONE: 
-@NM_SECRET_AGENT_CAPABILITY_VPN_HINTS: 
-@NM_SECRET_AGENT_CAPABILITY_LAST: 
-
-<!-- ##### ENUM NMSecretAgentGetSecretsFlags ##### -->
-<para>
-
-</para>
-
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED: 
-
-<!-- ##### MACRO NM_SECRET_AGENT_IDENTIFIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SECRET_AGENT_AUTO_REGISTER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SECRET_AGENT_REGISTERED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SECRET_AGENT_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SECRET_AGENT_REGISTRATION_RESULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### USER_FUNCTION NMSecretAgentGetSecretsFunc ##### -->
-<para>
-
-</para>
-
-@agent: 
-@connection: 
-@secrets: 
-@error: 
-@user_data: 
-
-
-<!-- ##### USER_FUNCTION NMSecretAgentSaveSecretsFunc ##### -->
-<para>
-
-</para>
-
-@agent: 
-@connection: 
-@error: 
-@user_data: 
-
-
-<!-- ##### USER_FUNCTION NMSecretAgentDeleteSecretsFunc ##### -->
-<para>
-
-</para>
-
-@agent: 
-@connection: 
-@error: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_register ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_unregister ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_get_registered ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_get_secrets ##### -->
-<para>
-
-</para>
-
-@self: 
-@connection: 
-@setting_name: 
-@hints: 
-@flags: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_save_secrets ##### -->
-<para>
-
-</para>
-
-@self: 
-@connection: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_delete_secrets ##### -->
-<para>
-
-</para>
-
-@self: 
-@connection: 
-@callback: 
-@user_data: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-types.sgml b/docs/libnm-glib/tmpl/nm-types.sgml
deleted file mode 100644
index 18babb0f..00000000
--- a/docs/libnm-glib/tmpl/nm-types.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-types
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
deleted file mode 100644
index 39d5ecc1..00000000
--- a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
+++ /dev/null
@@ -1,66 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMVPNConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_VPN_CONNECTION_VPN_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_CONNECTION_BANNER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_vpn_connection_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_connection_get_vpn_state ##### -->
-<para>
-
-</para>
-
-@vpn: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_connection_get_banner ##### -->
-<para>
-
-</para>
-
-@vpn: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml b/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
deleted file mode 100644
index 0f800cac..00000000
--- a/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-vpn-enum-types
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
deleted file mode 100644
index 1f6635b8..00000000
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
+++ /dev/null
@@ -1,178 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMVpnPluginUiWidget
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### USER_FUNCTION NMVpnPluginUiFactory ##### -->
-<para>
-
-</para>
-
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_factory ##### -->
-<para>
-
-</para>
-
-@error: 
-@Returns: 
-
-
-<!-- ##### ENUM NMVpnPluginUiCapability ##### -->
-<para>
-
-</para>
-
-@NM_VPN_PLUGIN_UI_CAPABILITY_NONE: 
-@NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT: 
-@NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT: 
-@NM_VPN_PLUGIN_UI_CAPABILITY_IPV6: 
-
-<!-- ##### MACRO NM_VPN_PLUGIN_UI_INTERFACE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_UI_INTERFACE_DESC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_UI_INTERFACE_SERVICE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMVpnPluginUiInterfaceProp ##### -->
-<para>
-
-</para>
-
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: 
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_ui_factory ##### -->
-<para>
-
-</para>
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_get_capabilities ##### -->
-<para>
-
-</para>
-
-@iface: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_import ##### -->
-<para>
-
-</para>
-
-@iface: 
-@path: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_export ##### -->
-<para>
-
-</para>
-
-@iface: 
-@path: 
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_get_suggested_name ##### -->
-<para>
-
-</para>
-
-@iface: 
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_delete_connection ##### -->
-<para>
-
-</para>
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_widget_interface_get_widget ##### -->
-<para>
-
-</para>
-
-@iface: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_widget_interface_update_connection ##### -->
-<para>
-
-</para>
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_ui_widget_interface_save_secrets ##### -->
-<para>
-
-</para>
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
deleted file mode 100644
index 3a6536da..00000000
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-vpn-plugin-utils
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_utils_read_vpn_details ##### -->
-<para>
-
-</para>
-
-@fd: 
-@out_data: 
-@out_secrets: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_utils_get_secret_flags ##### -->
-<para>
-
-</para>
-
-@data: 
-@secret_name: 
-@out_flags: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
deleted file mode 100644
index 4f002dfe..00000000
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
+++ /dev/null
@@ -1,155 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMVPNPlugin
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_DBUS_SERVICE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMVPNPluginError ##### -->
-<para>
-
-</para>
-
-@NM_VPN_PLUGIN_ERROR_GENERAL: 
-@NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS: 
-@NM_VPN_PLUGIN_ERROR_ALREADY_STARTED: 
-@NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS: 
-@NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED: 
-@NM_VPN_PLUGIN_ERROR_WRONG_STATE: 
-@NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS: 
-@NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED: 
-@NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID: 
-@NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED: 
-
-<!-- ##### FUNCTION nm_vpn_plugin_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_get_connection ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_get_state ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_set_state ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@state: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_secrets_required ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@message: 
-@hints: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_set_login_banner ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@banner: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_failure ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@reason: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_set_config ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@config: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_set_ip4_config ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@ip4_config: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_set_ip6_config ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@ip6_config: 
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_disconnect ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@err: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
deleted file mode 100644
index 8add56d4..00000000
--- a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
+++ /dev/null
@@ -1,112 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMWimaxNsp
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_WIMAX_NSP_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_WIMAX_NSP_SIGNAL_QUALITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_WIMAX_NSP_NETWORK_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMWimaxNspNetworkType ##### -->
-<para>
-
-</para>
-
-@NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN: 
-@NM_WIMAX_NSP_NETWORK_TYPE_HOME: 
-@NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: 
-@NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: 
-
-<!-- ##### FUNCTION nm_wimax_nsp_new ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_wimax_nsp_get_name ##### -->
-<para>
-
-</para>
-
-@nsp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_wimax_nsp_get_signal_quality ##### -->
-<para>
-
-</para>
-
-@nsp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_wimax_nsp_get_network_type ##### -->
-<para>
-
-</para>
-
-@nsp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_wimax_nsp_filter_connections ##### -->
-<para>
-
-</para>
-
-@nsp: 
-@connections: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_wimax_nsp_connection_valid ##### -->
-<para>
-
-</para>
-
-@nsp: 
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index 6d7de6e6..ee90284c 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-1.0.2
+1.0.4
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index db9c82eb..1d2ea506 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -142,6 +142,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -255,6 +256,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -478,6 +480,7 @@ GPATH = $(srcdir)
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
 SETUP_FILES = \
 	$(content_files)		\
+	$(expand_content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
@@ -485,9 +488,9 @@ SETUP_FILES = \
 
 # include common portion ...
 EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in
-DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	tmpl.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -522,11 +525,6 @@ GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
 GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
 
-#### templates ####
-GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V))
-GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_TMPL_0 = @echo "  DOC   Rebuilding template files";
-
 #### xml ####
 GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
 GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
@@ -763,18 +761,15 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
-	            destdir=`dirname $(abs_builddir)/$$file` ;\
+	            destdir=`dirname $(abs_builddir)/$$file`; \
 	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
 	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
-	    test -d $(abs_srcdir)/tmpl && \
-	        { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
-	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
 	$(AM_V_at)touch setup-build.stamp
 
@@ -787,7 +782,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$(?)" = "0"; then \
+	    if test "$$?" = "0"; then \
 	        if test "x$(V)" = "x1"; then \
 	            scanobj_options="--verbose"; \
 	        fi; \
@@ -804,23 +799,8 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	$(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	  if test -w $(abs_srcdir) ; then \
-	    cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
-	  fi \
-	fi
-	$(AM_V_at)touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	-$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
@@ -830,17 +810,17 @@ sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(
 sgml.stamp: sgml-build.stamp
 	@true
 
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkhtml_options="$$mkhtml_options --verbose"; \
 	  fi; \
 	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -856,11 +836,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp
 
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
 	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkpdf_options="$$mkpdf_options --verbose"; \
 	  fi; \
@@ -885,13 +865,15 @@ clean-local:
 	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
 	  rm -f $(DOC_MODULE).types; \
 	fi
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+	  rm -f $(DOC_MODULE)-sections.txt; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
-	    rm -rf tmpl; \
+	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local:
@@ -938,9 +920,7 @@ uninstall-local:
 @HAVE_GTK_DOC_FALSE@	@false
 
 dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
-	@mkdir $(distdir)/tmpl
 	@mkdir $(distdir)/html
-	@-cp ./tmpl/*.sgml $(distdir)/tmpl
 	@cp ./html/* $(distdir)/html
 	@-cp ./$(DOC_MODULE).pdf $(distdir)/
 	@-cp ./$(DOC_MODULE).types $(distdir)/
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 5c288a09..3ef46ffb 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMConnection</title>
+<title>NMConnection: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="ch01.html" title="libnm-util API Reference">
 <link rel="next" href="NMSetting.html" title="NMSetting">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -633,7 +633,6 @@ nm_connection_error_quark (<em class="parameter"><code><span class="type">void</
 <div class="refsect3">
 <a name="id-1.2.2.10.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -645,7 +644,6 @@ nm_connection_new (<em class="parameter"><code><span class="type">void</span></c
 <div class="refsect3">
 <a name="id-1.2.2.10.3.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -684,7 +682,6 @@ the connection. </p></td>
 <p> the new <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object, populated with settings created
 from the values in the hash table, or <code class="literal">NULL</code> if the connection failed to
 validate</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -918,7 +915,6 @@ nm_connection_replace_settings (<em class="parameter"><code><a class="link" href
 <a name="id-1.2.2.10.11.5"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the settings were valid and added to the connection, <code class="literal">FALSE</code>
 if they were not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -965,9 +961,8 @@ with</p></td>
 <a name="id-1.2.2.10.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the settings were valid and added to the connection, <code class="literal">FALSE</code>
 if they were not</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1009,7 +1004,6 @@ each flag's behavior.</p>
 <div class="refsect3">
 <a name="id-1.2.2.10.13.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the comparison succeeds, <code class="literal">FALSE</code> if it does not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1065,7 +1059,6 @@ differ mapped to one or more of <a class="link" href="NMSetting.html#NMSettingDi
 <a name="id-1.2.2.10.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connections contain the same values, <code class="literal">FALSE</code> if they do
 not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1108,7 +1101,6 @@ setting and which property failed validation, and how it failed validation.</p>
 <div class="refsect3">
 <a name="id-1.2.2.10.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection is valid, <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1167,9 +1159,8 @@ why the connection is invalid, if the function returns an error.</p></td>
 <div class="refsect3">
 <a name="id-1.2.2.10.16.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection is valid, <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
-<p class="since">Since 1.0</p>
+<p class="since">Since: 1.0</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1212,7 +1203,6 @@ elements. </p></td>
 <a name="id-1.2.2.10.17.6"></a><h4>Returns</h4>
 <p> the setting name of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object which has invalid or
 missing secrets</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1332,7 +1322,6 @@ string:<span class="type">GValue</span> of setting property names and secrets of
 <a name="id-1.2.2.10.20.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the secrets were successfully updated, <code class="literal">FALSE</code> if the update
 failed (tried to update secrets for a setting that doesn't exist, etc)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1393,7 +1382,6 @@ nm_connection_get_path (<em class="parameter"><code><a class="link" href="NMConn
 <a name="id-1.2.2.10.22.6"></a><h4>Returns</h4>
 <p> the D-Bus path of the connection, previously set by a call to
 <a class="link" href="NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()"><code class="function">nm_connection_set_path()</code></a>.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1423,7 +1411,6 @@ connection types, this function will return <code class="literal">NULL</code>.</
 <div class="refsect3">
 <a name="id-1.2.2.10.23.6"></a><h4>Returns</h4>
 <p> Name of the kernel interface or <code class="literal">NULL</code></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1454,9 +1441,8 @@ NetworkManager, this is the name of the created interface.</p>
 <div class="refsect3">
 <a name="id-1.2.2.10.24.7"></a><h4>Returns</h4>
 <p> Name of the kernel interface or <code class="literal">NULL</code></p>
-<p></p>
 </div>
-<p class="since">Since 1.0</p>
+<p class="since">Since: 1.0</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1496,7 +1482,6 @@ property of the connection and matches that against <em class="parameter"><code>
 <a name="id-1.2.2.10.25.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection is of the given <em class="parameter"><code>type</code></em>
 , <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1628,7 +1613,6 @@ nm_connection_lookup_setting_type (<em class="parameter"><code>const <span class
 <div class="refsect3">
 <a name="id-1.2.2.10.29.6"></a><h4>Returns</h4>
 <p> the <span class="type">GType</span> of the setting's class</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1657,7 +1641,6 @@ Useful for figuring out which setting a returned error is for.</p>
 <div class="refsect3">
 <a name="id-1.2.2.10.30.6"></a><h4>Returns</h4>
 <p> the <span class="type">GType</span> of the setting's class</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1684,7 +1667,6 @@ nm_connection_get_uuid (<em class="parameter"><code><a class="link" href="NMConn
 <div class="refsect3">
 <a name="id-1.2.2.10.31.6"></a><h4>Returns</h4>
 <p> the UUID from the connection's 'connection' setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1711,7 +1693,6 @@ nm_connection_get_id (<em class="parameter"><code><a class="link" href="NMConnec
 <div class="refsect3">
 <a name="id-1.2.2.10.32.6"></a><h4>Returns</h4>
 <p> the ID from the connection's 'connection' setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1738,9 +1719,8 @@ nm_connection_get_connection_type (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.2.2.10.33.6"></a><h4>Returns</h4>
 <p> the type from the connection's 'connection' setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1775,7 +1755,7 @@ or <code class="literal">NULL</code> if <em class="parameter"><code>connection</
 is not a virtual connection type. </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1884,7 +1864,7 @@ nm_connection_get_setting_team (<em class="parameter"><code><a class="link" href
 <p> an <a class="link" href="NMSettingTeam.html" title="NMSettingTeam"><span class="type">NMSettingTeam</span></a> if the connection contains one, otherwise <code class="literal">NULL</code>. </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1912,7 +1892,7 @@ nm_connection_get_setting_team_port (<em class="parameter"><code><a class="link"
 <p> an <a class="link" href="NMSettingTeamPort.html" title="NMSettingTeamPort"><span class="type">NMSettingTeamPort</span></a> if the connection contains one, otherwise <code class="literal">NULL</code>. </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2048,7 +2028,7 @@ nm_connection_get_setting_dcb (<em class="parameter"><code><a class="link" href=
 <p> an <a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="type">NMSettingDcb</span></a> if the connection contains one, otherwise NULL. </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2076,7 +2056,7 @@ nm_connection_get_setting_generic (<em class="parameter"><code><a class="link" h
 <p> an <a class="link" href="NMSettingGeneric.html" title="NMSettingGeneric"><span class="type">NMSettingGeneric</span></a> if the connection contains one, otherwise NULL. </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2491,32 +2471,24 @@ nm_connection_get_setting_vlan (<em class="parameter"><code><a class="link" href
 <a name="NM-CONNECTION-SECRETS-UPDATED:CAPS"></a><h3>NM_CONNECTION_SECRETS_UPDATED</h3>
 <pre class="programlisting">#define NM_CONNECTION_SECRETS_UPDATED "secrets-updated"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CONNECTION-SECRETS-CLEARED:CAPS"></a><h3>NM_CONNECTION_SECRETS_CLEARED</h3>
 <pre class="programlisting">#define NM_CONNECTION_SECRETS_CLEARED "secrets-cleared"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CONNECTION-CHANGED:CAPS"></a><h3>NM_CONNECTION_CHANGED</h3>
 <pre class="programlisting">#define NM_CONNECTION_CHANGED         "changed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CONNECTION-PATH:CAPS"></a><h3>NM_CONNECTION_PATH</h3>
 <pre class="programlisting">#define NM_CONNECTION_PATH "path"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2582,16 +2554,12 @@ nm_connection_get_setting_vlan (<em class="parameter"><code><a class="link" href
 <a name="NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS"></a><h3>NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD</h3>
 <pre class="programlisting">#define NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD "ip6-config-method"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CONNECTION-ERROR:CAPS"></a><h3>NM_CONNECTION_ERROR</h3>
 <pre class="programlisting">#define NM_CONNECTION_ERROR nm_connection_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2645,7 +2613,7 @@ or when settings are added or removed.</p>
 </table></div>
 </div>
 <p>Flags: Run First</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2721,7 +2689,6 @@ updated</p></td>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 140fac6a..3ce89683 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSetting</title>
+<title>NMSetting: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMConnection.html" title="NMConnection">
 <link rel="next" href="NMSettingConnection.html" title="NMSettingConnection">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -331,7 +331,6 @@ nm_setting_error_quark (<em class="parameter"><code><span class="type">void</spa
 <div class="refsect3">
 <a name="id-1.2.3.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for NMSetting errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -339,32 +338,24 @@ nm_setting_error_quark (<em class="parameter"><code><span class="type">void</spa
 <a name="NM-SETTING-PARAM-SERIALIZE:CAPS"></a><h3>NM_SETTING_PARAM_SERIALIZE</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_SERIALIZE    (1 &lt;&lt; (0 + G_PARAM_USER_SHIFT))
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PARAM-REQUIRED:CAPS"></a><h3>NM_SETTING_PARAM_REQUIRED</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_REQUIRED     (1 &lt;&lt; (1 + G_PARAM_USER_SHIFT))
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PARAM-SECRET:CAPS"></a><h3>NM_SETTING_PARAM_SECRET</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_SECRET       (1 &lt;&lt; (2 + G_PARAM_USER_SHIFT))
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PARAM-FUZZY-IGNORE:CAPS"></a><h3>NM_SETTING_PARAM_FUZZY_IGNORE</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_FUZZY_IGNORE (1 &lt;&lt; (3 + G_PARAM_USER_SHIFT))
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -409,7 +400,6 @@ nm_setting_error_quark (<em class="parameter"><code><span class="type">void</spa
 <div class="refsect3">
 <a name="id-1.2.3.9.7.5"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> to clear the secret, <code class="literal">FALSE</code> to not clear the secret</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -537,7 +527,6 @@ string to GValue mapping of properties that apply to the setting. </p></td>
 <a name="id-1.2.3.9.10.6"></a><h4>Returns</h4>
 <p> a new <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object populated with the properties from the
 hash table, or <code class="literal">NULL</code> on failure</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -593,7 +582,6 @@ nm_setting_get_name (<em class="parameter"><code><a class="link" href="NMSetting
 <a name="id-1.2.3.9.12.6"></a><h4>Returns</h4>
 <p> a string containing the type name of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object,
 like 'ppp' or 'wireless' or 'wired'.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -640,7 +628,6 @@ came. </p></td>
 <div class="refsect3">
 <a name="id-1.2.3.9.13.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the setting is valid, <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -683,7 +670,6 @@ for a description of each flag's behavior.</p>
 <div class="refsect3">
 <a name="id-1.2.3.9.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the comparison succeeds, <code class="literal">FALSE</code> if it does not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -746,7 +732,6 @@ in and the settings differ, a new one is created and returned. </p></td>
 <div class="refsect3">
 <a name="id-1.2.3.9.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the settings contain the same values, <code class="literal">FALSE</code> if they do not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -815,7 +800,6 @@ output format is not guaranteed to be stable and may change at any time.</p>
 <p> an allocated string containing a textual representation of the
 setting's properties and values (including secrets!), which the caller should
 free with <code class="function">g_free()</code></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -955,7 +939,6 @@ string to <span class="type">GValue</span> of setting property names and secrets
 <a name="id-1.2.3.9.21.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the secrets were successfully updated, <code class="literal">FALSE</code> on failure to
 update one or more of the secrets.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1004,7 +987,6 @@ handle that secret.</p>
 <a name="id-1.2.3.9.22.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success (if the given secret name was a valid property of
 this setting, and if that property is secret), <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1053,7 +1035,6 @@ handle that secret.</p>
 <a name="id-1.2.3.9.23.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success (if the given secret name was a valid property of
 this setting, and if that property is secret), <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1082,7 +1063,6 @@ needs to use if specified in the settings.</p>
 <a name="id-1.2.3.9.24.6"></a><h4>Returns</h4>
 <p> Name of the virtual interface or <code class="literal">NULL</code> if the setting does not
 support this feature</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -1141,16 +1121,12 @@ support this feature</p>
 <a name="NM-SETTING-ERROR:CAPS"></a><h3>NM_SETTING_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_ERROR nm_setting_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-NAME:CAPS"></a><h3>NM_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_NAME "name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1423,7 +1399,6 @@ example "ppp" or "wireless" or "wired".</p>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index ba9dbe10..05d9516c 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSetting8021x</title>
+<title>NMSetting8021x: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingDcb.html" title="NMSettingDcb">
 <link rel="next" href="NMSettingIP4Config.html" title="NMSettingIP4Config">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -968,7 +968,6 @@ nm_setting_802_1x_error_quark (<em class="parameter"><code><span class="type">vo
 <div class="refsect3">
 <a name="id-1.2.24.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -980,7 +979,6 @@ nm_setting_802_1x_new (<em class="parameter"><code><span class="type">void</span
 <div class="refsect3">
 <a name="id-1.2.24.9.3.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1011,7 +1009,6 @@ allowed EAP methods.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.4.6"></a><h4>Returns</h4>
 <p> the number of allowed EAP methods</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1048,7 +1045,6 @@ nm_setting_802_1x_get_eap_method (<em class="parameter"><code><a class="link" hr
 <a name="id-1.2.24.9.5.6"></a><h4>Returns</h4>
 <p> the name of the allowed EAP method at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1086,7 +1082,6 @@ allowed EAP methods.</p>
 <a name="id-1.2.24.9.6.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the EAP method was successfully added, <code class="literal">FALSE</code> if it was
 not a valid method or if it was already allowed.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1153,9 +1148,8 @@ nm_setting_802_1x_remove_eap_method_by_value
 <div class="refsect3">
 <a name="id-1.2.24.9.8.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the EAP method was founs and removed, <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1204,7 +1198,6 @@ authenticate the user.  Often this is a username or login name.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.10.6"></a><h4>Returns</h4>
 <p> the user identifier</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1235,7 +1228,6 @@ a secure form, if applicable for that EAP method.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.11.6"></a><h4>Returns</h4>
 <p> the anonymous identifier</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1262,7 +1254,6 @@ nm_setting_802_1x_get_pac_file (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.2.24.9.12.6"></a><h4>Returns</h4>
 <p> the PAC file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1294,7 +1285,6 @@ of these properties.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.13.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if a system CA certificate path should be used, <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1325,7 +1315,6 @@ certificates for verifying the network to client.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.14.6"></a><h4>Returns</h4>
 <p> the CA certificate directory path</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1356,7 +1345,6 @@ to add more CA certificates for verifying the network to client.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.15.6"></a><h4>Returns</h4>
 <p> the "phase 2" CA certificate directory path</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1385,7 +1373,6 @@ if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CA
 <div class="refsect3">
 <a name="id-1.2.24.9.16.6"></a><h4>Returns</h4>
 <p> scheme used to store the CA certificate (blob or path)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1417,7 +1404,6 @@ of the network cannot be confirmed by the client.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.17.6"></a><h4>Returns</h4>
 <p> the CA certificate data</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1449,7 +1435,6 @@ of the network cannot be confirmed by the client.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.18.6"></a><h4>Returns</h4>
 <p> path to the CA certificate file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1510,7 +1495,6 @@ clears the CA certificate.</p></td>
 <div class="refsect3">
 <a name="id-1.2.24.9.19.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the operation succeeded, <code class="literal">FALSE</code> if it was unsuccessful</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1539,7 +1523,6 @@ nm_setting_802_1x_get_subject_match (<em class="parameter"><code><a class="link"
 substring to be matched against the subject of the authentication
 server certificate, or <code class="literal">NULL</code> no subject verification is to be
 performed.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1568,7 +1551,6 @@ nm_setting_802_1x_get_num_altsubject_matches
 <div class="refsect3">
 <a name="id-1.2.24.9.21.6"></a><h4>Returns</h4>
 <p> the number of altsubject-matches entries.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1606,7 +1588,6 @@ nm_setting_802_1x_get_altsubject_match
 <a name="id-1.2.24.9.22.6"></a><h4>Returns</h4>
 <p> the altSubjectName match at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1645,7 +1626,6 @@ server is not verified.</p>
 <a name="id-1.2.24.9.23.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the alternative subject name match was
 successfully added, <code class="literal">FALSE</code> if it was already allowed.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1714,9 +1694,8 @@ nm_setting_802_1x_remove_altsubject_match_by_value
 <a name="id-1.2.24.9.25.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the alternative subject name match was found and removed,
 <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1768,7 +1747,6 @@ if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CA
 <div class="refsect3">
 <a name="id-1.2.24.9.27.6"></a><h4>Returns</h4>
 <p> scheme used to store the client certificate (blob or path)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1798,7 +1776,6 @@ authentication method.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.28.6"></a><h4>Returns</h4>
 <p> the client certificate data</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1828,7 +1805,6 @@ authentication method.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.29.6"></a><h4>Returns</h4>
 <p> path to the client certificate file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1893,7 +1869,6 @@ clears the client certificate.</p></td>
 <div class="refsect3">
 <a name="id-1.2.24.9.30.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the operation succeeded, <code class="literal">FALSE</code> if it was unsuccessful</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1921,7 +1896,6 @@ nm_setting_802_1x_get_phase1_peapver (<em class="parameter"><code><a class="link
 <p> the "phase 1" PEAP version to be used when authenticating with
 EAP-PEAP as contained in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peapver" title="The “phase1-peapver” property"><span class="type">“phase1-peapver”</span></a> property.  Valid
 values are <code class="literal">NULL</code> (unset), "0" (PEAP version 0), and "1" (PEAP version 1).</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1952,7 +1926,6 @@ used when authenticating with EAP-PEAP, as contained in the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel" title="The “phase1-peaplabel” property"><span class="type">“phase1-peaplabel”</span></a> property.  Valid values are <code class="literal">NULL</code> (unset),
 "0" (use old-style label), and "1" (use new-style label).  See the
 wpa_supplicant documentation for more details.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1981,7 +1954,6 @@ nm_setting_802_1x_get_phase1_fast_provisioning
 <p> whether "phase 1" PEAP fast provisioning should be used, as specified
 by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning" title="The “phase1-fast-provisioning” property"><span class="type">“phase1-fast-provisioning”</span></a> property.  See the
 wpa_supplicant documentation for more details.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2008,7 +1980,6 @@ nm_setting_802_1x_get_phase2_auth (<em class="parameter"><code><a class="link" h
 <a name="id-1.2.24.9.34.5"></a><h4>Returns</h4>
 <p> the "phase 2" non-EAP (ex MD5) allowed authentication method as
 specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title="The “phase2-auth” property"><span class="type">“phase2-auth”</span></a> property.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2035,7 +2006,6 @@ nm_setting_802_1x_get_phase2_autheap (<em class="parameter"><code><a class="link
 <a name="id-1.2.24.9.35.5"></a><h4>Returns</h4>
 <p> the "phase 2" EAP-based (ex TLS) allowed authentication method as
 specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title="The “phase2-autheap” property"><span class="type">“phase2-autheap”</span></a> property.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2066,7 +2036,6 @@ use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path
 <div class="refsect3">
 <a name="id-1.2.24.9.36.6"></a><h4>Returns</h4>
 <p> scheme used to store the "phase 2" CA certificate (blob or path)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2099,7 +2068,6 @@ of the network cannot be confirmed by the client.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.37.6"></a><h4>Returns</h4>
 <p> the "phase 2" CA certificate data</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2132,7 +2100,6 @@ of the network cannot be confirmed by the client.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.38.6"></a><h4>Returns</h4>
 <p> path to the "phase 2" CA certificate file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2193,7 +2160,6 @@ clears the "phase2" CA certificate.</p></td>
 <div class="refsect3">
 <a name="id-1.2.24.9.39.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the operation succeeded, <code class="literal">FALSE</code> if it was unsuccessful</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2223,7 +2189,6 @@ nm_setting_802_1x_get_phase2_subject_match
 the substring to be matched against the subject of the "phase 2"
 authentication server certificate, or <code class="literal">NULL</code> no subject verification
 is to be performed.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2252,7 +2217,6 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches
 <div class="refsect3">
 <a name="id-1.2.24.9.41.6"></a><h4>Returns</h4>
 <p> the number of phase2-altsubject-matches entries.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2290,7 +2254,6 @@ nm_setting_802_1x_get_phase2_altsubject_match
 <a name="id-1.2.24.9.42.6"></a><h4>Returns</h4>
 <p> the "phase 2" altSubjectName match at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2330,7 +2293,6 @@ connection</p></td>
 <a name="id-1.2.24.9.43.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the "phase 2" alternative subject name match was
 successfully added, <code class="literal">FALSE</code> if it was already allowed.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2399,9 +2361,8 @@ nm_setting_802_1x_remove_phase2_altsubject_match_by_value
 <a name="id-1.2.24.9.45.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the alternative subject name match for "phase 2" was found and removed,
 <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2455,7 +2416,6 @@ returned scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-C
 <div class="refsect3">
 <a name="id-1.2.24.9.47.6"></a><h4>Returns</h4>
 <p> scheme used to store the "phase 2" client certificate (blob or path)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2485,7 +2445,6 @@ authentication method.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.48.6"></a><h4>Returns</h4>
 <p> the "phase 2" client certificate data</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2515,7 +2474,6 @@ authentication method.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.49.6"></a><h4>Returns</h4>
 <p> path to the "phase 2" client certificate file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2581,7 +2539,6 @@ clears the "phase2" client certificate.</p></td>
 <div class="refsect3">
 <a name="id-1.2.24.9.50.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the operation succeeded, <code class="literal">FALSE</code> if it was unsuccessful</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2608,7 +2565,6 @@ nm_setting_802_1x_get_password (<em class="parameter"><code><a class="link" href
 <a name="id-1.2.24.9.51.5"></a><h4>Returns</h4>
 <p> the password used by the authentication method, if any, as specified
 by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a> property</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2634,7 +2590,6 @@ nm_setting_802_1x_get_password_flags (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.2.24.9.52.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2662,7 +2617,6 @@ nm_setting_802_1x_get_password_raw (<em class="parameter"><code><a class="link"
 <p> the password used by the authentication method as a
 UTF-8-encoded array of bytes, as specified by the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--password-raw" title="The “password-raw” property"><span class="type">“password-raw”</span></a> property</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2690,7 +2644,6 @@ nm_setting_802_1x_get_password_raw_flags
 <a name="id-1.2.24.9.54.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--password-raw" title="The “password-raw” property"><span class="type">“password-raw”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2717,7 +2670,6 @@ nm_setting_802_1x_get_pin (<em class="parameter"><code><a class="link" href="NMS
 <a name="id-1.2.24.9.55.5"></a><h4>Returns</h4>
 <p> the PIN used by the authentication method, if any, as specified
 by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--pin" title="The “pin” property"><span class="type">“pin”</span></a> property</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2744,7 +2696,6 @@ nm_setting_802_1x_get_pin_flags (<em class="parameter"><code><a class="link" hre
 <a name="id-1.2.24.9.56.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--pin" title="The “pin” property"><span class="type">“pin”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2776,7 +2727,6 @@ nm_setting_802_1x_get_private_key_scheme
 <div class="refsect3">
 <a name="id-1.2.24.9.57.6"></a><h4>Returns</h4>
 <p> scheme used to store the private key (blob or path)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2809,7 +2759,6 @@ keys should always be encrypted with a private key password.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.58.7"></a><h4>Returns</h4>
 <p> the private key data</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2839,7 +2788,6 @@ authentication method.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.59.6"></a><h4>Returns</h4>
 <p> path to the private key file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2927,7 +2875,6 @@ an error is returned.</p></td>
 <div class="refsect3">
 <a name="id-1.2.24.9.60.9"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the operation succeeded, <code class="literal">FALSE</code> if it was unsuccessful</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2956,7 +2903,6 @@ nm_setting_802_1x_get_private_key_password
 <p> the private key password used to decrypt the private key if
 previously set with <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a>, or the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title="The “private-key-password” property"><span class="type">“private-key-password”</span></a> property.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2984,7 +2930,6 @@ nm_setting_802_1x_get_private_key_password_flags
 <a name="id-1.2.24.9.62.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title="The “private-key-password” property"><span class="type">“private-key-password”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3012,7 +2957,6 @@ nm_setting_802_1x_get_private_key_format
 <a name="id-1.2.24.9.63.5"></a><h4>Returns</h4>
 <p> the data format of the private key data stored in the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title="The “private-key” property"><span class="type">“private-key”</span></a> property</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3044,7 +2988,6 @@ scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-
 <div class="refsect3">
 <a name="id-1.2.24.9.64.6"></a><h4>Returns</h4>
 <p> scheme used to store the "phase 2" private key (blob or path)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3077,7 +3020,6 @@ keys should always be encrypted with a private key password.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.65.7"></a><h4>Returns</h4>
 <p> the "phase 2" private key data</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3107,7 +3049,6 @@ authentication method.</p>
 <div class="refsect3">
 <a name="id-1.2.24.9.66.6"></a><h4>Returns</h4>
 <p> path to the "phase 2" private key file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3197,7 +3138,6 @@ an error is returned.</p></td>
 <div class="refsect3">
 <a name="id-1.2.24.9.67.9"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the operation succeeded, <code class="literal">FALSE</code> if it was unsuccessful</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3226,7 +3166,6 @@ nm_setting_802_1x_get_phase2_private_key_password
 <p> the private key password used to decrypt the private key if
 previously set with <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()"><code class="function">nm_setting_802_1x_set_phase2_private_key()</code></a> or the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title="The “phase2-private-key-password” property"><span class="type">“phase2-private-key-password”</span></a> property.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3254,7 +3193,6 @@ nm_setting_802_1x_get_phase2_private_key_password_flags
 <a name="id-1.2.24.9.69.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title="The “phase2-private-key-password” property"><span class="type">“phase2-private-key-password”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3282,7 +3220,6 @@ nm_setting_802_1x_get_phase2_private_key_format
 <a name="id-1.2.24.9.70.5"></a><h4>Returns</h4>
 <p> the data format of the "phase 2" private key data stored in the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title="The “phase2-private-key” property"><span class="type">“phase2-private-key”</span></a> property</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -3383,8 +3320,6 @@ to a file containing the certificate or key data</p>
 <a name="NM-SETTING-802-1X-SETTING-NAME:CAPS"></a><h3>NM_SETTING_802_1X_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -3429,264 +3364,198 @@ required</p>
 <a name="NM-SETTING-802-1X-ERROR:CAPS"></a><h3>NM_SETTING_802_1X_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-EAP:CAPS"></a><h3>NM_SETTING_802_1X_EAP</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_EAP "eap"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-IDENTITY:CAPS"></a><h3>NM_SETTING_802_1X_IDENTITY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_IDENTITY "identity"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-ANONYMOUS-IDENTITY:CAPS"></a><h3>NM_SETTING_802_1X_ANONYMOUS_IDENTITY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PAC-FILE:CAPS"></a><h3>NM_SETTING_802_1X_PAC_FILE</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PAC_FILE "pac-file"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-CA-CERT:CAPS"></a><h3>NM_SETTING_802_1X_CA_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_CA_CERT "ca-cert"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-CA-PATH:CAPS"></a><h3>NM_SETTING_802_1X_CA_PATH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_CA_PATH "ca-path"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-SUBJECT-MATCH:CAPS"></a><h3>NM_SETTING_802_1X_SUBJECT_MATCH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-ALTSUBJECT-MATCHES:CAPS"></a><h3>NM_SETTING_802_1X_ALTSUBJECT_MATCHES</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-CLIENT-CERT:CAPS"></a><h3>NM_SETTING_802_1X_CLIENT_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE1-PEAPVER:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_PEAPVER</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE1-PEAPLABEL:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_PEAPLABEL</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE1-FAST-PROVISIONING:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-AUTH:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_AUTH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-AUTHEAP:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_AUTHEAP</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-CA-CERT:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CA_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CA_PATH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-SUBJECT-MATCH:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-ALTSUBJECT-MATCHES:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CLIENT_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD "password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PASSWORD-RAW:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD_RAW</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD_RAW "password-raw"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PASSWORD-RAW-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD_RAW_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD_RAW_FLAGS "password-raw-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PRIVATE-KEY:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PIN:CAPS"></a><h3>NM_SETTING_802_1X_PIN</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PIN "pin"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PIN-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PIN_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS"></a><h3>NM_SETTING_802_1X_SYSTEM_CA_CERTS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -3694,14 +3563,18 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--altsubject-matches"></a><h3>The <code class="literal">“altsubject-matches”</code> property</h3>
 <pre class="programlisting">  “altsubject-matches”       <span class="type">GSList_gchararray_</span> *</pre>
-<p></p>
+<p>List of strings to be matched against the altSubjectName of the
+certificate presented by the authentication server. If the list is empty,
+no verification of the server certificate's altSubjectName is performed.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--anonymous-identity"></a><h3>The <code class="literal">“anonymous-identity”</code> property</h3>
 <pre class="programlisting">  “anonymous-identity”       <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Anonymous identity string for EAP authentication methods.  Used as the
+unencrypted identity with EAP types that support different tunneled
+identity like EAP-TTLS.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3709,14 +3582,27 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--ca-cert"></a><h3>The <code class="literal">“ca-cert”</code> property</h3>
 <pre class="programlisting">  “ca-cert”                  <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>Contains the CA certificate if used by the EAP method specified in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.</p>
+<p>Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte. This
+property can be unset even if the EAP method supports CA certificates,
+but this allows man-in-the-middle attacks and is NOT recommended.</p>
+<p>Setting this property directly is discouraged; use the
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert" title="nm_setting_802_1x_set_ca_cert ()"><code class="function">nm_setting_802_1x_set_ca_cert()</code></a> function instead.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--ca-path"></a><h3>The <code class="literal">“ca-path”</code> property</h3>
 <pre class="programlisting">  “ca-path”                  <span class="type">gchar</span> *</pre>
-<p></p>
+<p>UTF-8 encoded path to a directory containing PEM or DER formatted
+certificates to be added to the verification chain in addition to the
+certificate specified in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--ca-cert" title="The “ca-cert” property"><span class="type">“ca-cert”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3724,21 +3610,35 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--client-cert"></a><h3>The <code class="literal">“client-cert”</code> property</h3>
 <pre class="programlisting">  “client-cert”              <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>Contains the client certificate if used by the EAP method specified in
+the <a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.</p>
+<p>Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte.</p>
+<p>Setting this property directly is discouraged; use the
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert" title="nm_setting_802_1x_set_client_cert ()"><code class="function">nm_setting_802_1x_set_client_cert()</code></a> function instead.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--eap"></a><h3>The <code class="literal">“eap”</code> property</h3>
 <pre class="programlisting">  “eap”                      <span class="type">GSList_gchararray_</span> *</pre>
-<p></p>
+<p>The allowed EAP method to be used when authenticating to the network with
+802.1x.  Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd",
+and "fast".  Each method requires different configuration using the
+properties of this setting; refer to wpa_supplicant documentation for the
+allowed combinations.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--identity"></a><h3>The <code class="literal">“identity”</code> property</h3>
 <pre class="programlisting">  “identity”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Identity string for EAP authentication methods.  Often the user's user or
+login name.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3746,7 +3646,7 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--pac-file"></a><h3>The <code class="literal">“pac-file”</code> property</h3>
 <pre class="programlisting">  “pac-file”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>UTF-8 encoded file path containing PAC for EAP-FAST.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3754,7 +3654,9 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--password"></a><h3>The <code class="literal">“password”</code> property</h3>
 <pre class="programlisting">  “password”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>UTF-8 encoded password used for EAP authentication methods. If both the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a> property and the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password-raw" title="The “password-raw” property"><span class="type">“password-raw”</span></a>
+property are specified, <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a> is preferred.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3762,7 +3664,7 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--password-flags"></a><h3>The <code class="literal">“password-flags”</code> property</h3>
 <pre class="programlisting">  “password-flags”           <span class="type">guint</span></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -3771,14 +3673,17 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--password-raw"></a><h3>The <code class="literal">“password-raw”</code> property</h3>
 <pre class="programlisting">  “password-raw”             <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>Password used for EAP authentication methods, given as a byte array to
+allow passwords in other encodings than UTF-8 to be used. If both the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a> property and the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password-raw" title="The “password-raw” property"><span class="type">“password-raw”</span></a>
+property are specified, <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a> is preferred.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--password-raw-flags"></a><h3>The <code class="literal">“password-raw-flags”</code> property</h3>
 <pre class="programlisting">  “password-raw-flags”       <span class="type">guint</span></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password-raw" title="The “password-raw” property"><span class="type">“password-raw”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -3787,7 +3692,12 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase1-fast-provisioning"></a><h3>The <code class="literal">“phase1-fast-provisioning”</code> property</h3>
 <pre class="programlisting">  “phase1-fast-provisioning” <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Enables or disables in-line provisioning of EAP-FAST credentials when
+FAST is specified as the EAP method in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.
+Recognized values are "0" (disabled), "1" (allow unauthenticated
+provisioning), "2" (allow authenticated provisioning), and "3" (allow
+both authenticated and unauthenticated provisioning).  See the
+wpa_supplicant documentation for more details.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3795,7 +3705,10 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase1-peaplabel"></a><h3>The <code class="literal">“phase1-peaplabel”</code> property</h3>
 <pre class="programlisting">  “phase1-peaplabel”         <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Forces use of the new PEAP label during key derivation.  Some RADIUS
+servers may require forcing the new PEAP label to interoperate with
+PEAPv1.  Set to "1" to force use of the new PEAP label.  See the
+wpa_supplicant documentation for more details.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3803,7 +3716,12 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase1-peapver"></a><h3>The <code class="literal">“phase1-peapver”</code> property</h3>
 <pre class="programlisting">  “phase1-peapver”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Forces which PEAP version is used when PEAP is set as the EAP method in
+the <a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.  When unset, the version reported by
+the server will be used.  Sometimes when using older RADIUS servers, it
+is necessary to force the client to use a particular PEAP version.  To do
+so, this property may be set to "0" or "1" to force that specific PEAP
+version.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3811,14 +3729,22 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-altsubject-matches"></a><h3>The <code class="literal">“phase2-altsubject-matches”</code> property</h3>
 <pre class="programlisting">  “phase2-altsubject-matches” <span class="type">GSList_gchararray_</span> *</pre>
-<p></p>
+<p>List of strings to be matched against the altSubjectName of the
+certificate presented by the authentication server during the inner
+"phase 2" authentication. If the list is empty, no verification of the
+server certificate's altSubjectName is performed.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-auth"></a><h3>The <code class="literal">“phase2-auth”</code> property</h3>
 <pre class="programlisting">  “phase2-auth”              <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Specifies the allowed "phase 2" inner non-EAP authentication methods when
+an EAP method that uses an inner TLS tunnel is specified in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.  Recognized non-EAP "phase 2" methods are
+"pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls".
+Each "phase 2" inner method requires specific parameters for successful
+authentication; see the wpa_supplicant documentation for more details.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3826,7 +3752,12 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-autheap"></a><h3>The <code class="literal">“phase2-autheap”</code> property</h3>
 <pre class="programlisting">  “phase2-autheap”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Specifies the allowed "phase 2" inner EAP-based authentication methods
+when an EAP method that uses an inner TLS tunnel is specified in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.  Recognized EAP-based "phase 2" methods are
+"md5", "mschapv2", "otp", "gtc", and "tls". Each "phase 2" inner method
+requires specific parameters for successful authentication; see the
+wpa_supplicant documentation for more details.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3834,14 +3765,28 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-ca-cert"></a><h3>The <code class="literal">“phase2-ca-cert”</code> property</h3>
 <pre class="programlisting">  “phase2-ca-cert”           <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>Contains the "phase 2" CA certificate if used by the EAP method specified
+in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title="The “phase2-auth” property"><span class="type">“phase2-auth”</span></a> or <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title="The “phase2-autheap” property"><span class="type">“phase2-autheap”</span></a>
+properties.</p>
+<p>Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte. This
+property can be unset even if the EAP method supports CA certificates,
+but this allows man-in-the-middle attacks and is NOT recommended.</p>
+<p>Setting this property directly is discouraged; use the
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert" title="nm_setting_802_1x_set_phase2_ca_cert ()"><code class="function">nm_setting_802_1x_set_phase2_ca_cert()</code></a> function instead.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-ca-path"></a><h3>The <code class="literal">“phase2-ca-path”</code> property</h3>
 <pre class="programlisting">  “phase2-ca-path”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>UTF-8 encoded path to a directory containing PEM or DER formatted
+certificates to be added to the verification chain in addition to the
+certificate specified in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-ca-cert" title="The “phase2-ca-cert” property"><span class="type">“phase2-ca-cert”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3849,21 +3794,56 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-client-cert"></a><h3>The <code class="literal">“phase2-client-cert”</code> property</h3>
 <pre class="programlisting">  “phase2-client-cert”       <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>Contains the "phase 2" client certificate if used by the EAP method
+specified in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title="The “phase2-auth” property"><span class="type">“phase2-auth”</span></a> or
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title="The “phase2-autheap” property"><span class="type">“phase2-autheap”</span></a> properties.</p>
+<p>Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte. This
+property can be unset even if the EAP method supports CA certificates,
+but this allows man-in-the-middle attacks and is NOT recommended.</p>
+<p>Setting this property directly is discouraged; use the
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert" title="nm_setting_802_1x_set_phase2_client_cert ()"><code class="function">nm_setting_802_1x_set_phase2_client_cert()</code></a> function instead.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-private-key"></a><h3>The <code class="literal">“phase2-private-key”</code> property</h3>
 <pre class="programlisting">  “phase2-private-key”       <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>Contains the "phase 2" inner private key when the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title="The “phase2-auth” property"><span class="type">“phase2-auth”</span></a> or <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title="The “phase2-autheap” property"><span class="type">“phase2-autheap”</span></a> property is
+set to "tls".</p>
+<p>Key data is specified using a "scheme"; two are currently supported: blob
+and path. When using the blob scheme and private keys, this property
+should be set to the key's encrypted PEM encoded data. When using private
+keys with the path scheme, this property should be set to the full UTF-8
+encoded path of the key, prefixed with the string "file://" and ending
+with a terminating NUL byte. When using PKCS#12 format private keys and
+the blob scheme, this property should be set to the PKCS#12 data and the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title="The “phase2-private-key-password” property"><span class="type">“phase2-private-key-password”</span></a> property must be set to
+password used to decrypt the PKCS#12 certificate and key. When using
+PKCS#12 files and the path scheme, this property should be set to the
+full UTF-8 encoded path of the key, prefixed with the string "file://"
+and and ending with a terminating NUL byte, and as with the blob scheme
+the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title="The “phase2-private-key-password” property"><span class="type">“phase2-private-key-password”</span></a> property must be set to
+the password used to decode the PKCS#12 private key and certificate.</p>
+<p>Setting this property directly is discouraged; use the
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()"><code class="function">nm_setting_802_1x_set_phase2_private_key()</code></a> function instead.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-private-key-password"></a><h3>The <code class="literal">“phase2-private-key-password”</code> property</h3>
 <pre class="programlisting">  “phase2-private-key-password” <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The password used to decrypt the "phase 2" private key specified in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title="The “phase2-private-key” property"><span class="type">“phase2-private-key”</span></a> property when the private key either
+uses the path scheme, or is a PKCS#12 format key.  Setting this property
+directly is not generally necessary except when returning secrets to
+NetworkManager; it is generally set automatically when setting the
+private key by the <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()"><code class="function">nm_setting_802_1x_set_phase2_private_key()</code></a> function.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3871,7 +3851,8 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-private-key-password-flags"></a><h3>The <code class="literal">“phase2-private-key-password-flags”</code> property</h3>
 <pre class="programlisting">  “phase2-private-key-password-flags” <span class="type">guint</span></pre>
-<p></p>
+<p>Flags indicating how to handle the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title="The “phase2-private-key-password” property"><span class="type">“phase2-private-key-password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -3880,7 +3861,10 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-subject-match"></a><h3>The <code class="literal">“phase2-subject-match”</code> property</h3>
 <pre class="programlisting">  “phase2-subject-match”     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Substring to be matched against the subject of the certificate presented
+by the authentication server during the inner "phase 2"
+authentication. When unset, no verification of the authentication server
+certificate's subject is performed.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3888,7 +3872,7 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--pin"></a><h3>The <code class="literal">“pin”</code> property</h3>
 <pre class="programlisting">  “pin”                      <span class="type">gchar</span> *</pre>
-<p></p>
+<p>PIN used for EAP authentication methods.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3896,7 +3880,7 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--pin-flags"></a><h3>The <code class="literal">“pin-flags”</code> property</h3>
 <pre class="programlisting">  “pin-flags”                <span class="type">guint</span></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSetting8021x.html#NMSetting8021x--pin" title="The “pin” property"><span class="type">“pin”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -3905,14 +3889,41 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--private-key"></a><h3>The <code class="literal">“private-key”</code> property</h3>
 <pre class="programlisting">  “private-key”              <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>Contains the private key when the <a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property is set to
+"tls".</p>
+<p>Key data is specified using a "scheme"; two are currently supported: blob
+and path. When using the blob scheme and private keys, this property
+should be set to the key's encrypted PEM encoded data. When using private
+keys with the path scheme, this property should be set to the full UTF-8
+encoded path of the key, prefixed with the string "file://" and ending
+with a terminating NUL byte. When using PKCS#12 format private keys and
+the blob scheme, this property should be set to the PKCS#12 data and the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title="The “private-key-password” property"><span class="type">“private-key-password”</span></a> property must be set to password
+used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files
+and the path scheme, this property should be set to the full UTF-8
+encoded path of the key, prefixed with the string "file://" and and
+ending with a terminating NUL byte, and as with the blob scheme the
+"private-key-password" property must be set to the password used to
+decode the PKCS#12 private key and certificate.</p>
+<p>Setting this property directly is discouraged; use the
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a> function instead.</p>
+<p>WARNING: <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title="The “private-key” property"><span class="type">“private-key”</span></a> is not a "secret" property, and thus
+unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a
+private key password to prevent unauthorized access to unencrypted
+private key data.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--private-key-password"></a><h3>The <code class="literal">“private-key-password”</code> property</h3>
 <pre class="programlisting">  “private-key-password”     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The password used to decrypt the private key specified in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title="The “private-key” property"><span class="type">“private-key”</span></a> property when the private key either uses the
+path scheme, or if the private key is a PKCS#12 format key.  Setting this
+property directly is not generally necessary except when returning
+secrets to NetworkManager; it is generally set automatically when setting
+the private key by the <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a> function.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3920,7 +3931,8 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--private-key-password-flags"></a><h3>The <code class="literal">“private-key-password-flags”</code> property</h3>
 <pre class="programlisting">  “private-key-password-flags” <span class="type">guint</span></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title="The “private-key-password” property"><span class="type">“private-key-password”</span></a>
+property.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -3929,7 +3941,9 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--subject-match"></a><h3>The <code class="literal">“subject-match”</code> property</h3>
 <pre class="programlisting">  “subject-match”            <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Substring to be matched against the subject of the certificate presented
+by the authentication server. When unset, no verification of the
+authentication server certificate's subject is performed.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3937,14 +3951,18 @@ required</p>
 <div class="refsect2">
 <a name="NMSetting8021x--system-ca-certs"></a><h3>The <code class="literal">“system-ca-certs”</code> property</h3>
 <pre class="programlisting">  “system-ca-certs”          <span class="type">gboolean</span></pre>
-<p></p>
+<p>When <code class="literal">TRUE</code>, overrides the <a class="link" href="NMSetting8021x.html#NMSetting8021x--ca-path" title="The “ca-path” property"><span class="type">“ca-path”</span></a> and
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-ca-path" title="The “phase2-ca-path” property"><span class="type">“phase2-ca-path”</span></a> properties using the system CA directory
+specified at configure time with the --system-ca-path switch.  The
+certificates in this directory are added to the verification chain in
+addition to any certificates specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--ca-cert" title="The “ca-cert” property"><span class="type">“ca-cert”</span></a> and
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-ca-cert" title="The “phase2-ca-cert” property"><span class="type">“phase2-ca-cert”</span></a> properties.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html
index 3b2aef23..165177b5 100644
--- a/docs/libnm-util/html/NMSettingAdsl.html
+++ b/docs/libnm-util/html/NMSettingAdsl.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingAdsl</title>
+<title>NMSettingAdsl: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
 <link rel="next" href="NMSettingDcb.html" title="NMSettingDcb">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -263,7 +263,6 @@ nm_setting_adsl_error_quark (<em class="parameter"><code><span class="type">void
 <div class="refsect3">
 <a name="id-1.2.22.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -275,7 +274,6 @@ nm_setting_adsl_new (<em class="parameter"><code><span class="type">void</span><
 <div class="refsect3">
 <a name="id-1.2.22.9.3.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -301,7 +299,6 @@ nm_setting_adsl_get_username (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.22.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--username" title="The “username” property"><span class="type">“username”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -327,7 +324,6 @@ nm_setting_adsl_get_password (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.22.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--password" title="The “password” property"><span class="type">“password”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -353,7 +349,6 @@ nm_setting_adsl_get_protocol (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.22.9.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--protocol" title="The “protocol” property"><span class="type">“protocol”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -379,7 +374,6 @@ nm_setting_adsl_get_encapsulation (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.2.22.9.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--encapsulation" title="The “encapsulation” property"><span class="type">“encapsulation”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -405,7 +399,6 @@ nm_setting_adsl_get_vpi (<em class="parameter"><code><a class="link" href="NMSet
 <div class="refsect3">
 <a name="id-1.2.22.9.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--vpi" title="The “vpi” property"><span class="type">“vpi”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -431,7 +424,6 @@ nm_setting_adsl_get_vci (<em class="parameter"><code><a class="link" href="NMSet
 <div class="refsect3">
 <a name="id-1.2.22.9.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--vci" title="The “vci” property"><span class="type">“vci”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -457,7 +449,6 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.22.9.10.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--password" title="The “password” property"><span class="type">“password”</span></a></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -467,8 +458,6 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 <a name="NM-SETTING-ADSL-SETTING-NAME:CAPS"></a><h3>NM_SETTING_ADSL_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_SETTING_NAME "adsl"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -513,104 +502,78 @@ required</p>
 <a name="NM-SETTING-ADSL-ERROR:CAPS"></a><h3>NM_SETTING_ADSL_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_ERROR nm_setting_adsl_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-USERNAME:CAPS"></a><h3>NM_SETTING_ADSL_USERNAME</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_USERNAME            "username"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-PASSWORD:CAPS"></a><h3>NM_SETTING_ADSL_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_PASSWORD            "password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_ADSL_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_PASSWORD_FLAGS      "password-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-PROTOCOL:CAPS"></a><h3>NM_SETTING_ADSL_PROTOCOL</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_PROTOCOL            "protocol"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-ENCAPSULATION:CAPS"></a><h3>NM_SETTING_ADSL_ENCAPSULATION</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_ENCAPSULATION       "encapsulation"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-VPI:CAPS"></a><h3>NM_SETTING_ADSL_VPI</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_VPI                 "vpi"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-VCI:CAPS"></a><h3>NM_SETTING_ADSL_VCI</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_VCI                 "vci"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-PROTOCOL-PPPOA:CAPS"></a><h3>NM_SETTING_ADSL_PROTOCOL_PPPOA</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_PROTOCOL_PPPOA      "pppoa"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-PROTOCOL-PPPOE:CAPS"></a><h3>NM_SETTING_ADSL_PROTOCOL_PPPOE</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_PROTOCOL_PPPOE      "pppoe"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-PROTOCOL-IPOATM:CAPS"></a><h3>NM_SETTING_ADSL_PROTOCOL_IPOATM</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_PROTOCOL_IPOATM     "ipoatm"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-ENCAPSULATION-VCMUX:CAPS"></a><h3>NM_SETTING_ADSL_ENCAPSULATION_VCMUX</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-ENCAPSULATION-LLC:CAPS"></a><h3>NM_SETTING_ADSL_ENCAPSULATION_LLC</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_ENCAPSULATION_LLC   "llc"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -618,7 +581,7 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingAdsl--encapsulation"></a><h3>The <code class="literal">“encapsulation”</code> property</h3>
 <pre class="programlisting">  “encapsulation”            <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Encapsulation of ADSL connection.  Can be "vcmux" or "llc".</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -626,7 +589,7 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingAdsl--password"></a><h3>The <code class="literal">“password”</code> property</h3>
 <pre class="programlisting">  “password”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Password used to authenticate with the ADSL service.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -634,7 +597,7 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingAdsl--password-flags"></a><h3>The <code class="literal">“password-flags”</code> property</h3>
 <pre class="programlisting">  “password-flags”           <span class="type">guint</span></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--password" title="The “password” property"><span class="type">“password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -643,7 +606,7 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingAdsl--protocol"></a><h3>The <code class="literal">“protocol”</code> property</h3>
 <pre class="programlisting">  “protocol”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>ADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -651,7 +614,7 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingAdsl--username"></a><h3>The <code class="literal">“username”</code> property</h3>
 <pre class="programlisting">  “username”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Username used to authenticate with the ADSL service.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -659,7 +622,7 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingAdsl--vci"></a><h3>The <code class="literal">“vci”</code> property</h3>
 <pre class="programlisting">  “vci”                      <span class="type">guint</span></pre>
-<p></p>
+<p>VCI of ADSL connection</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 65536</p>
 <p>Default value: 0</p>
@@ -668,7 +631,7 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingAdsl--vpi"></a><h3>The <code class="literal">“vpi”</code> property</h3>
 <pre class="programlisting">  “vpi”                      <span class="type">guint</span></pre>
-<p></p>
+<p>VPI of ADSL connection</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 65536</p>
 <p>Default value: 0</p>
@@ -676,7 +639,6 @@ required</p>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index cf501a32..b011f98f 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingBluetooth</title>
+<title>NMSettingBluetooth: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
 <link rel="next" href="NMSettingSerial.html" title="NMSettingSerial">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -168,7 +168,6 @@ nm_setting_bluetooth_error_quark (<em class="parameter"><code><span class="type"
 <div class="refsect3">
 <a name="id-1.2.8.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="type">NMSettingBluetooth</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -208,7 +207,6 @@ describes a connection to.</p>
 <div class="refsect3">
 <a name="id-1.2.8.9.4.6"></a><h4>Returns</h4>
 <p> the Bluetooth address</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -238,7 +236,6 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).</p>
 <a name="id-1.2.8.9.5.6"></a><h4>Returns</h4>
 <p> the type, either <a class="link" href="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-TYPE-PANU:CAPS" title="NM_SETTING_BLUETOOTH_TYPE_PANU"><code class="literal">NM_SETTING_BLUETOOTH_TYPE_PANU</code></a> or
 <a class="link" href="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-TYPE-DUN:CAPS" title="NM_SETTING_BLUETOOTH_TYPE_DUN"><code class="literal">NM_SETTING_BLUETOOTH_TYPE_DUN</code></a></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -248,8 +245,6 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).</p>
 <a name="NM-SETTING-BLUETOOTH-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BLUETOOTH_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -303,24 +298,18 @@ must also contain an <a class="link" href="NMSettingGsm.html" title="NMSettingGs
 <a name="NM-SETTING-BLUETOOTH-ERROR:CAPS"></a><h3>NM_SETTING_BLUETOOTH_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-BDADDR:CAPS"></a><h3>NM_SETTING_BLUETOOTH_BDADDR</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-TYPE:CAPS"></a><h3>NM_SETTING_BLUETOOTH_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_TYPE      "type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -344,21 +333,21 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.</p>
 <div class="refsect2">
 <a name="NMSettingBluetooth--bdaddr"></a><h3>The <code class="literal">“bdaddr”</code> property</h3>
 <pre class="programlisting">  “bdaddr”                   <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>The Bluetooth address of the device.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingBluetooth--type"></a><h3>The <code class="literal">“type”</code> property</h3>
 <pre class="programlisting">  “type”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Either "dun" for Dial-Up Networking connections or "panu" for Personal
+Area Networking connections to devices supporting the NAP profile.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index f0dae1ec..8d0e4d48 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingBond</title>
+<title>NMSettingBond: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWimax.html" title="NMSettingWimax">
 <link rel="next" href="NMSettingBridge.html" title="NMSettingBridge">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -271,7 +271,6 @@ nm_setting_bond_error_quark (<em class="parameter"><code><span class="type">void
 <div class="refsect3">
 <a name="id-1.2.13.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingBond.html" title="NMSettingBond"><span class="type">NMSettingBond</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -309,7 +308,6 @@ nm_setting_bond_get_interface_name (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.13.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBond.html#NMSettingBond--interface-name" title="The “interface-name” property"><span class="type">“interface-name”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -338,7 +336,6 @@ using <a class="link" href="NMSettingBond.html#nm-setting-bond-get-option" title
 <div class="refsect3">
 <a name="id-1.2.13.9.5.6"></a><h4>Returns</h4>
 <p> the number of bonding options</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -394,7 +391,6 @@ option; this value is owned by the setting and should not be modified. </p></td>
 <p> <code class="literal">TRUE</code> on success if the index was valid and an option was found,
 <code class="literal">FALSE</code> if the index was invalid (ie, greater than the number of options
 currently held by the setting)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -432,7 +428,6 @@ nm_setting_bond_get_option_by_name (<em class="parameter"><code><a class="link"
 <a name="id-1.2.13.9.7.6"></a><h4>Returns</h4>
 <p> the value, or <code class="literal">NULL</code> if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -479,7 +474,6 @@ that conflict with each other.</p>
 <a name="id-1.2.13.9.8.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the option was valid and was added to the internal option
 list, <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -517,7 +511,6 @@ list.</p>
 <a name="id-1.2.13.9.9.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the option was found and removed from the internal option
 list, <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -560,9 +553,8 @@ the <em class="parameter"><code>name</code></em>
 is valid for the given name.
 If the <em class="parameter"><code>name</code></em>
 is not a valid option, <code class="literal">FALSE</code> will be returned.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -623,7 +615,6 @@ nm_setting_bond_get_option_default (<em class="parameter"><code><a class="link"
 <a name="id-1.2.13.9.12.5"></a><h4>Returns</h4>
 <p> the value of the bond option if not overridden by an entry in
 the <a class="link" href="NMSettingBond.html#NMSettingBond--options" title="The “options” property"><span class="type">“options”</span></a> property.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -633,8 +624,6 @@ the <a class="link" href="NMSettingBond.html#NMSettingBond--options" title="The
 <a name="NM-SETTING-BOND-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BOND_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_SETTING_NAME "bond"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -672,13 +661,13 @@ required</p>
 </tr>
 <tr>
 <td class="enum_member_name"><p><a name="NM-SETTING-BOND-ERROR-INVALID-OPTION:CAPS"></a>NM_SETTING_BOND_ERROR_INVALID_OPTION</p></td>
-<td class="enum_member_description"> </td>
-<td class="enum_member_annotations"> </td>
+<td> </td>
+<td> </td>
 </tr>
 <tr>
 <td class="enum_member_name"><p><a name="NM-SETTING-BOND-ERROR-MISSING-OPTION:CAPS"></a>NM_SETTING_BOND_ERROR_MISSING_OPTION</p></td>
-<td class="enum_member_description"> </td>
-<td class="enum_member_annotations"> </td>
+<td> </td>
+<td> </td>
 </tr>
 </tbody>
 </table></div>
@@ -689,144 +678,108 @@ required</p>
 <a name="NM-SETTING-BOND-ERROR:CAPS"></a><h3>NM_SETTING_BOND_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_ERROR nm_setting_bond_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-INTERFACE-NAME:CAPS"></a><h3>NM_SETTING_BOND_INTERFACE_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_INTERFACE_NAME "interface-name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTIONS:CAPS"></a><h3>NM_SETTING_BOND_OPTIONS</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTIONS "options"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-MODE:CAPS"></a><h3>NM_SETTING_BOND_OPTION_MODE</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_MODE             "mode"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-MIIMON:CAPS"></a><h3>NM_SETTING_BOND_OPTION_MIIMON</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_MIIMON           "miimon"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-DOWNDELAY:CAPS"></a><h3>NM_SETTING_BOND_OPTION_DOWNDELAY</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_DOWNDELAY        "downdelay"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-UPDELAY:CAPS"></a><h3>NM_SETTING_BOND_OPTION_UPDELAY</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_UPDELAY          "updelay"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-ARP-INTERVAL:CAPS"></a><h3>NM_SETTING_BOND_OPTION_ARP_INTERVAL</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_ARP_INTERVAL     "arp_interval"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-ARP-IP-TARGET:CAPS"></a><h3>NM_SETTING_BOND_OPTION_ARP_IP_TARGET</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET    "arp_ip_target"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-ARP-VALIDATE:CAPS"></a><h3>NM_SETTING_BOND_OPTION_ARP_VALIDATE</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_ARP_VALIDATE     "arp_validate"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-PRIMARY:CAPS"></a><h3>NM_SETTING_BOND_OPTION_PRIMARY</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_PRIMARY          "primary"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-PRIMARY-RESELECT:CAPS"></a><h3>NM_SETTING_BOND_OPTION_PRIMARY_RESELECT</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_PRIMARY_RESELECT "primary_reselect"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-FAIL-OVER-MAC:CAPS"></a><h3>NM_SETTING_BOND_OPTION_FAIL_OVER_MAC</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_FAIL_OVER_MAC    "fail_over_mac"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-USE-CARRIER:CAPS"></a><h3>NM_SETTING_BOND_OPTION_USE_CARRIER</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_USE_CARRIER      "use_carrier"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-AD-SELECT:CAPS"></a><h3>NM_SETTING_BOND_OPTION_AD_SELECT</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_AD_SELECT        "ad_select"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-XMIT-HASH-POLICY:CAPS"></a><h3>NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY "xmit_hash_policy"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-RESEND-IGMP:CAPS"></a><h3>NM_SETTING_BOND_OPTION_RESEND_IGMP</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_RESEND_IGMP      "resend_igmp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-LACP-RATE:CAPS"></a><h3>NM_SETTING_BOND_OPTION_LACP_RATE</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_LACP_RATE        "lacp_rate"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -834,7 +787,7 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingBond--interface-name"></a><h3>The <code class="literal">“interface-name”</code> property</h3>
 <pre class="programlisting">  “interface-name”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The name of the virtual in-kernel bonding network interface</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -842,13 +795,14 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingBond--options"></a><h3>The <code class="literal">“options”</code> property</h3>
 <pre class="programlisting">  “options”                  <span class="type">GHashTable_gchararray+gchararray_*</span></pre>
-<p></p>
+<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>Flags: Read / Write</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
index a3292475..71cdd58f 100644
--- a/docs/libnm-util/html/NMSettingBridge.html
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingBridge</title>
+<title>NMSettingBridge: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingBond.html" title="NMSettingBond">
 <link rel="next" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -260,9 +260,8 @@ nm_setting_bridge_error_quark (<em class="parameter"><code><span class="type">vo
 <div class="refsect3">
 <a name="id-1.2.14.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> errors.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -275,7 +274,7 @@ nm_setting_bridge_new (<em class="parameter"><code><span class="type">void</span
 <p> the new empty <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</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 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -300,9 +299,8 @@ nm_setting_bridge_get_interface_name (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.2.14.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--interface-name" title="The “interface-name” property"><span class="type">“interface-name”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -327,9 +325,8 @@ nm_setting_bridge_get_mac_address (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.2.14.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -354,9 +351,8 @@ nm_setting_bridge_get_stp (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="id-1.2.14.9.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--stp" title="The “stp” property"><span class="type">“stp”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -381,9 +377,8 @@ nm_setting_bridge_get_priority (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.2.14.9.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--priority" title="The “priority” property"><span class="type">“priority”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -408,9 +403,8 @@ nm_setting_bridge_get_forward_delay (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.14.9.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--forward-delay" title="The “forward-delay” property"><span class="type">“forward-delay”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -435,9 +429,8 @@ nm_setting_bridge_get_hello_time (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.2.14.9.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--hello-time" title="The “hello-time” property"><span class="type">“hello-time”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -462,9 +455,8 @@ nm_setting_bridge_get_max_age (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.2.14.9.10.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--max-age" title="The “max-age” property"><span class="type">“max-age”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -489,9 +481,8 @@ nm_setting_bridge_get_ageing_time (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.2.14.9.11.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--ageing-time" title="The “ageing-time” property"><span class="type">“ageing-time”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 </div>
 <div class="refsect1">
@@ -500,8 +491,6 @@ nm_setting_bridge_get_ageing_time (<em class="parameter"><code><a class="link" h
 <a name="NM-SETTING-BRIDGE-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BRIDGE_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -540,79 +529,61 @@ required</p>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-ERROR:CAPS"></a><h3>NM_SETTING_BRIDGE_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_ERROR nm_setting_bridge_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-INTERFACE-NAME:CAPS"></a><h3>NM_SETTING_BRIDGE_INTERFACE_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_INTERFACE_NAME "interface-name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_BRIDGE_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_MAC_ADDRESS    "mac-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-STP:CAPS"></a><h3>NM_SETTING_BRIDGE_STP</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_STP            "stp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-PRIORITY:CAPS"></a><h3>NM_SETTING_BRIDGE_PRIORITY</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_PRIORITY       "priority"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-FORWARD-DELAY:CAPS"></a><h3>NM_SETTING_BRIDGE_FORWARD_DELAY</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-HELLO-TIME:CAPS"></a><h3>NM_SETTING_BRIDGE_HELLO_TIME</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-MAX-AGE:CAPS"></a><h3>NM_SETTING_BRIDGE_MAX_AGE</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_MAX_AGE        "max-age"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-AGEING-TIME:CAPS"></a><h3>NM_SETTING_BRIDGE_AGEING_TIME</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -620,82 +591,85 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingBridge--ageing-time"></a><h3>The <code class="literal">“ageing-time”</code> property</h3>
 <pre class="programlisting">  “ageing-time”              <span class="type">guint</span></pre>
-<p></p>
+<p>The Ethernet MAC address aging time, in seconds.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 1000000</p>
 <p>Default value: 300</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingBridge--forward-delay"></a><h3>The <code class="literal">“forward-delay”</code> property</h3>
 <pre class="programlisting">  “forward-delay”            <span class="type">guint</span></pre>
-<p></p>
+<p>The Spanning Tree Protocol (STP) forwarding delay, in seconds.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 30</p>
 <p>Default value: 15</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingBridge--hello-time"></a><h3>The <code class="literal">“hello-time”</code> property</h3>
 <pre class="programlisting">  “hello-time”               <span class="type">guint</span></pre>
-<p></p>
+<p>The Spanning Tree Protocol (STP) hello time, in seconds.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 10</p>
 <p>Default value: 2</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingBridge--interface-name"></a><h3>The <code class="literal">“interface-name”</code> property</h3>
 <pre class="programlisting">  “interface-name”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The name of the virtual in-kernel bridging network interface</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingBridge--mac-address"></a><h3>The <code class="literal">“mac-address”</code> property</h3>
 <pre class="programlisting">  “mac-address”              <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>If specified, the MAC address of bridge. When creating a new bridge, this
+MAC address will be set. When matching an existing (outside
+NetworkManager created) bridge, this MAC address must match.</p>
 <p>Flags: Read / Write</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingBridge--max-age"></a><h3>The <code class="literal">“max-age”</code> property</h3>
 <pre class="programlisting">  “max-age”                  <span class="type">guint</span></pre>
-<p></p>
+<p>The Spanning Tree Protocol (STP) maximum message age, in seconds.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 40</p>
 <p>Default value: 20</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingBridge--priority"></a><h3>The <code class="literal">“priority”</code> property</h3>
 <pre class="programlisting">  “priority”                 <span class="type">guint</span></pre>
-<p></p>
+<p>Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower
+values are "better"; the lowest priority bridge will be elected the root
+bridge.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 65535</p>
 <p>Default value: 32768</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingBridge--stp"></a><h3>The <code class="literal">“stp”</code> property</h3>
 <pre class="programlisting">  “stp”                      <span class="type">gboolean</span></pre>
-<p></p>
+<p>Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
index 00f8ce21..bc204181 100644
--- a/docs/libnm-util/html/NMSettingBridgePort.html
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingBridgePort</title>
+<title>NMSettingBridgePort: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingBridge.html" title="NMSettingBridge">
 <link rel="next" href="NMSettingTeam.html" title="NMSettingTeam">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -175,9 +175,8 @@ nm_setting_bridge_port_error_quark (<em class="parameter"><code><span class="typ
 <div class="refsect3">
 <a name="id-1.2.15.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> errors.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -190,7 +189,7 @@ nm_setting_bridge_port_new (<em class="parameter"><code><span class="type">void<
 <p> the new empty <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</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 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -215,9 +214,8 @@ nm_setting_bridge_port_get_priority (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.15.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--priority" title="The “priority” property"><span class="type">“priority”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -242,9 +240,8 @@ nm_setting_bridge_port_get_path_cost (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.2.15.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--path-cost" title="The “path-cost” property"><span class="type">“path-cost”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -270,9 +267,8 @@ nm_setting_bridge_port_get_hairpin_mode
 <div class="refsect3">
 <a name="id-1.2.15.9.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode" title="The “hairpin-mode” property"><span class="type">“hairpin-mode”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 </div>
 <div class="refsect1">
@@ -281,8 +277,6 @@ nm_setting_bridge_port_get_hairpin_mode
 <a name="NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_SETTING_NAME "bridge-port"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -321,39 +315,31 @@ is required</p>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-PORT-ERROR:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_ERROR nm_setting_bridge_port_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_PRIORITY</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_PRIORITY     "priority"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_PATH_COST</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_PATH_COST    "path-cost"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -361,35 +347,36 @@ is required</p>
 <div class="refsect2">
 <a name="NMSettingBridgePort--hairpin-mode"></a><h3>The <code class="literal">“hairpin-mode”</code> property</h3>
 <pre class="programlisting">  “hairpin-mode”             <span class="type">gboolean</span></pre>
-<p></p>
+<p>Enables or disabled "hairpin mode" for the port, which allows frames to
+be sent back out through the port the frame was received on.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingBridgePort--path-cost"></a><h3>The <code class="literal">“path-cost”</code> property</h3>
 <pre class="programlisting">  “path-cost”                <span class="type">guint</span></pre>
-<p></p>
+<p>The Spanning Tree Protocol (STP) port cost for destinations via this
+port.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 65535</p>
 <p>Default value: 100</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingBridgePort--priority"></a><h3>The <code class="literal">“priority”</code> property</h3>
 <pre class="programlisting">  “priority”                 <span class="type">guint</span></pre>
-<p></p>
+<p>The Spanning Tree Protocol (STP) priority of this bridge port.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 63</p>
 <p>Default value: 32</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index e0d32198..43980d9d 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingCdma</title>
+<title>NMSettingCdma: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingSerial.html" title="NMSettingSerial">
 <link rel="next" href="NMSettingGsm.html" title="NMSettingGsm">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -193,7 +193,6 @@ nm_setting_cdma_error_quark (<em class="parameter"><code><span class="type">void
 <div class="refsect3">
 <a name="id-1.2.10.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -205,7 +204,6 @@ nm_setting_cdma_new (<em class="parameter"><code><span class="type">void</span><
 <div class="refsect3">
 <a name="id-1.2.10.9.3.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -231,7 +229,6 @@ nm_setting_cdma_get_number (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.2.10.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingCdma.html#NMSettingCdma--number" title="The “number” property"><span class="type">“number”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -257,7 +254,6 @@ nm_setting_cdma_get_username (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.10.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingCdma.html#NMSettingCdma--username" title="The “username” property"><span class="type">“username”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -283,7 +279,6 @@ nm_setting_cdma_get_password (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.10.9.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title="The “password” property"><span class="type">“password”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -309,7 +304,6 @@ nm_setting_cdma_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.10.9.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title="The “password” property"><span class="type">“password”</span></a></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -319,8 +313,6 @@ nm_setting_cdma_get_password_flags (<em class="parameter"><code><a class="link"
 <a name="NM-SETTING-CDMA-SETTING-NAME:CAPS"></a><h3>NM_SETTING_CDMA_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_SETTING_NAME "cdma"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -373,40 +365,30 @@ is missing in the connection</p>
 <a name="NM-SETTING-CDMA-ERROR:CAPS"></a><h3>NM_SETTING_CDMA_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_ERROR nm_setting_cdma_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CDMA-NUMBER:CAPS"></a><h3>NM_SETTING_CDMA_NUMBER</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_NUMBER         "number"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CDMA-USERNAME:CAPS"></a><h3>NM_SETTING_CDMA_USERNAME</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_USERNAME       "username"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CDMA-PASSWORD:CAPS"></a><h3>NM_SETTING_CDMA_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_PASSWORD       "password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_CDMA_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -414,7 +396,9 @@ is missing in the connection</p>
 <div class="refsect2">
 <a name="NMSettingCdma--number"></a><h3>The <code class="literal">“number”</code> property</h3>
 <pre class="programlisting">  “number”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The number to dial to establish the connection to the CDMA-based mobile
+broadband network, if any.  If not specified, the default number (<span class="type">777</span>)
+is used when required.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -422,7 +406,9 @@ is missing in the connection</p>
 <div class="refsect2">
 <a name="NMSettingCdma--password"></a><h3>The <code class="literal">“password”</code> property</h3>
 <pre class="programlisting">  “password”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The password used to authenticate with the network, if required.  Many
+providers do not require a password, or accept any password.  But if a
+password is required, it is specified here.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -430,7 +416,7 @@ is missing in the connection</p>
 <div class="refsect2">
 <a name="NMSettingCdma--password-flags"></a><h3>The <code class="literal">“password-flags”</code> property</h3>
 <pre class="programlisting">  “password-flags”           <span class="type">guint</span></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title="The “password” property"><span class="type">“password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -439,14 +425,15 @@ is missing in the connection</p>
 <div class="refsect2">
 <a name="NMSettingCdma--username"></a><h3>The <code class="literal">“username”</code> property</h3>
 <pre class="programlisting">  “username”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The username used to authenticate with the network, if required.  Many
+providers do not require a username, or accept any username.  But if a
+username is required, it is specified here.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index f029e3c0..ba73eb00 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingConnection</title>
+<title>NMSettingConnection: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSetting.html" title="NMSetting">
 <link rel="next" href="NMSettingWired.html" title="NMSettingWired">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -432,7 +432,6 @@ nm_setting_connection_error_quark (<em class="parameter"><code><span class="type
 <div class="refsect3">
 <a name="id-1.2.4.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -444,7 +443,6 @@ nm_setting_connection_new (<em class="parameter"><code><span class="type">void</
 <div class="refsect3">
 <a name="id-1.2.4.9.3.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -471,7 +469,6 @@ nm_setting_connection_get_id (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.4.9.4.6"></a><h4>Returns</h4>
 <p> the connection ID</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -498,7 +495,6 @@ nm_setting_connection_get_uuid (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.2.4.9.5.6"></a><h4>Returns</h4>
 <p> the connection UUID</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -526,9 +522,8 @@ nm_setting_connection_get_interface_name
 <div class="refsect3">
 <a name="id-1.2.4.9.6.6"></a><h4>Returns</h4>
 <p> the connection's interface name</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -555,7 +550,6 @@ nm_setting_connection_get_connection_type
 <div class="refsect3">
 <a name="id-1.2.4.9.7.6"></a><h4>Returns</h4>
 <p> the connection type</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -582,7 +576,6 @@ nm_setting_connection_get_autoconnect (<em class="parameter"><code><a class="lin
 <div class="refsect3">
 <a name="id-1.2.4.9.8.6"></a><h4>Returns</h4>
 <p> the connection's autoconnect behavior</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -609,7 +602,6 @@ nm_setting_connection_get_timestamp (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.4.9.9.6"></a><h4>Returns</h4>
 <p> the connection's timestamp</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -636,7 +628,6 @@ nm_setting_connection_get_read_only (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.4.9.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection is read-only, <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -665,7 +656,6 @@ property of this setting.</p>
 <div class="refsect3">
 <a name="id-1.2.4.9.11.6"></a><h4>Returns</h4>
 <p> the number of permissions entires</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -722,7 +712,6 @@ of this setting.</p>
 <a name="id-1.2.4.9.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if a permission was returned, <code class="literal">FALSE</code> if <em class="parameter"><code>idx</code></em>
 was invalid</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -749,7 +738,6 @@ nm_setting_connection_get_zone (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.2.4.9.13.6"></a><h4>Returns</h4>
 <p> the trust level of a connection</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -786,7 +774,6 @@ nm_setting_connection_permissions_user_allowed
 <a name="id-1.2.4.9.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the requested user is allowed to view this connection,
 <code class="literal">FALSE</code> if the given user is not allowed to view this connection</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -841,7 +828,6 @@ list, <code class="literal">FALSE</code> if <em class="parameter"><code>ptype</c
 or <em class="parameter"><code>pitem</code></em>
 was invalid or it the permission was already
 present in the list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -925,9 +911,8 @@ be a username. See <a class="link" href="NMSettingConnection.html#NMSettingConne
 <div class="refsect3">
 <a name="id-1.2.4.9.17.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the permission was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -954,7 +939,6 @@ nm_setting_connection_get_master (<em class="parameter"><code><a class="link" hr
 <a name="id-1.2.4.9.18.6"></a><h4>Returns</h4>
 <p> interface name of the master device or UUID of the master
 connection.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -991,7 +975,6 @@ against <em class="parameter"><code>setting</code></em>
 <a name="id-1.2.4.9.19.5"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if connection is of the given slave <em class="parameter"><code>type</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1018,7 +1001,6 @@ nm_setting_connection_get_slave_type (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.2.4.9.20.6"></a><h4>Returns</h4>
 <p> the type of slave this connection is, if any</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1045,9 +1027,8 @@ nm_setting_connection_get_num_secondaries
 <div class="refsect3">
 <a name="id-1.2.4.9.21.5"></a><h4>Returns</h4>
 <p> the number of configured secondary connection UUIDs</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1081,9 +1062,8 @@ nm_setting_connection_get_secondary (<em class="parameter"><code><a class="link"
 <a name="id-1.2.4.9.22.5"></a><h4>Returns</h4>
 <p> the secondary connection UUID at index <em class="parameter"><code>idx</code></em>
 </p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1118,9 +1098,8 @@ nm_setting_connection_add_secondary (<em class="parameter"><code><a class="link"
 <a name="id-1.2.4.9.23.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the secondary connection UUID was added; <code class="literal">FALSE</code> if the UUID
 was already present</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1153,7 +1132,7 @@ nm_setting_connection_remove_secondary
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1189,9 +1168,8 @@ nm_setting_connection_remove_secondary_by_value
 <div class="refsect3">
 <a name="id-1.2.4.9.25.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the secondary connection UUID was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1218,9 +1196,8 @@ nm_setting_connection_get_gateway_ping_timeout
 <a name="id-1.2.4.9.26.5"></a><h4>Returns</h4>
 <p> the value contained in the <a class="link" href="NMSettingConnection.html#NMSettingConnection--gateway-ping-timeout" title="The “gateway-ping-timeout” property"><span class="type">“gateway-ping-timeout”</span></a>
 property.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1229,8 +1206,6 @@ property.</p>
 <a name="NM-SETTING-CONNECTION-SETTING-NAME:CAPS"></a><h3>NM_SETTING_CONNECTION_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1295,112 +1270,84 @@ property.</p>
 <a name="NM-SETTING-CONNECTION-ERROR:CAPS"></a><h3>NM_SETTING_CONNECTION_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-ID:CAPS"></a><h3>NM_SETTING_CONNECTION_ID</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_ID             "id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-UUID:CAPS"></a><h3>NM_SETTING_CONNECTION_UUID</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_UUID           "uuid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-INTERFACE-NAME:CAPS"></a><h3>NM_SETTING_CONNECTION_INTERFACE_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_INTERFACE_NAME "interface-name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-TYPE:CAPS"></a><h3>NM_SETTING_CONNECTION_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_TYPE           "type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-AUTOCONNECT:CAPS"></a><h3>NM_SETTING_CONNECTION_AUTOCONNECT</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_AUTOCONNECT    "autoconnect"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-TIMESTAMP:CAPS"></a><h3>NM_SETTING_CONNECTION_TIMESTAMP</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_TIMESTAMP      "timestamp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-READ-ONLY:CAPS"></a><h3>NM_SETTING_CONNECTION_READ_ONLY</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_READ_ONLY      "read-only"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-PERMISSIONS:CAPS"></a><h3>NM_SETTING_CONNECTION_PERMISSIONS</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_PERMISSIONS    "permissions"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-ZONE:CAPS"></a><h3>NM_SETTING_CONNECTION_ZONE</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_ZONE           "zone"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-MASTER:CAPS"></a><h3>NM_SETTING_CONNECTION_MASTER</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_MASTER         "master"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-SLAVE-TYPE:CAPS"></a><h3>NM_SETTING_CONNECTION_SLAVE_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_SLAVE_TYPE     "slave-type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-SECONDARIES:CAPS"></a><h3>NM_SETTING_CONNECTION_SECONDARIES</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_SECONDARIES    "secondaries"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-GATEWAY-PING-TIMEOUT:CAPS"></a><h3>NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT "gateway-ping-timeout"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1431,7 +1378,7 @@ timeout is reached, or an IP gateway replies to a ping.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 30</p>
 <p>Default value: 0</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1457,7 +1404,7 @@ can be used with, and if interface names change or are reordered the
 connection may be applied to the wrong interface.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1501,7 +1448,7 @@ connection is read-only and cannot be modified.</p>
 connection itself is activated. Currently only VPN connections are
 supported.</p>
 <p>Flags: Read / Write</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1570,7 +1517,6 @@ firewall.</p>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingDcb.html b/docs/libnm-util/html/NMSettingDcb.html
index 8f2d90ea..5cd1cd53 100644
--- a/docs/libnm-util/html/NMSettingDcb.html
+++ b/docs/libnm-util/html/NMSettingDcb.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingDcb</title>
+<title>NMSettingDcb: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingAdsl.html" title="NMSettingAdsl">
 <link rel="next" href="NMSetting8021x.html" title="NMSetting8021x">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -449,9 +449,8 @@ nm_setting_dcb_error_quark (<em class="parameter"><code><span class="type">void<
 <div class="refsect3">
 <a name="id-1.2.23.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="type">NMSettingDcb</span></a> errors.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -464,7 +463,7 @@ nm_setting_dcb_new (<em class="parameter"><code><span class="type">void</span></
 <p> the new empty <a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="type">NMSettingDcb</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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -489,9 +488,8 @@ nm_setting_dcb_get_app_fcoe_flags (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.2.23.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fcoe-flags" title="The “app-fcoe-flags” property"><span class="type">“app-fcoe-flags”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -516,9 +514,8 @@ nm_setting_dcb_get_app_fcoe_priority (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.2.23.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fcoe-priority" title="The “app-fcoe-priority” property"><span class="type">“app-fcoe-priority”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -543,9 +540,8 @@ nm_setting_dcb_get_app_fcoe_mode (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.2.23.9.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fcoe-mode" title="The “app-fcoe-mode” property"><span class="type">“app-fcoe-mode”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -570,9 +566,8 @@ nm_setting_dcb_get_app_iscsi_flags (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.23.9.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-iscsi-flags" title="The “app-iscsi-flags” property"><span class="type">“app-iscsi-flags”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -597,9 +592,8 @@ nm_setting_dcb_get_app_iscsi_priority (<em class="parameter"><code><a class="lin
 <div class="refsect3">
 <a name="id-1.2.23.9.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-iscsi-priority" title="The “app-iscsi-priority” property"><span class="type">“app-iscsi-priority”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -624,9 +618,8 @@ nm_setting_dcb_get_app_fip_flags (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.2.23.9.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fip-flags" title="The “app-fip-flags” property"><span class="type">“app-fip-flags”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -651,9 +644,8 @@ nm_setting_dcb_get_app_fip_priority (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.23.9.10.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fip-priority" title="The “app-fip-priority” property"><span class="type">“app-fip-priority”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -679,9 +671,8 @@ nm_setting_dcb_get_priority_flow_control_flags
 <div class="refsect3">
 <a name="id-1.2.23.9.11.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-flow-control-flags" title="The “priority-flow-control-flags” property"><span class="type">“priority-flow-control-flags”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -717,9 +708,8 @@ nm_setting_dcb_get_priority_flow_control
 <p> <code class="literal">TRUE</code> if flow control is enabled for the given <em class="parameter"><code>user_priority</code></em>
 ,
 <code class="literal">FALSE</code> if not enabled</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -758,7 +748,7 @@ the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><co
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -784,9 +774,8 @@ nm_setting_dcb_get_priority_group_flags
 <div class="refsect3">
 <a name="id-1.2.23.9.14.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-group-flags" title="The “priority-group-flags” property"><span class="type">“priority-group-flags”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -822,9 +811,8 @@ nm_setting_dcb_get_priority_group_id (<em class="parameter"><code><a class="link
 is assigned to.  These values are
 only valid when <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-group-flags" title="The “priority-group-flags” property"><span class="type">“priority-group-flags”</span></a> includes the
 <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -864,7 +852,7 @@ unrestricted group.</p></td>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -901,9 +889,8 @@ nm_setting_dcb_get_priority_group_bandwidth
 .  These values are
 only valid when <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-group-flags" title="The “priority-group-flags” property"><span class="type">“priority-group-flags”</span></a> includes the
 <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -943,7 +930,7 @@ to</p></td>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -979,9 +966,8 @@ nm_setting_dcb_get_priority_bandwidth (<em class="parameter"><code><a class="lin
 in its priority group.
 These values are only valid when <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-group-flags" title="The “priority-group-flags” property"><span class="type">“priority-group-flags”</span></a> includes the
 <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1021,7 +1007,7 @@ allowed to use within its priority group</p></td>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1058,9 +1044,8 @@ nm_setting_dcb_get_priority_strict_bandwidth
 may use all of the bandwidth allocated to its
 assigned group, or <code class="literal">FALSE</code> if not. These values are only valid when
 <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-group-flags" title="The “priority-group-flags” property"><span class="type">“priority-group-flags”</span></a> includes the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1101,7 +1086,7 @@ its priority group, or <code class="literal">FALSE</code> if not</p></td>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1138,9 +1123,8 @@ nm_setting_dcb_get_priority_traffic_class
 . These values are only
 valid when <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-group-flags" title="The “priority-group-flags” property"><span class="type">“priority-group-flags”</span></a> includes the
 <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1150,8 +1134,6 @@ nm_setting_dcb_set_priority_traffic_class
                                (<em class="parameter"><code><a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="type">NMSettingDcb</span></a> *setting</code></em>,
                                 <em class="parameter"><code><span class="type">guint</span> user_priority</code></em>,
                                 <em class="parameter"><code><span class="type">guint</span> traffic_class</code></em>);</pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1160,8 +1142,6 @@ nm_setting_dcb_set_priority_traffic_class
 <a name="NM-SETTING-DCB-SETTING-NAME:CAPS"></a><h3>NM_SETTING_DCB_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_SETTING_NAME "dcb"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1206,8 +1186,6 @@ required</p>
 <a name="NM-SETTING-DCB-ERROR:CAPS"></a><h3>NM_SETTING_DCB_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_ERROR nm_setting_dcb_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1254,7 +1232,7 @@ peer configuration advertisements</p>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1262,7 +1240,7 @@ peer configuration advertisements</p>
 <pre class="programlisting">#define NM_SETTING_DCB_FCOE_MODE_FABRIC  "fabric"
 </pre>
 <p>Indicates that the FCoE controller should use "fabric" mode (default)</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1270,127 +1248,97 @@ peer configuration advertisements</p>
 <pre class="programlisting">#define NM_SETTING_DCB_FCOE_MODE_VN2VN   "vn2vn"
 </pre>
 <p>Indicates that the FCoE controller should use "VN2VN" mode.</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-APP-FCOE-FLAGS:CAPS"></a><h3>NM_SETTING_DCB_APP_FCOE_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_FCOE_FLAGS         "app-fcoe-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-APP-FCOE-PRIORITY:CAPS"></a><h3>NM_SETTING_DCB_APP_FCOE_PRIORITY</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_FCOE_PRIORITY      "app-fcoe-priority"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-APP-FCOE-MODE:CAPS"></a><h3>NM_SETTING_DCB_APP_FCOE_MODE</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_FCOE_MODE          "app-fcoe-mode"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-APP-ISCSI-FLAGS:CAPS"></a><h3>NM_SETTING_DCB_APP_ISCSI_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_ISCSI_FLAGS        "app-iscsi-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-APP-ISCSI-PRIORITY:CAPS"></a><h3>NM_SETTING_DCB_APP_ISCSI_PRIORITY</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_ISCSI_PRIORITY     "app-iscsi-priority"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-APP-FIP-FLAGS:CAPS"></a><h3>NM_SETTING_DCB_APP_FIP_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_FIP_FLAGS          "app-fip-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-APP-FIP-PRIORITY:CAPS"></a><h3>NM_SETTING_DCB_APP_FIP_PRIORITY</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_FIP_PRIORITY       "app-fip-priority"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-FLOW-CONTROL-FLAGS:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS  "priority-flow-control-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-FLOW-CONTROL:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_FLOW_CONTROL</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_FLOW_CONTROL        "priority-flow-control"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-GROUP-FLAGS:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_GROUP_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_GROUP_FLAGS      "priority-group-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-GROUP-ID:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_GROUP_ID</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_GROUP_ID         "priority-group-id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-GROUP-BANDWIDTH:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH  "priority-group-bandwidth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-BANDWIDTH:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_BANDWIDTH</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_BANDWIDTH        "priority-bandwidth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-STRICT-BANDWIDTH:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH "priority-strict-bandwidth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-TRAFFIC-CLASS:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS    "priority-traffic-class"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1398,143 +1346,177 @@ peer configuration advertisements</p>
 <div class="refsect2">
 <a name="NMSettingDcb--app-fcoe-flags"></a><h3>The <code class="literal">“app-fcoe-flags”</code> property</h3>
 <pre class="programlisting">  “app-fcoe-flags”           <span class="type">guint</span></pre>
-<p></p>
+<p>Specifies the <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a> for the DCB FCoE application.  Flags may
+be any combination of <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a>,
+<a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ADVERTISE</code></a>, and <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_WILLING</code></a>.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--app-fcoe-mode"></a><h3>The <code class="literal">“app-fcoe-mode”</code> property</h3>
 <pre class="programlisting">  “app-fcoe-mode”            <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The FCoE controller mode; either <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FCOE-MODE-FABRIC:CAPS" title="NM_SETTING_DCB_FCOE_MODE_FABRIC"><code class="literal">NM_SETTING_DCB_FCOE_MODE_FABRIC</code></a>
+(default) or <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FCOE-MODE-VN2VN:CAPS" title="NM_SETTING_DCB_FCOE_MODE_VN2VN"><code class="literal">NM_SETTING_DCB_FCOE_MODE_VN2VN</code></a>.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: "fabric"</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--app-fcoe-priority"></a><h3>The <code class="literal">“app-fcoe-priority”</code> property</h3>
 <pre class="programlisting">  “app-fcoe-priority”        <span class="type">gint</span></pre>
-<p></p>
+<p>The highest User Priority (0 - 7) which FCoE frames should use, or -1 for
+default priority.  Only used when the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fcoe-flags" title="The “app-fcoe-flags” property"><span class="type">“app-fcoe-flags”</span></a>
+property includes the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [-1,7]</p>
 <p>Default value: -1</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--app-fip-flags"></a><h3>The <code class="literal">“app-fip-flags”</code> property</h3>
 <pre class="programlisting">  “app-fip-flags”            <span class="type">guint</span></pre>
-<p></p>
+<p>Specifies the <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a> for the DCB FIP application.  Flags may
+be any combination of <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a>,
+<a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ADVERTISE</code></a>, and <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_WILLING</code></a>.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--app-fip-priority"></a><h3>The <code class="literal">“app-fip-priority”</code> property</h3>
 <pre class="programlisting">  “app-fip-priority”         <span class="type">gint</span></pre>
-<p></p>
+<p>The highest User Priority (0 - 7) which FIP frames should use, or -1 for
+default priority.  Only used when the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fip-flags" title="The “app-fip-flags” property"><span class="type">“app-fip-flags”</span></a>
+property includes the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [-1,7]</p>
 <p>Default value: -1</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--app-iscsi-flags"></a><h3>The <code class="literal">“app-iscsi-flags”</code> property</h3>
 <pre class="programlisting">  “app-iscsi-flags”          <span class="type">guint</span></pre>
-<p></p>
+<p>Specifies the <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a> for the DCB iSCSI application.  Flags
+may be any combination of <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a>,
+<a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ADVERTISE</code></a>, and <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_WILLING</code></a>.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--app-iscsi-priority"></a><h3>The <code class="literal">“app-iscsi-priority”</code> property</h3>
 <pre class="programlisting">  “app-iscsi-priority”       <span class="type">gint</span></pre>
-<p></p>
+<p>The highest User Priority (0 - 7) which iSCSI frames should use, or -1
+for default priority. Only used when the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-iscsi-flags" title="The “app-iscsi-flags” property"><span class="type">“app-iscsi-flags”</span></a>
+property includes the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [-1,7]</p>
 <p>Default value: -1</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-bandwidth"></a><h3>The <code class="literal">“priority-bandwidth”</code> property</h3>
 <pre class="programlisting">  “priority-bandwidth”       <span class="type">GArray_guint_</span> *</pre>
-<p></p>
+<p>An array of 8 uint values, where the array index corresponds to the User
+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
+percent.</p>
 <p>Flags: Read / Write</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-flow-control"></a><h3>The <code class="literal">“priority-flow-control”</code> property</h3>
 <pre class="programlisting">  “priority-flow-control”    <span class="type">GArray_guint_</span> *</pre>
-<p></p>
+<p>An array of 8 uint 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.  Allowed values are 0 (do not
+transmit pause) and 1 (transmit pause).</p>
 <p>Flags: Read / Write</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-flow-control-flags"></a><h3>The <code class="literal">“priority-flow-control-flags”</code> property</h3>
 <pre class="programlisting">  “priority-flow-control-flags” <span class="type">guint</span></pre>
-<p></p>
+<p>Specifies the <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a> for DCB Priority Flow Control (PFC).
+Flags may be any combination of <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a>,
+<a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ADVERTISE</code></a>, and <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_WILLING</code></a>.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-group-bandwidth"></a><h3>The <code class="literal">“priority-group-bandwidth”</code> property</h3>
 <pre class="programlisting">  “priority-group-bandwidth” <span class="type">GArray_guint_</span> *</pre>
-<p></p>
+<p>An array of 8 uint values, where the array index corresponds to the
+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 percent.</p>
 <p>Flags: Read / Write</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-group-flags"></a><h3>The <code class="literal">“priority-group-flags”</code> property</h3>
 <pre class="programlisting">  “priority-group-flags”     <span class="type">guint</span></pre>
-<p></p>
+<p>Specifies the <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a> for DCB Priority Groups.  Flags may be
+any combination of <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a>,
+<a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ADVERTISE</code></a>, and <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_WILLING</code></a>.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-group-id"></a><h3>The <code class="literal">“priority-group-id”</code> property</h3>
 <pre class="programlisting">  “priority-group-id”        <span class="type">GArray_guint_</span> *</pre>
-<p></p>
+<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>Flags: Read / Write</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-strict-bandwidth"></a><h3>The <code class="literal">“priority-strict-bandwidth”</code> property</h3>
 <pre class="programlisting">  “priority-strict-bandwidth” <span class="type">GArray_guint_</span> *</pre>
-<p></p>
+<p>An array of 8 uint 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.  Allowed values
+are 0 (the priority may not utilize all bandwidth) or 1 (the priority may
+utilize all bandwidth).</p>
 <p>Flags: Read / Write</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-traffic-class"></a><h3>The <code class="literal">“priority-traffic-class”</code> property</h3>
 <pre class="programlisting">  “priority-traffic-class”   <span class="type">GArray_guint_</span> *</pre>
-<p></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>Flags: Read / Write</p>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGeneric.html b/docs/libnm-util/html/NMSettingGeneric.html
index d7f571b1..b6cc9066 100644
--- a/docs/libnm-util/html/NMSettingGeneric.html
+++ b/docs/libnm-util/html/NMSettingGeneric.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingGeneric</title>
+<title>NMSettingGeneric: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingTeamPort.html" title="NMSettingTeamPort">
 <link rel="next" href="NMSettingInfiniband.html" title="NMSettingInfiniband">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -114,9 +114,8 @@ nm_setting_generic_error_quark (<em class="parameter"><code><span class="type">v
 <div class="refsect3">
 <a name="id-1.2.18.8.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingGeneric.html" title="NMSettingGeneric"><span class="type">NMSettingGeneric</span></a> errors.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -129,7 +128,7 @@ nm_setting_generic_new (<em class="parameter"><code><span class="type">void</spa
 <p> the new empty <a class="link" href="NMSettingGeneric.html" title="NMSettingGeneric"><span class="type">NMSettingGeneric</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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 <div class="refsect1">
@@ -138,8 +137,6 @@ nm_setting_generic_new (<em class="parameter"><code><span class="type">void</spa
 <a name="NM-SETTING-GENERIC-SETTING-NAME:CAPS"></a><h3>NM_SETTING_GENERIC_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_GENERIC_SETTING_NAME "generic"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -178,20 +175,17 @@ is required</p>
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GENERIC-ERROR:CAPS"></a><h3>NM_SETTING_GENERIC_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_GENERIC_ERROR nm_setting_generic_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index 39aa12d1..1e725b02 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingGsm</title>
+<title>NMSettingGsm: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingCdma.html" title="NMSettingCdma">
 <link rel="next" href="NMSettingWimax.html" title="NMSettingWimax">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -326,7 +326,6 @@ nm_setting_gsm_error_quark (<em class="parameter"><code><span class="type">void<
 <div class="refsect3">
 <a name="id-1.2.11.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -349,7 +348,6 @@ nm_setting_gsm_new (<em class="parameter"><code><span class="type">void</span></
 <div class="refsect3">
 <a name="id-1.2.11.9.4.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -375,7 +373,6 @@ nm_setting_gsm_get_number (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="id-1.2.11.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--number" title="The “number” property"><span class="type">“number”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -401,7 +398,6 @@ nm_setting_gsm_get_username (<em class="parameter"><code><a class="link" href="N
 <div class="refsect3">
 <a name="id-1.2.11.9.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--username" title="The “username” property"><span class="type">“username”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -427,7 +423,6 @@ nm_setting_gsm_get_password (<em class="parameter"><code><a class="link" href="N
 <div class="refsect3">
 <a name="id-1.2.11.9.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--password" title="The “password” property"><span class="type">“password”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -453,7 +448,6 @@ nm_setting_gsm_get_apn (<em class="parameter"><code><a class="link" href="NMSett
 <div class="refsect3">
 <a name="id-1.2.11.9.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--apn" title="The “apn” property"><span class="type">“apn”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -479,7 +473,6 @@ nm_setting_gsm_get_network_id (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.2.11.9.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--network-id" title="The “network-id” property"><span class="type">“network-id”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -505,7 +498,6 @@ nm_setting_gsm_get_pin (<em class="parameter"><code><a class="link" href="NMSett
 <div class="refsect3">
 <a name="id-1.2.11.9.10.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title="The “pin” property"><span class="type">“pin”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -531,7 +523,6 @@ nm_setting_gsm_get_home_only (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.11.9.11.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--home-only" title="The “home-only” property"><span class="type">“home-only”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -557,7 +548,6 @@ nm_setting_gsm_get_pin_flags (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.11.9.12.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title="The “pin” property"><span class="type">“pin”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -583,7 +573,6 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.2.11.9.13.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingGsm.html#NMSettingGsm--password" title="The “password” property"><span class="type">“password”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -613,7 +602,6 @@ nm_setting_gsm_get_network_type (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.2.11.9.14.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--network-type" title="The “network-type” property"><span class="type">“network-type”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -643,7 +631,6 @@ nm_setting_gsm_get_allowed_bands (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.2.11.9.15.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--allowed-bands" title="The “allowed-bands” property"><span class="type">“allowed-bands”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -653,8 +640,6 @@ nm_setting_gsm_get_allowed_bands (<em class="parameter"><code><a class="link" hr
 <a name="NM-SETTING-GSM-SETTING-NAME:CAPS"></a><h3>NM_SETTING_GSM_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_SETTING_NAME "gsm"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -707,96 +692,72 @@ is missing in the connection</p>
 <a name="NM-SETTING-GSM-ERROR:CAPS"></a><h3>NM_SETTING_GSM_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-NUMBER:CAPS"></a><h3>NM_SETTING_GSM_NUMBER</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_NUMBER         "number"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-USERNAME:CAPS"></a><h3>NM_SETTING_GSM_USERNAME</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_USERNAME       "username"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-PASSWORD:CAPS"></a><h3>NM_SETTING_GSM_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_PASSWORD       "password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_GSM_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-APN:CAPS"></a><h3>NM_SETTING_GSM_APN</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_APN            "apn"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-NETWORK-ID:CAPS"></a><h3>NM_SETTING_GSM_NETWORK_ID</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_NETWORK_ID     "network-id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-PIN:CAPS"></a><h3>NM_SETTING_GSM_PIN</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_PIN            "pin"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-PIN-FLAGS:CAPS"></a><h3>NM_SETTING_GSM_PIN_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-HOME-ONLY:CAPS"></a><h3>NM_SETTING_GSM_HOME_ONLY</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_HOME_ONLY      "home-only"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-ALLOWED-BANDS:CAPS"></a><h3>NM_SETTING_GSM_ALLOWED_BANDS</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_ALLOWED_BANDS  "allowed-bands"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-NETWORK-TYPE:CAPS"></a><h3>NM_SETTING_GSM_NETWORK_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_NETWORK_TYPE   "network-type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1008,7 +969,9 @@ the device may use when connecting to this network.</p>
 <div class="refsect2">
 <a name="NMSettingGsm--allowed-bands"></a><h3>The <code class="literal">“allowed-bands”</code> property</h3>
 <pre class="programlisting">  “allowed-bands”            <span class="type">guint</span></pre>
-<p></p>
+<p>Bitfield of allowed frequency bands.  Note that not all devices allow
+frequency band control.  Permitted values are those specified by
+<a class="link" href="NMSettingGsm.html#NMSettingGsmNetworkBand" title="enum NMSettingGsmNetworkBand"><span class="type">NMSettingGsmNetworkBand</span></a>.</p>
 <div class="warning">
 <p><code class="literal">NMSettingGsm:allowed-bands</code> has been deprecated since version 0.9.10 and should not be used in newly-written code.</p>
 <p>No longer used. Band setting should be done by
@@ -1022,7 +985,13 @@ talking to ModemManager directly.</p>
 <div class="refsect2">
 <a name="NMSettingGsm--apn"></a><h3>The <code class="literal">“apn”</code> property</h3>
 <pre class="programlisting">  “apn”                      <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The GPRS Access Point Name specifying the APN used when establishing a
+data session with the GSM-based network.  The APN often determines how
+the user will be billed for their network usage and whether the user has
+access to the Internet or just a provider-specific walled-garden, so it
+is important to use the correct APN for the user's mobile broadband plan.
+The APN may only be composed of the characters a-z, 0-9, ., and - per GSM
+03.60 Section 14.9.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1030,7 +999,8 @@ talking to ModemManager directly.</p>
 <div class="refsect2">
 <a name="NMSettingGsm--home-only"></a><h3>The <code class="literal">“home-only”</code> property</h3>
 <pre class="programlisting">  “home-only”                <span class="type">gboolean</span></pre>
-<p></p>
+<p>When <code class="literal">TRUE</code>, only connections to the home network will be allowed.
+Connections to roaming networks will not be made.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1038,7 +1008,11 @@ talking to ModemManager directly.</p>
 <div class="refsect2">
 <a name="NMSettingGsm--network-id"></a><h3>The <code class="literal">“network-id”</code> property</h3>
 <pre class="programlisting">  “network-id”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The Network ID (GSM LAI format, ie MCC-MNC) to force specific network
+registration.  If the Network ID is specified, NetworkManager will
+attempt to force the device to register only on the specified network.
+This can be used to ensure that the device does not roam when direct
+roaming control of the device is not otherwise possible.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1046,7 +1020,15 @@ talking to ModemManager directly.</p>
 <div class="refsect2">
 <a name="NMSettingGsm--network-type"></a><h3>The <code class="literal">“network-type”</code> property</h3>
 <pre class="programlisting">  “network-type”             <span class="type">gint</span></pre>
-<p></p>
+<p>Network preference to force the device to only use specific network
+technologies. The permitted values are <a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-ANY:CAPS"><code class="literal">NM_SETTING_GSM_NETWORK_TYPE_ANY</code></a>,
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-UMTS-HSPA:CAPS"><code class="literal">NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA</code></a>,
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-GPRS-EDGE:CAPS"><code class="literal">NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE</code></a>,
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-UMTS-HSPA:CAPS"><code class="literal">NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA</code></a>,
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-GPRS-EDGE:CAPS"><code class="literal">NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE</code></a>,
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-4G:CAPS"><code class="literal">NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G</code></a>, and
+<a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-4G:CAPS"><code class="literal">NM_SETTING_GSM_NETWORK_TYPE_4G</code></a>.  Note that not all devices allow network
+preference control.</p>
 <div class="warning">
 <p><code class="literal">NMSettingGsm:network-type</code> has been deprecated since version 0.9.10 and should not be used in newly-written code.</p>
 <p>No longer used. Network type setting should be done
@@ -1060,7 +1042,10 @@ by talking to ModemManager directly.</p>
 <div class="refsect2">
 <a name="NMSettingGsm--number"></a><h3>The <code class="literal">“number”</code> property</h3>
 <pre class="programlisting">  “number”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Number to dial when establishing a PPP data session with the GSM-based
+mobile broadband network.  Many modems do not require PPP for connections
+to the mobile network and thus this property should be left blank, which
+allows NetworkManager to select the appropriate settings automatically.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1068,7 +1053,9 @@ by talking to ModemManager directly.</p>
 <div class="refsect2">
 <a name="NMSettingGsm--password"></a><h3>The <code class="literal">“password”</code> property</h3>
 <pre class="programlisting">  “password”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The password used to authenticate with the network, if required.  Many
+providers do not require a password, or accept any password.  But if a
+password is required, it is specified here.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1076,7 +1063,7 @@ by talking to ModemManager directly.</p>
 <div class="refsect2">
 <a name="NMSettingGsm--password-flags"></a><h3>The <code class="literal">“password-flags”</code> property</h3>
 <pre class="programlisting">  “password-flags”           <span class="type">guint</span></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingGsm.html#NMSettingGsm--password" title="The “password” property"><span class="type">“password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -1085,7 +1072,9 @@ by talking to ModemManager directly.</p>
 <div class="refsect2">
 <a name="NMSettingGsm--pin"></a><h3>The <code class="literal">“pin”</code> property</h3>
 <pre class="programlisting">  “pin”                      <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If the SIM is locked with a PIN it must be unlocked before any other
+operations are requested.  Specify the PIN here to allow operation of the
+device.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1093,7 +1082,7 @@ by talking to ModemManager directly.</p>
 <div class="refsect2">
 <a name="NMSettingGsm--pin-flags"></a><h3>The <code class="literal">“pin-flags”</code> property</h3>
 <pre class="programlisting">  “pin-flags”                <span class="type">guint</span></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title="The “pin” property"><span class="type">“pin”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -1102,14 +1091,15 @@ by talking to ModemManager directly.</p>
 <div class="refsect2">
 <a name="NMSettingGsm--username"></a><h3>The <code class="literal">“username”</code> property</h3>
 <pre class="programlisting">  “username”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The username used to authenticate with the network, if required.  Many
+providers do not require a username, or accept any username.  But if a
+username is required, it is specified here.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index c96dc86d..08d29926 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingIP4Config</title>
+<title>NMSettingIP4Config: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSetting8021x.html" title="NMSetting8021x">
 <link rel="next" href="NMSettingIP6Config.html" title="NMSettingIP6Config">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -723,7 +723,6 @@ nm_setting_ip4_config_error_quark (<em class="parameter"><code><span class="type
 <div class="refsect3">
 <a name="id-1.2.25.11.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -843,7 +842,6 @@ to.</p></td>
 <div class="refsect3">
 <a name="id-1.2.25.11.7.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the objects contain the same values, <code class="literal">FALSE</code> if they do not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -870,7 +868,6 @@ nm_ip4_address_get_address (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.2.25.11.8.6"></a><h4>Returns</h4>
 <p> the IPv4 address in network byte order</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -928,7 +925,6 @@ object.</p>
 <div class="refsect3">
 <a name="id-1.2.25.11.10.6"></a><h4>Returns</h4>
 <p> the IPv4 address prefix</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -985,7 +981,6 @@ nm_ip4_address_get_gateway (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.2.25.11.12.6"></a><h4>Returns</h4>
 <p> the IPv4 gateway address in network byte order</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1135,7 +1130,6 @@ to.</p></td>
 <div class="refsect3">
 <a name="id-1.2.25.11.18.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the objects contain the same values, <code class="literal">FALSE</code> if they do not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1162,7 +1156,6 @@ nm_ip4_route_get_dest (<em class="parameter"><code><a class="link" href="NMSetti
 <div class="refsect3">
 <a name="id-1.2.25.11.19.6"></a><h4>Returns</h4>
 <p> the IPv4 address in network byte order</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1219,7 +1212,6 @@ nm_ip4_route_get_prefix (<em class="parameter"><code><a class="link" href="NMSet
 <div class="refsect3">
 <a name="id-1.2.25.11.21.6"></a><h4>Returns</h4>
 <p> the IPv4 prefix</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1276,7 +1268,6 @@ nm_ip4_route_get_next_hop (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="id-1.2.25.11.23.6"></a><h4>Returns</h4>
 <p> the IPv4 address in network byte order</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1334,7 +1325,6 @@ nm_ip4_route_get_metric (<em class="parameter"><code><a class="link" href="NMSet
 <div class="refsect3">
 <a name="id-1.2.25.11.25.6"></a><h4>Returns</h4>
 <p> the route metric</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1403,7 +1393,6 @@ nm_setting_ip4_config_get_method (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.2.25.11.28.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--method" title="The “method” property"><span class="type">“method”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1429,7 +1418,6 @@ nm_setting_ip4_config_get_num_dns (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.2.25.11.29.5"></a><h4>Returns</h4>
 <p> the number of configured DNS servers</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1465,7 +1453,6 @@ nm_setting_ip4_config_get_dns (<em class="parameter"><code><a class="link" href=
 <p> the IPv4 address (network byte order) of the DNS server at index
 <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1501,7 +1488,6 @@ nm_setting_ip4_config_add_dns (<em class="parameter"><code><a class="link" href=
 <a name="id-1.2.25.11.31.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the DNS server was added; <code class="literal">FALSE</code> if the server was already
 known</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1570,9 +1556,8 @@ nm_setting_ip4_config_remove_dns_by_value
 <a name="id-1.2.25.11.33.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the DNS server was found and removed; <code class="literal">FALSE</code> if it was not.
 domain was already known</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1620,7 +1605,6 @@ nm_setting_ip4_config_get_num_dns_searches
 <div class="refsect3">
 <a name="id-1.2.25.11.35.5"></a><h4>Returns</h4>
 <p> the number of configured DNS search domains</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1655,7 +1639,6 @@ nm_setting_ip4_config_get_dns_search (<em class="parameter"><code><a class="link
 <a name="id-1.2.25.11.36.5"></a><h4>Returns</h4>
 <p> the DNS search domain at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1691,7 +1674,6 @@ nm_setting_ip4_config_add_dns_search (<em class="parameter"><code><a class="link
 <a name="id-1.2.25.11.37.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the DNS search domain was added; <code class="literal">FALSE</code> if the search
 domain was already known</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1761,7 +1743,6 @@ nm_setting_ip4_config_remove_dns_search_by_value
 <a name="id-1.2.25.11.39.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the DNS search domain was found and removed; <code class="literal">FALSE</code> if it was not.</p>
 <p>Since 0.9.10</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1811,7 +1792,6 @@ nm_setting_ip4_config_get_num_addresses
 <div class="refsect3">
 <a name="id-1.2.25.11.41.5"></a><h4>Returns</h4>
 <p> the number of configured addresses</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1846,7 +1826,6 @@ nm_setting_ip4_config_get_address (<em class="parameter"><code><a class="link" h
 <a name="id-1.2.25.11.42.5"></a><h4>Returns</h4>
 <p> the address at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1883,7 +1862,6 @@ given address is duplicated internally and is not changed by this function.</p>
 <a name="id-1.2.25.11.43.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the address was added; <code class="literal">FALSE</code> if the address was already
 known.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1951,9 +1929,8 @@ nm_setting_ip4_config_remove_address_by_value
 <div class="refsect3">
 <a name="id-1.2.25.11.45.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the address was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2000,7 +1977,6 @@ nm_setting_ip4_config_get_num_routes (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.2.25.11.47.5"></a><h4>Returns</h4>
 <p> the number of configured routes</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2035,7 +2011,6 @@ nm_setting_ip4_config_get_route (<em class="parameter"><code><a class="link" hre
 <a name="id-1.2.25.11.48.5"></a><h4>Returns</h4>
 <p> the route at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2071,7 +2046,6 @@ given route is duplicated internally and is not changed by this function.</p>
 <div class="refsect3">
 <a name="id-1.2.25.11.49.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the route was added; <code class="literal">FALSE</code> if the route was already known.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2139,9 +2113,8 @@ nm_setting_ip4_config_remove_route_by_value
 <div class="refsect3">
 <a name="id-1.2.25.11.51.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the route was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2192,9 +2165,8 @@ property.</p>
 <a name="id-1.2.25.11.53.6"></a><h4>Returns</h4>
 <p> the route metric that is used for IPv4 routes that don't explicitly
 specify a metric. See <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--route-metric" title="The “route-metric” property"><span class="type">“route-metric”</span></a> for more details.</p>
-<p></p>
 </div>
-<p class="since">Since 1.0</p>
+<p class="since">Since: 1.0</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2223,7 +2195,6 @@ property.</p>
 <a name="id-1.2.25.11.54.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if automatically configured (ie via DHCP) routes should be
 ignored.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2253,7 +2224,6 @@ property.</p>
 <a name="id-1.2.25.11.55.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if automatically configured (ie via DHCP) DNS information
 should be ignored.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2283,7 +2253,6 @@ property.</p>
 <a name="id-1.2.25.11.56.6"></a><h4>Returns</h4>
 <p> the configured Client ID to send to the DHCP server when requesting
 addresses via DHCP.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2314,7 +2283,6 @@ property.</p>
 <p> <code class="literal">TRUE</code> if NetworkManager should send the machine hostname to the
 DHCP server when requesting addresses to allow the server to automatically
 update DNS information for this machine.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2343,7 +2311,6 @@ property.</p>
 <div class="refsect3">
 <a name="id-1.2.25.11.58.6"></a><h4>Returns</h4>
 <p> the configured hostname to send to the DHCP server</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2373,7 +2340,6 @@ property.</p>
 <a name="id-1.2.25.11.59.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if this connection should never be the default connection
 for IPv4 addressing</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2402,7 +2368,6 @@ property.</p>
 <a name="id-1.2.25.11.60.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if this connection doesn't require IPv4 addressing to complete
 for the connection to succeed.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -2412,8 +2377,6 @@ for the connection to succeed.</p>
 <a name="NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2466,112 +2429,84 @@ not valid with the given IP4 method</p>
 <a name="NM-SETTING-IP4-CONFIG-ERROR:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD             "method"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DNS:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DNS                "dns"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DNS-SEARCH:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DNS_SEARCH</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DNS_SEARCH         "dns-search"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-ADDRESSES:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_ADDRESSES</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-ROUTES:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-ROUTE-METRIC:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_ROUTE_METRIC</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_ROUTE_METRIC       "route-metric"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-IGNORE-AUTO-ROUTES:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-IGNORE-AUTO-DNS:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DHCP-CLIENT-ID:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DHCP-SEND-HOSTNAME:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DHCP-HOSTNAME:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_NEVER_DEFAULT</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-MAY-FAIL:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_MAY_FAIL</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2623,14 +2558,22 @@ through that interface to the default network.</p>
 <div class="refsect2">
 <a name="NMSettingIP4Config--addresses"></a><h3>The <code class="literal">“addresses”</code> property</h3>
 <pre class="programlisting">  “addresses”                <span class="type">GPtrArray_GArray_guint__</span> *</pre>
-<p></p>
+<p>Array of IPv4 address structures.  Each IPv4 address structure is
+composed of 3 32-bit values; the first being the IPv4 address (network
+byte order), the second the prefix (1 - 32), and last the IPv4 gateway
+(network byte order). The gateway may be left as 0 if no gateway exists
+for that subnet.  For the "auto" method, given IP addresses are appended
+to those returned by automatic configuration.  Addresses cannot be used
+with the "shared", "link-local", or "disabled" methods as addressing is
+either automatic or disabled with these methods.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingIP4Config--dhcp-client-id"></a><h3>The <code class="literal">“dhcp-client-id”</code> property</h3>
 <pre class="programlisting">  “dhcp-client-id”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>A string sent to the DHCP server to identify the local machine which the
+DHCP server may use to customize the DHCP lease and options.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -2638,7 +2581,8 @@ through that interface to the default network.</p>
 <div class="refsect2">
 <a name="NMSettingIP4Config--dhcp-hostname"></a><h3>The <code class="literal">“dhcp-hostname”</code> property</h3>
 <pre class="programlisting">  “dhcp-hostname”            <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If the <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dhcp-send-hostname" title="The “dhcp-send-hostname” property"><span class="type">“dhcp-send-hostname”</span></a> property is <code class="literal">TRUE</code>, then the
+specified name will be sent to the DHCP server when acquiring a lease.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -2646,7 +2590,11 @@ through that interface to the default network.</p>
 <div class="refsect2">
 <a name="NMSettingIP4Config--dhcp-send-hostname"></a><h3>The <code class="literal">“dhcp-send-hostname”</code> property</h3>
 <pre class="programlisting">  “dhcp-send-hostname”       <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, a hostname is sent to the DHCP server when acquiring a lease.
+Some DHCP servers use this hostname to update DNS databases, essentially
+providing a static hostname for the computer.  If the
+<a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dhcp-hostname" title="The “dhcp-hostname” property"><span class="type">“dhcp-hostname”</span></a> property is empty and this property is
+<code class="literal">TRUE</code>, the current persistent hostname of the computer is sent.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
@@ -2654,21 +2602,34 @@ through that interface to the default network.</p>
 <div class="refsect2">
 <a name="NMSettingIP4Config--dns"></a><h3>The <code class="literal">“dns”</code> property</h3>
 <pre class="programlisting">  “dns”                      <span class="type">GArray_guint_</span> *</pre>
-<p></p>
+<p>List of DNS servers (network byte order).  For the "auto" method, these
+DNS servers are appended to those (if any) returned by automatic
+configuration.  DNS servers cannot be used with the "shared",
+"link-local", or "disabled" methods as there is no upstream network.  In
+all other methods, these DNS servers are used as the only DNS servers for
+this connection.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingIP4Config--dns-search"></a><h3>The <code class="literal">“dns-search”</code> property</h3>
 <pre class="programlisting">  “dns-search”               <span class="type">GSList_gchararray_</span> *</pre>
-<p></p>
+<p>List of DNS search domains.  For the "auto" method, these search domains
+are appended to those returned by automatic configuration. Search domains
+cannot be used with the "shared", "link-local", or "disabled" methods as
+there is no upstream network.  In all other methods, these search domains
+are used as the only search domains for this connection.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingIP4Config--ignore-auto-dns"></a><h3>The <code class="literal">“ignore-auto-dns”</code> property</h3>
 <pre class="programlisting">  “ignore-auto-dns”          <span class="type">gboolean</span></pre>
-<p></p>
+<p>When the method is set to "auto" and this property to <code class="literal">TRUE</code>,
+automatically configured nameservers and search domains are ignored and
+only nameservers and search domains specified in the
+<a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dns" title="The “dns” property"><span class="type">“dns”</span></a> and <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dns-search" title="The “dns-search” property"><span class="type">“dns-search”</span></a> properties, if
+any, are used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2676,7 +2637,9 @@ through that interface to the default network.</p>
 <div class="refsect2">
 <a name="NMSettingIP4Config--ignore-auto-routes"></a><h3>The <code class="literal">“ignore-auto-routes”</code> property</h3>
 <pre class="programlisting">  “ignore-auto-routes”       <span class="type">gboolean</span></pre>
-<p></p>
+<p>When the method is set to "auto" and this property to <code class="literal">TRUE</code>,
+automatically configured routes are ignored and only routes specified in
+the <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--routes" title="The “routes” property"><span class="type">“routes”</span></a> property, if any, are used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2684,7 +2647,12 @@ through that interface to the default network.</p>
 <div class="refsect2">
 <a name="NMSettingIP4Config--may-fail"></a><h3>The <code class="literal">“may-fail”</code> property</h3>
 <pre class="programlisting">  “may-fail”                 <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, allow overall network configuration to proceed even if IPv4
+configuration times out.  Note that at least one IP configuration must
+succeed or overall network configuration will still fail.  For example,
+in IPv6-only networks, setting this property to <code class="literal">TRUE</code> allows the overall
+network configuration to succeed if IPv4 configuration fails but IPv6
+configuration completes successfully.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
@@ -2692,7 +2660,18 @@ through that interface to the default network.</p>
 <div class="refsect2">
 <a name="NMSettingIP4Config--method"></a><h3>The <code class="literal">“method”</code> property</h3>
 <pre class="programlisting">  “method”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>IPv4 configuration method.  If "auto" is specified then the appropriate
+automatic method (DHCP, PPP, etc) is used for the interface and most
+other properties can be left unset.  If "link-local" is specified, then a
+link-local address in the 169.254/16 range will be assigned to the
+interface.  If "manual" is specified, static IP addressing is used and at
+least one IP address must be given in the "addresses" property.  If
+"shared" is specified (indicating that this connection will provide
+network access to other computers) then the interface is assigned an
+address in the 10.42.x.1/24 range and a DHCP and forwarding DNS server
+are started, and the interface is NAT-ed to the current default network
+connection.  "disabled" means IPv4 will not be used on this connection.
+This property must be set.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -2700,7 +2679,8 @@ through that interface to the default network.</p>
 <div class="refsect2">
 <a name="NMSettingIP4Config--never-default"></a><h3>The <code class="literal">“never-default”</code> property</h3>
 <pre class="programlisting">  “never-default”            <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, this connection will never be the default IPv4 connection,
+meaning it will never be assigned the default route by NetworkManager.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2708,23 +2688,36 @@ through that interface to the default network.</p>
 <div class="refsect2">
 <a name="NMSettingIP4Config--route-metric"></a><h3>The <code class="literal">“route-metric”</code> property</h3>
 <pre class="programlisting">  “route-metric”             <span class="type">gint64</span></pre>
-<p></p>
+<p>The default metric for routes that don't explicitly specify a metric.
+The default value -1 means that the metric is choosen automatically
+based on the device type.
+The metric applies to dynamic routes, manual (static) routes that
+don't have an explicit metric setting, address prefix routes, and
+the default route.
+As the linux kernel accepts zero (0) as a valid metric, zero is
+a valid value.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [-1,4294967295]</p>
 <p>Default value: -1</p>
-<p class="since">Since 1.0</p>
+<p class="since">Since: 1.0</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingIP4Config--routes"></a><h3>The <code class="literal">“routes”</code> property</h3>
 <pre class="programlisting">  “routes”                   <span class="type">GPtrArray_GArray_guint__</span> *</pre>
-<p></p>
+<p>Array of IPv4 route structures.  Each IPv4 route structure is composed of
+4 32-bit values; the first being the destination IPv4 network or address
+(network byte order), the second the destination network or address
+prefix (1 - 32), the third being the next-hop (network byte order) if
+any, and the fourth being the route metric. For the "auto" method, given
+IP routes are appended to those returned by automatic configuration.
+Routes cannot be used with the "shared", "link-local", or "disabled"
+methods because there is no upstream network.</p>
 <p>Flags: Read / Write</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index 67b63a87..eb42de11 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingIP6Config</title>
+<title>NMSettingIP6Config: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingIP4Config.html" title="NMSettingIP4Config">
 <link rel="next" href="NMSettingPPP.html" title="NMSettingPPP">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -708,7 +708,6 @@ nm_setting_ip6_config_error_quark (<em class="parameter"><code><span class="type
 <div class="refsect3">
 <a name="id-1.2.26.11.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -828,7 +827,6 @@ to.</p></td>
 <div class="refsect3">
 <a name="id-1.2.26.11.7.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the objects contain the same values, <code class="literal">FALSE</code> if they do not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -912,7 +910,6 @@ nm_ip6_address_get_prefix (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="id-1.2.26.11.10.6"></a><h4>Returns</h4>
 <p> the IPv6 address prefix</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1119,7 +1116,6 @@ to.</p></td>
 <div class="refsect3">
 <a name="id-1.2.26.11.18.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the objects contain the same values, <code class="literal">FALSE</code> if they do not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1203,7 +1199,6 @@ nm_ip6_route_get_prefix (<em class="parameter"><code><a class="link" href="NMSet
 <div class="refsect3">
 <a name="id-1.2.26.11.21.6"></a><h4>Returns</h4>
 <p> the IPv6 prefix</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1318,7 +1313,6 @@ nm_ip6_route_get_metric (<em class="parameter"><code><a class="link" href="NMSet
 <div class="refsect3">
 <a name="id-1.2.26.11.25.6"></a><h4>Returns</h4>
 <p> the route metric</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1387,7 +1381,6 @@ nm_setting_ip6_config_get_method (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.2.26.11.28.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--method" title="The “method” property"><span class="type">“method”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1413,7 +1406,6 @@ nm_setting_ip6_config_get_num_dns (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.2.26.11.29.5"></a><h4>Returns</h4>
 <p> the number of configured DNS servers</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1484,7 +1476,6 @@ nm_setting_ip6_config_add_dns (<em class="parameter"><code><a class="link" href=
 <a name="id-1.2.26.11.31.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the DNS server was added; <code class="literal">FALSE</code> if the server was already
 known</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1552,9 +1543,8 @@ nm_setting_ip6_config_remove_dns_by_value
 <div class="refsect3">
 <a name="id-1.2.26.11.33.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the DNS server was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1602,7 +1592,6 @@ nm_setting_ip6_config_get_num_dns_searches
 <div class="refsect3">
 <a name="id-1.2.26.11.35.5"></a><h4>Returns</h4>
 <p> the number of configured DNS search domains</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1637,7 +1626,6 @@ nm_setting_ip6_config_get_dns_search (<em class="parameter"><code><a class="link
 <a name="id-1.2.26.11.36.5"></a><h4>Returns</h4>
 <p> the DNS search domain at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1673,7 +1661,6 @@ nm_setting_ip6_config_add_dns_search (<em class="parameter"><code><a class="link
 <a name="id-1.2.26.11.37.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the DNS search domain was added; <code class="literal">FALSE</code> if the search
 domain was already known</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1743,7 +1730,6 @@ nm_setting_ip6_config_remove_dns_search_by_value
 <a name="id-1.2.26.11.39.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the DNS search domain was found and removed; <code class="literal">FALSE</code> if it was not.</p>
 <p>Since 0.9.10</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1793,7 +1779,6 @@ nm_setting_ip6_config_get_num_addresses
 <div class="refsect3">
 <a name="id-1.2.26.11.41.5"></a><h4>Returns</h4>
 <p> the number of configured addresses</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1828,7 +1813,6 @@ nm_setting_ip6_config_get_address (<em class="parameter"><code><a class="link" h
 <a name="id-1.2.26.11.42.5"></a><h4>Returns</h4>
 <p> the address at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1865,7 +1849,6 @@ given address is duplicated internally and is not changed by this function.</p>
 <a name="id-1.2.26.11.43.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the address was added; <code class="literal">FALSE</code> if the address was already
 known.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1933,9 +1916,8 @@ nm_setting_ip6_config_remove_address_by_value
 <div class="refsect3">
 <a name="id-1.2.26.11.45.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the address was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1982,7 +1964,6 @@ nm_setting_ip6_config_get_num_routes (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.2.26.11.47.5"></a><h4>Returns</h4>
 <p> the number of configured routes</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2017,7 +1998,6 @@ nm_setting_ip6_config_get_route (<em class="parameter"><code><a class="link" hre
 <a name="id-1.2.26.11.48.5"></a><h4>Returns</h4>
 <p> the route at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2053,7 +2033,6 @@ given route is duplicated internally and is not changed by this function.</p>
 <div class="refsect3">
 <a name="id-1.2.26.11.49.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the route was added; <code class="literal">FALSE</code> if the route was already known.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2121,9 +2100,8 @@ nm_setting_ip6_config_remove_route_by_value
 <div class="refsect3">
 <a name="id-1.2.26.11.51.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the route was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2174,7 +2152,6 @@ property.</p>
 <a name="id-1.2.26.11.53.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if automatically configured (ie via DHCP) routes should be
 ignored.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2204,9 +2181,8 @@ property.</p>
 <a name="id-1.2.26.11.54.6"></a><h4>Returns</h4>
 <p> the route metric that is used for IPv6 routes that don't explicitly
 specify a metric. See <a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--route-metric" title="The “route-metric” property"><span class="type">“route-metric”</span></a> for more details.</p>
-<p></p>
 </div>
-<p class="since">Since 1.0</p>
+<p class="since">Since: 1.0</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2235,7 +2211,6 @@ property.</p>
 <a name="id-1.2.26.11.55.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if automatically configured (ie via DHCP or router
 advertisements) DNS information should be ignored.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2264,9 +2239,8 @@ property.</p>
 <div class="refsect3">
 <a name="id-1.2.26.11.56.6"></a><h4>Returns</h4>
 <p> the configured hostname to send to the DHCP server</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2295,7 +2269,6 @@ property.</p>
 <a name="id-1.2.26.11.57.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if this connection should never be the default connection
 for IPv6 addressing</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2324,7 +2297,6 @@ property.</p>
 <a name="id-1.2.26.11.58.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if this connection doesn't require IPv6 addressing to complete
 for the connection to succeed.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2352,7 +2324,6 @@ property.</p>
 <div class="refsect3">
 <a name="id-1.2.26.11.59.6"></a><h4>Returns</h4>
 <p> IPv6 Privacy Extensions configuration value (<a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigPrivacy" title="enum NMSettingIP6ConfigPrivacy"><span class="type">NMSettingIP6ConfigPrivacy</span></a>).</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -2362,8 +2333,6 @@ property.</p>
 <a name="NM-SETTING-IP6-CONFIG-SETTING-NAME:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2416,104 +2385,78 @@ not valid with the given IPv6 method</p>
 <a name="NM-SETTING-IP6-CONFIG-ERROR:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD             "method"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-DNS:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_DNS                "dns"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-DNS-SEARCH:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_DNS_SEARCH</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_DNS_SEARCH         "dns-search"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-ADDRESSES:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_ADDRESSES</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-ROUTES:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-ROUTE-METRIC:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_ROUTE_METRIC</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_ROUTE_METRIC       "route-metric"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-IGNORE-AUTO-ROUTES:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-IGNORE-AUTO-DNS:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_NEVER_DEFAULT</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-MAY-FAIL:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_MAY_FAIL</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_MAY_FAIL           "may-fail"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-IP6-PRIVACY:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_IP6_PRIVACY</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_IP6_PRIVACY        "ip6-privacy"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-DHCP-HOSTNAME:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2623,37 +2566,61 @@ are enabled and temporary addresses are preferred over public addresses</p>
 <div class="refsect2">
 <a name="NMSettingIP6Config--addresses"></a><h3>The <code class="literal">“addresses”</code> property</h3>
 <pre class="programlisting">  “addresses”                <span class="type">GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*</span></pre>
-<p></p>
+<p>Array of IPv6 address structures.  Each IPv6 address structure is
+composed of 3 members, the first being a byte array containing the IPv6
+address (network byte order), the second a 32-bit integer containing the
+IPv6 address prefix, and the third a byte array containing the IPv6
+address (network byte order) of the gateway associated with this address,
+if any.  If no gateway is given, the third element should be given as all
+zeros.  For the "auto" method, given IP addresses are appended to those
+returned by automatic configuration.  Addresses cannot be used with the
+"shared" or "link-local" methods as the interface is automatically
+assigned an address with these methods.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingIP6Config--dhcp-hostname"></a><h3>The <code class="literal">“dhcp-hostname”</code> property</h3>
 <pre class="programlisting">  “dhcp-hostname”            <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The specified name will be sent to the DHCP server when acquiring a
+lease.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingIP6Config--dns"></a><h3>The <code class="literal">“dns”</code> property</h3>
 <pre class="programlisting">  “dns”                      <span class="type">GPtrArray_GArray_guchar__</span> *</pre>
-<p></p>
+<p>Array of DNS servers, where each member of the array is a byte array
+containing the IPv6 address of the DNS server (in network byte order).
+For the "auto" method, these DNS servers are appended to those (if any)
+returned by automatic configuration.  DNS servers cannot be used with the
+"shared" or "link-local" methods as there is no usptream network. In all
+other methods, these DNS servers are used as the only DNS servers for
+this connection.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingIP6Config--dns-search"></a><h3>The <code class="literal">“dns-search”</code> property</h3>
 <pre class="programlisting">  “dns-search”               <span class="type">GSList_gchararray_</span> *</pre>
-<p></p>
+<p>List of DNS search domains.  For the "auto" method, these search domains
+are appended to those returned by automatic configuration. Search domains
+cannot be used with the "shared" or "link-local" methods as there is no
+upstream network.  In all other methods, these search domains are used as
+the only search domains for this connection.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingIP6Config--ignore-auto-dns"></a><h3>The <code class="literal">“ignore-auto-dns”</code> property</h3>
 <pre class="programlisting">  “ignore-auto-dns”          <span class="type">gboolean</span></pre>
-<p></p>
+<p>When the method is set to "auto" or "dhcp" and this property is set to
+<code class="literal">TRUE</code>, automatically configured nameservers and search domains are
+ignored and only nameservers and search domains specified in the
+<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--dns" title="The “dns” property"><span class="type">“dns”</span></a> and <a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--dns-search" title="The “dns-search” property"><span class="type">“dns-search”</span></a> properties, if
+any, are used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2661,7 +2628,9 @@ are enabled and temporary addresses are preferred over public addresses</p>
 <div class="refsect2">
 <a name="NMSettingIP6Config--ignore-auto-routes"></a><h3>The <code class="literal">“ignore-auto-routes”</code> property</h3>
 <pre class="programlisting">  “ignore-auto-routes”       <span class="type">gboolean</span></pre>
-<p></p>
+<p>When the method is set to "auto" or "dhcp" and this property is set to
+<code class="literal">TRUE</code>, automatically configured routes are ignored and only routes
+specified in the <a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--routes" title="The “routes” property"><span class="type">“routes”</span></a> property, if any, are used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2669,7 +2638,13 @@ are enabled and temporary addresses are preferred over public addresses</p>
 <div class="refsect2">
 <a name="NMSettingIP6Config--ip6-privacy"></a><h3>The <code class="literal">“ip6-privacy”</code> property</h3>
 <pre class="programlisting">  “ip6-privacy”              <span class="type">gint</span></pre>
-<p></p>
+<p>Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If
+enabled, it makes the kernel generate a temporary IPv6 address in
+addition to the public one generated from MAC address via modified
+EUI-64.  This enhances privacy, but could cause problems in some
+applications, on the other hand.  The permitted values are: 0: disabled,
+1: enabled (prefer public address), 2: enabled (prefer temporary
+addresses).</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [-1,2]</p>
 <p>Default value: -1</p>
@@ -2678,7 +2653,12 @@ are enabled and temporary addresses are preferred over public addresses</p>
 <div class="refsect2">
 <a name="NMSettingIP6Config--may-fail"></a><h3>The <code class="literal">“may-fail”</code> property</h3>
 <pre class="programlisting">  “may-fail”                 <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, allow overall network configuration to proceed even if IPv6
+configuration times out.  Note that at least one IP configuration must
+succeed or overall network configuration will still fail.  For example,
+in IPv4-only networks, setting this property to <code class="literal">TRUE</code> allows the overall
+network configuration to succeed if IPv6 configuration fails but IPv4
+configuration completes successfully.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
@@ -2686,7 +2666,16 @@ are enabled and temporary addresses are preferred over public addresses</p>
 <div class="refsect2">
 <a name="NMSettingIP6Config--method"></a><h3>The <code class="literal">“method”</code> property</h3>
 <pre class="programlisting">  “method”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>IPv6 configuration method.  If "auto" is specified then the appropriate
+automatic method (PPP, router advertisement, etc) is used for the device
+and most other properties can be left unset.  To force the use of DHCP
+only, specify "dhcp"; this method is only valid for Ethernet- based
+hardware.  If "link-local" is specified, then an IPv6 link-local address
+will be assigned to the interface.  If "manual" is specified, static IP
+addressing is used and at least one IP address must be given in the
+"addresses" property.  If "ignore" is specified, IPv6 configuration is
+not done. This property must be set.  Note: the "shared" method is not
+yet supported.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -2694,7 +2683,9 @@ are enabled and temporary addresses are preferred over public addresses</p>
 <div class="refsect2">
 <a name="NMSettingIP6Config--never-default"></a><h3>The <code class="literal">“never-default”</code> property</h3>
 <pre class="programlisting">  “never-default”            <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, this connection will never be the default IPv6 connection,
+meaning it will never be assigned the default IPv6 route by
+NetworkManager.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2702,23 +2693,36 @@ are enabled and temporary addresses are preferred over public addresses</p>
 <div class="refsect2">
 <a name="NMSettingIP6Config--route-metric"></a><h3>The <code class="literal">“route-metric”</code> property</h3>
 <pre class="programlisting">  “route-metric”             <span class="type">gint64</span></pre>
-<p></p>
+<p>The default metric for routes that don't explicitly specify a metric.
+The default value -1 means that the metric is choosen automatically
+based on the device type.
+The metric applies to dynamic routes, manual (static) routes that
+don't have an explicit metric setting, address prefix routes, and
+the default route.
+As the linux kernel replaces zero (0) by 1024 (user-default), setting
+this property to 0 means effectively setting it to 1024.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [-1,4294967295]</p>
 <p>Default value: -1</p>
-<p class="since">Since 1.0</p>
+<p class="since">Since: 1.0</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingIP6Config--routes"></a><h3>The <code class="literal">“routes”</code> property</h3>
 <pre class="programlisting">  “routes”                   <span class="type">GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*</span></pre>
-<p></p>
+<p>Array of IPv6 route structures.  Each IPv6 route structure is composed of
+4 members; the first being the destination IPv6 network or address
+(network byte order) as a byte array, the second the destination network
+or address IPv6 prefix, the third being the next-hop IPv6 address
+(network byte order) if any, and the fourth being the route metric. For
+the "auto" method, given IP routes are appended to those returned by
+automatic configuration.  Routes cannot be used with the "shared" or
+"link-local" methods because there is no upstream network.</p>
 <p>Flags: Read / Write</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index f61fe6f7..82db623e 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingInfiniband</title>
+<title>NMSettingInfiniband: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingGeneric.html" title="NMSettingGeneric">
 <link rel="next" href="NMSettingVlan.html" title="NMSettingVlan">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -209,7 +209,6 @@ nm_setting_infiniband_error_quark (<em class="parameter"><code><span class="type
 <div class="refsect3">
 <a name="id-1.2.19.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingInfiniband.html" title="NMSettingInfiniband"><span class="type">NMSettingInfiniband</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -247,7 +246,6 @@ nm_setting_infiniband_get_mac_address (<em class="parameter"><code><a class="lin
 <div class="refsect3">
 <a name="id-1.2.19.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -273,7 +271,6 @@ nm_setting_infiniband_get_mtu (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.2.19.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband--mtu" title="The “mtu” property"><span class="type">“mtu”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -302,7 +299,6 @@ nm_setting_infiniband_get_transport_mode
 <div class="refsect3">
 <a name="id-1.2.19.9.6.6"></a><h4>Returns</h4>
 <p> the IPoIB transport mode</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -331,7 +327,6 @@ a 16-bit unsigned integer.</p>
 <div class="refsect3">
 <a name="id-1.2.19.9.7.6"></a><h4>Returns</h4>
 <p> the IPoIB P_Key</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -358,7 +353,6 @@ nm_setting_infiniband_get_parent (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.2.19.9.8.6"></a><h4>Returns</h4>
 <p> the parent interface name</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -368,8 +362,6 @@ nm_setting_infiniband_get_parent (<em class="parameter"><code><a class="link" hr
 <a name="NM-SETTING-INFINIBAND-SETTING-NAME:CAPS"></a><h3>NM_SETTING_INFINIBAND_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_SETTING_NAME "infiniband"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -414,48 +406,36 @@ required</p>
 <a name="NM-SETTING-INFINIBAND-ERROR:CAPS"></a><h3>NM_SETTING_INFINIBAND_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_ERROR nm_setting_infiniband_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-INFINIBAND-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_INFINIBAND_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_MAC_ADDRESS    "mac-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-INFINIBAND-MTU:CAPS"></a><h3>NM_SETTING_INFINIBAND_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_MTU            "mtu"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-INFINIBAND-TRANSPORT-MODE:CAPS"></a><h3>NM_SETTING_INFINIBAND_TRANSPORT_MODE</h3>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_TRANSPORT_MODE "transport-mode"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-INFINIBAND-P-KEY:CAPS"></a><h3>NM_SETTING_INFINIBAND_P_KEY</h3>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_P_KEY          "p-key"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-INFINIBAND-PARENT:CAPS"></a><h3>NM_SETTING_INFINIBAND_PARENT</h3>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_PARENT         "parent"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -463,14 +443,17 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingInfiniband--mac-address"></a><h3>The <code class="literal">“mac-address”</code> property</h3>
 <pre class="programlisting">  “mac-address”              <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>If specified, this connection will only apply to the IPoIB device whose
+permanent MAC address matches. This property does not change the MAC
+address of the device (i.e. MAC spoofing).</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingInfiniband--mtu"></a><h3>The <code class="literal">“mtu”</code> property</h3>
 <pre class="programlisting">  “mtu”                      <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple frames.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -478,7 +461,10 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingInfiniband--p-key"></a><h3>The <code class="literal">“p-key”</code> property</h3>
 <pre class="programlisting">  “p-key”                    <span class="type">gint</span></pre>
-<p></p>
+<p>The InfiniBand P_Key to use for this device. A value of -1 means to use
+the default P_Key (aka "the P_Key at index 0").  Otherwise it is a 16-bit
+unsigned integer, whose high bit is set if it is a "full membership"
+P_Key.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [-1,65535]</p>
 <p>Default value: -1</p>
@@ -487,7 +473,10 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingInfiniband--parent"></a><h3>The <code class="literal">“parent”</code> property</h3>
 <pre class="programlisting">  “parent”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The interface name of the parent device of this device. Normally <code class="literal">NULL</code>,
+but if the <a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband--p-key" title="The “p-key” property"><span class="type">“p_key”</span></a> property is set, then you must
+specify the base device by setting either this property or
+<a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a>.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: NULL</p>
 </div>
@@ -495,14 +484,14 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingInfiniband--transport-mode"></a><h3>The <code class="literal">“transport-mode”</code> property</h3>
 <pre class="programlisting">  “transport-mode”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The IP-over-InfiniBand transport mode. Either "datagram" or
+"connected".</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index c43b6dd8..d9a5d1d0 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingOlpcMesh</title>
+<title>NMSettingOlpcMesh: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingVlan.html" title="NMSettingVlan">
 <link rel="next" href="NMSettingAdsl.html" title="NMSettingAdsl">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -157,8 +157,6 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingOlpcMesh.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMSettingOlpcMesh.functions_details"></a><h2>Functions</h2>
@@ -166,12 +164,6 @@
 <a name="nm-setting-olpc-mesh-error-quark"></a><h3>nm_setting_olpc_mesh_error_quark ()</h3>
 <pre class="programlisting"><span class="returnvalue">GQuark</span>
 nm_setting_olpc_mesh_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.2.21.8.2.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -182,7 +174,6 @@ nm_setting_olpc_mesh_new (<em class="parameter"><code><span class="type">void</s
 <div class="refsect3">
 <a name="id-1.2.21.8.3.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -190,24 +181,12 @@ nm_setting_olpc_mesh_new (<em class="parameter"><code><span class="type">void</s
 <a name="nm-setting-olpc-mesh-get-ssid"></a><h3>nm_setting_olpc_mesh_get_ssid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">GByteArray</span> *
 nm_setting_olpc_mesh_get_ssid (<em class="parameter"><code><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> *setting</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.2.21.8.4.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-setting-olpc-mesh-get-channel"></a><h3>nm_setting_olpc_mesh_get_channel ()</h3>
 <pre class="programlisting"><span class="returnvalue">guint32</span>
 nm_setting_olpc_mesh_get_channel (<em class="parameter"><code><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> *setting</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.2.21.8.5.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -215,12 +194,6 @@ nm_setting_olpc_mesh_get_channel (<em class="parameter"><code><a class="link" hr
 <pre class="programlisting">const <span class="returnvalue">GByteArray</span> *
 nm_setting_olpc_mesh_get_dhcp_anycast_address
                                (<em class="parameter"><code><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> *setting</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.2.21.8.6.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 </div>
 <div class="refsect1">
@@ -229,8 +202,6 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 <a name="NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS"></a><h3>NM_SETTING_OLPC_MESH_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -275,32 +246,24 @@ required</p>
 <a name="NM-SETTING-OLPC-MESH-ERROR:CAPS"></a><h3>NM_SETTING_OLPC_MESH_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-SSID:CAPS"></a><h3>NM_SETTING_OLPC_MESH_SSID</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-CHANNEL:CAPS"></a><h3>NM_SETTING_OLPC_MESH_CHANNEL</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-DHCP-ANYCAST-ADDRESS:CAPS"></a><h3>NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -308,7 +271,7 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingOlpcMesh--channel"></a><h3>The <code class="literal">“channel”</code> property</h3>
 <pre class="programlisting">  “channel”                  <span class="type">guint</span></pre>
-<p></p>
+<p>Channel on which the mesh network to join is located.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -316,20 +279,21 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingOlpcMesh--dhcp-anycast-address"></a><h3>The <code class="literal">“dhcp-anycast-address”</code> property</h3>
 <pre class="programlisting">  “dhcp-anycast-address”     <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>Anycast DHCP MAC address used when requesting an IP address via DHCP.
+The specific anycast address used determines which DHCP server class
+answers the request.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingOlpcMesh--ssid"></a><h3>The <code class="literal">“ssid”</code> property</h3>
 <pre class="programlisting">  “ssid”                     <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>SSID of the mesh network to join.</p>
 <p>Flags: Read / Write</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index d71e91f5..c66bd595 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingPPP</title>
+<title>NMSettingPPP: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingIP6Config.html" title="NMSettingIP6Config">
 <link rel="next" href="NMSettingPPPOE.html" title="NMSettingPPPOE">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -432,7 +432,6 @@ nm_setting_ppp_error_quark (<em class="parameter"><code><span class="type">void<
 <div class="refsect3">
 <a name="id-1.2.27.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingPPP.html" title="NMSettingPPP"><span class="type">NMSettingPPP</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -470,7 +469,6 @@ nm_setting_ppp_get_noauth (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="id-1.2.27.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--noauth" title="The “noauth” property"><span class="type">“noauth”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -496,7 +494,6 @@ nm_setting_ppp_get_refuse_eap (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.2.27.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--refuse-eap" title="The “refuse-eap” property"><span class="type">“refuse-eap”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -522,7 +519,6 @@ nm_setting_ppp_get_refuse_pap (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.2.27.9.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--refuse-pap" title="The “refuse-pap” property"><span class="type">“refuse-pap”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -548,7 +544,6 @@ nm_setting_ppp_get_refuse_chap (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.2.27.9.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--refuse-chap" title="The “refuse-chap” property"><span class="type">“refuse-chap”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -574,7 +569,6 @@ nm_setting_ppp_get_refuse_mschap (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.2.27.9.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--refuse-mschap" title="The “refuse-mschap” property"><span class="type">“refuse-mschap”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -600,7 +594,6 @@ nm_setting_ppp_get_refuse_mschapv2 (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.27.9.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--refuse-mschapv2" title="The “refuse-mschapv2” property"><span class="type">“refuse-mschapv2”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -626,7 +619,6 @@ nm_setting_ppp_get_nobsdcomp (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.27.9.10.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--nobsdcomp" title="The “nobsdcomp” property"><span class="type">“nobsdcomp”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -652,7 +644,6 @@ nm_setting_ppp_get_nodeflate (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.27.9.11.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--nodeflate" title="The “nodeflate” property"><span class="type">“nodeflate”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -678,7 +669,6 @@ nm_setting_ppp_get_no_vj_comp (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.2.27.9.12.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--no-vj-comp" title="The “no-vj-comp” property"><span class="type">“no-vj-comp”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -704,7 +694,6 @@ nm_setting_ppp_get_require_mppe (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.2.27.9.13.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--require-mppe" title="The “require-mppe” property"><span class="type">“require-mppe”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -730,7 +719,6 @@ nm_setting_ppp_get_require_mppe_128 (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.27.9.14.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--require-mppe-128" title="The “require-mppe-128” property"><span class="type">“require-mppe-128”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -756,7 +744,6 @@ nm_setting_ppp_get_mppe_stateful (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.2.27.9.15.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--mppe-stateful" title="The “mppe-stateful” property"><span class="type">“mppe-stateful”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -782,7 +769,6 @@ nm_setting_ppp_get_crtscts (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.2.27.9.16.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--crtscts" title="The “crtscts” property"><span class="type">“crtscts”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -808,7 +794,6 @@ nm_setting_ppp_get_baud (<em class="parameter"><code><a class="link" href="NMSet
 <div class="refsect3">
 <a name="id-1.2.27.9.17.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--baud" title="The “baud” property"><span class="type">“baud”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -834,7 +819,6 @@ nm_setting_ppp_get_mru (<em class="parameter"><code><a class="link" href="NMSett
 <div class="refsect3">
 <a name="id-1.2.27.9.18.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--mru" title="The “mru” property"><span class="type">“mru”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -860,7 +844,6 @@ nm_setting_ppp_get_mtu (<em class="parameter"><code><a class="link" href="NMSett
 <div class="refsect3">
 <a name="id-1.2.27.9.19.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--mtu" title="The “mtu” property"><span class="type">“mtu”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -886,7 +869,6 @@ nm_setting_ppp_get_lcp_echo_failure (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.27.9.20.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--lcp-echo-failure" title="The “lcp-echo-failure” property"><span class="type">“lcp-echo-failure”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -912,7 +894,6 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.2.27.9.21.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPP.html#NMSettingPPP--lcp-echo-interval" title="The “lcp-echo-interval” property"><span class="type">“lcp-echo-interval”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -922,8 +903,6 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <a name="NM-SETTING-PPP-SETTING-NAME:CAPS"></a><h3>NM_SETTING_PPP_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_SETTING_NAME "ppp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -976,152 +955,114 @@ with other setting configuration parameters</p>
 <a name="NM-SETTING-PPP-ERROR:CAPS"></a><h3>NM_SETTING_PPP_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-NOAUTH:CAPS"></a><h3>NM_SETTING_PPP_NOAUTH</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NOAUTH            "noauth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-EAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_EAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-PAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_PAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-CHAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_CHAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-MSCHAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_MSCHAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-MSCHAPV2:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_MSCHAPV2</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-NOBSDCOMP:CAPS"></a><h3>NM_SETTING_PPP_NOBSDCOMP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-NODEFLATE:CAPS"></a><h3>NM_SETTING_PPP_NODEFLATE</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-NO-VJ-COMP:CAPS"></a><h3>NM_SETTING_PPP_NO_VJ_COMP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REQUIRE-MPPE:CAPS"></a><h3>NM_SETTING_PPP_REQUIRE_MPPE</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REQUIRE-MPPE-128:CAPS"></a><h3>NM_SETTING_PPP_REQUIRE_MPPE_128</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-MPPE-STATEFUL:CAPS"></a><h3>NM_SETTING_PPP_MPPE_STATEFUL</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-CRTSCTS:CAPS"></a><h3>NM_SETTING_PPP_CRTSCTS</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_CRTSCTS           "crtscts"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-BAUD:CAPS"></a><h3>NM_SETTING_PPP_BAUD</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_BAUD              "baud"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-MRU:CAPS"></a><h3>NM_SETTING_PPP_MRU</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_MRU               "mru"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-MTU:CAPS"></a><h3>NM_SETTING_PPP_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_MTU               "mtu"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-LCP-ECHO-FAILURE:CAPS"></a><h3>NM_SETTING_PPP_LCP_ECHO_FAILURE</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-LCP-ECHO-INTERVAL:CAPS"></a><h3>NM_SETTING_PPP_LCP_ECHO_INTERVAL</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1129,7 +1070,9 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--baud"></a><h3>The <code class="literal">“baud”</code> property</h3>
 <pre class="programlisting">  “baud”                     <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, instruct pppd to set the serial port to the specified
+baudrate.  This value should normally be left as 0 to automatically
+choose the speed.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1137,7 +1080,9 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--crtscts"></a><h3>The <code class="literal">“crtscts”</code> property</h3>
 <pre class="programlisting">  “crtscts”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, specify that pppd should set the serial port to use hardware
+flow control with RTS and CTS signals.  This value should normally be set
+to <code class="literal">FALSE</code>.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1145,7 +1090,10 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--lcp-echo-failure"></a><h3>The <code class="literal">“lcp-echo-failure”</code> property</h3>
 <pre class="programlisting">  “lcp-echo-failure”         <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, instruct pppd to presume the connection to the peer has
+failed if the specified number of LCP echo-requests go unanswered by the
+peer.  The "lcp-echo-interval" property must also be set to a non-zero
+value if this property is used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1153,7 +1101,10 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--lcp-echo-interval"></a><h3>The <code class="literal">“lcp-echo-interval”</code> property</h3>
 <pre class="programlisting">  “lcp-echo-interval”        <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, instruct pppd to send an LCP echo-request frame to the peer
+every n seconds (where n is the specified value).  Note that some PPP
+peers will respond to echo requests and some will not, and it is not
+possible to autodetect this.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1161,7 +1112,8 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--mppe-stateful"></a><h3>The <code class="literal">“mppe-stateful”</code> property</h3>
 <pre class="programlisting">  “mppe-stateful”            <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, stateful MPPE is used.  See pppd documentation for more
+information on stateful MPPE.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1169,7 +1121,9 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--mru"></a><h3>The <code class="literal">“mru”</code> property</h3>
 <pre class="programlisting">  “mru”                      <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, instruct pppd to request that the peer send packets no
+larger than the specified size.  If non-zero, the MRU should be between
+128 and 16384.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 16384</p>
 <p>Default value: 0</p>
@@ -1178,7 +1132,8 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--mtu"></a><h3>The <code class="literal">“mtu”</code> property</h3>
 <pre class="programlisting">  “mtu”                      <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, instruct pppd to send packets no larger than the specified
+size.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1186,7 +1141,7 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--no-vj-comp"></a><h3>The <code class="literal">“no-vj-comp”</code> property</h3>
 <pre class="programlisting">  “no-vj-comp”               <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, Van Jacobsen TCP header compression will not be requested.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1194,7 +1149,9 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--noauth"></a><h3>The <code class="literal">“noauth”</code> property</h3>
 <pre class="programlisting">  “noauth”                   <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, do not require the other side (usually the PPP server) to
+authenticate itself to the client.  If <code class="literal">FALSE</code>, require authentication
+from the remote side.  In almost all cases, this should be <code class="literal">TRUE</code>.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
@@ -1202,7 +1159,7 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--nobsdcomp"></a><h3>The <code class="literal">“nobsdcomp”</code> property</h3>
 <pre class="programlisting">  “nobsdcomp”                <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, BSD compression will not be requested.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1210,7 +1167,7 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--nodeflate"></a><h3>The <code class="literal">“nodeflate”</code> property</h3>
 <pre class="programlisting">  “nodeflate”                <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, "deflate" compression will not be requested.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1218,7 +1175,7 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--refuse-chap"></a><h3>The <code class="literal">“refuse-chap”</code> property</h3>
 <pre class="programlisting">  “refuse-chap”              <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, the CHAP authentication method will not be used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1226,7 +1183,7 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--refuse-eap"></a><h3>The <code class="literal">“refuse-eap”</code> property</h3>
 <pre class="programlisting">  “refuse-eap”               <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, the EAP authentication method will not be used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1234,7 +1191,7 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--refuse-mschap"></a><h3>The <code class="literal">“refuse-mschap”</code> property</h3>
 <pre class="programlisting">  “refuse-mschap”            <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, the MSCHAP authentication method will not be used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1242,7 +1199,7 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--refuse-mschapv2"></a><h3>The <code class="literal">“refuse-mschapv2”</code> property</h3>
 <pre class="programlisting">  “refuse-mschapv2”          <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, the MSCHAPv2 authentication method will not be used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1250,7 +1207,7 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--refuse-pap"></a><h3>The <code class="literal">“refuse-pap”</code> property</h3>
 <pre class="programlisting">  “refuse-pap”               <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, the PAP authentication method will not be used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1258,7 +1215,10 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--require-mppe"></a><h3>The <code class="literal">“require-mppe”</code> property</h3>
 <pre class="programlisting">  “require-mppe”             <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
+the PPP session.  If either 64-bit or 128-bit MPPE is not available the
+session will fail.  Note that MPPE is not used on mobile broadband
+connections.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1266,14 +1226,15 @@ with other setting configuration parameters</p>
 <div class="refsect2">
 <a name="NMSettingPPP--require-mppe-128"></a><h3>The <code class="literal">“require-mppe-128”</code> property</h3>
 <pre class="programlisting">  “require-mppe-128”         <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
+required for the PPP session, and the "require-mppe" property must also
+be set to <code class="literal">TRUE</code>.  If 128-bit MPPE is not available the session will fail.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index 97d3edde..c7abaffe 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingPPPOE</title>
+<title>NMSettingPPPOE: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingPPP.html" title="NMSettingPPP">
 <link rel="next" href="NMSettingVPN.html" title="NMSettingVPN">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -193,7 +193,6 @@ nm_setting_pppoe_error_quark (<em class="parameter"><code><span class="type">voi
 <div class="refsect3">
 <a name="id-1.2.28.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -231,7 +230,6 @@ nm_setting_pppoe_get_service (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.28.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--service" title="The “service” property"><span class="type">“service”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -257,7 +255,6 @@ nm_setting_pppoe_get_username (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.2.28.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--username" title="The “username” property"><span class="type">“username”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -283,7 +280,6 @@ nm_setting_pppoe_get_password (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.2.28.9.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--password" title="The “password” property"><span class="type">“password”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -309,7 +305,6 @@ nm_setting_pppoe_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.28.9.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--password" title="The “password” property"><span class="type">“password”</span></a></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -319,8 +314,6 @@ nm_setting_pppoe_get_password_flags (<em class="parameter"><code><a class="link"
 <a name="NM-SETTING-PPPOE-SETTING-NAME:CAPS"></a><h3>NM_SETTING_PPPOE_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -373,40 +366,30 @@ did not contain a required PPP setting for PPP related options</p>
 <a name="NM-SETTING-PPPOE-ERROR:CAPS"></a><h3>NM_SETTING_PPPOE_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_ERROR nm_setting_pppoe_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPPOE-SERVICE:CAPS"></a><h3>NM_SETTING_PPPOE_SERVICE</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_SERVICE        "service"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPPOE-USERNAME:CAPS"></a><h3>NM_SETTING_PPPOE_USERNAME</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_USERNAME       "username"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPPOE-PASSWORD:CAPS"></a><h3>NM_SETTING_PPPOE_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_PASSWORD       "password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_PPPOE_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -414,7 +397,7 @@ did not contain a required PPP setting for PPP related options</p>
 <div class="refsect2">
 <a name="NMSettingPPPOE--password"></a><h3>The <code class="literal">“password”</code> property</h3>
 <pre class="programlisting">  “password”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Password used to authenticate with the PPPoE service.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -422,7 +405,7 @@ did not contain a required PPP setting for PPP related options</p>
 <div class="refsect2">
 <a name="NMSettingPPPOE--password-flags"></a><h3>The <code class="literal">“password-flags”</code> property</h3>
 <pre class="programlisting">  “password-flags”           <span class="type">guint</span></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingPPPOE.html#NMSettingPPPOE--password" title="The “password” property"><span class="type">“password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -431,7 +414,10 @@ did not contain a required PPP setting for PPP related options</p>
 <div class="refsect2">
 <a name="NMSettingPPPOE--service"></a><h3>The <code class="literal">“service”</code> property</h3>
 <pre class="programlisting">  “service”                  <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If specified, instruct PPPoE to only initiate sessions with access
+concentrators that provide the specified service.  For most providers,
+this should be left blank.  It is only required if there are multiple
+access concentrators or a specific service is known to be required.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -439,14 +425,13 @@ did not contain a required PPP setting for PPP related options</p>
 <div class="refsect2">
 <a name="NMSettingPPPOE--username"></a><h3>The <code class="literal">“username”</code> property</h3>
 <pre class="programlisting">  “username”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Username used to authenticate with the PPPoE service.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 6e9ede6a..43c21e9e 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingSerial</title>
+<title>NMSettingSerial: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingBluetooth.html" title="NMSettingBluetooth">
 <link rel="next" href="NMSettingCdma.html" title="NMSettingCdma">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -211,7 +211,6 @@ nm_setting_serial_error_quark (<em class="parameter"><code><span class="type">vo
 <div class="refsect3">
 <a name="id-1.2.9.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -249,7 +248,6 @@ nm_setting_serial_get_baud (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.2.9.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingSerial.html#NMSettingSerial--baud" title="The “baud” property"><span class="type">“baud”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -275,7 +273,6 @@ nm_setting_serial_get_bits (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.2.9.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingSerial.html#NMSettingSerial--bits" title="The “bits” property"><span class="type">“bits”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -301,7 +298,6 @@ nm_setting_serial_get_parity (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.9.9.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingSerial.html#NMSettingSerial--parity" title="The “parity” property"><span class="type">“parity”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -327,7 +323,6 @@ nm_setting_serial_get_stopbits (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.2.9.9.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingSerial.html#NMSettingSerial--stopbits" title="The “stopbits” property"><span class="type">“stopbits”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -353,7 +348,6 @@ nm_setting_serial_get_send_delay (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.2.9.9.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingSerial.html#NMSettingSerial--send-delay" title="The “send-delay” property"><span class="type">“send-delay”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -363,8 +357,6 @@ nm_setting_serial_get_send_delay (<em class="parameter"><code><a class="link" hr
 <a name="NM-SETTING-SERIAL-SETTING-NAME:CAPS"></a><h3>NM_SETTING_SERIAL_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_SETTING_NAME "serial"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -417,48 +409,36 @@ setting requires the connection to contain an <a class="link" href="NMSettingPPP
 <a name="NM-SETTING-SERIAL-ERROR:CAPS"></a><h3>NM_SETTING_SERIAL_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-SERIAL-BAUD:CAPS"></a><h3>NM_SETTING_SERIAL_BAUD</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_BAUD "baud"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-SERIAL-BITS:CAPS"></a><h3>NM_SETTING_SERIAL_BITS</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_BITS "bits"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-SERIAL-PARITY:CAPS"></a><h3>NM_SETTING_SERIAL_PARITY</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_PARITY "parity"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-SERIAL-STOPBITS:CAPS"></a><h3>NM_SETTING_SERIAL_STOPBITS</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_STOPBITS "stopbits"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-SERIAL-SEND-DELAY:CAPS"></a><h3>NM_SETTING_SERIAL_SEND_DELAY</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -466,7 +446,9 @@ setting requires the connection to contain an <a class="link" href="NMSettingPPP
 <div class="refsect2">
 <a name="NMSettingSerial--baud"></a><h3>The <code class="literal">“baud”</code> property</h3>
 <pre class="programlisting">  “baud”                     <span class="type">guint</span></pre>
-<p></p>
+<p>Speed to use for communication over the serial port.  Note that this
+value usually has no effect for mobile broadband modems as they generally
+ignore speed settings and use the highest available speed.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 57600</p>
 </div>
@@ -474,7 +456,7 @@ setting requires the connection to contain an <a class="link" href="NMSettingPPP
 <div class="refsect2">
 <a name="NMSettingSerial--bits"></a><h3>The <code class="literal">“bits”</code> property</h3>
 <pre class="programlisting">  “bits”                     <span class="type">guint</span></pre>
-<p></p>
+<p>Byte-width of the serial communication. The 8 in "8n1" for example.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [5,8]</p>
 <p>Default value: 8</p>
@@ -483,7 +465,8 @@ setting requires the connection to contain an <a class="link" href="NMSettingPPP
 <div class="refsect2">
 <a name="NMSettingSerial--parity"></a><h3>The <code class="literal">“parity”</code> property</h3>
 <pre class="programlisting">  “parity”                   <span class="type">gchar</span></pre>
-<p></p>
+<p>Parity setting of the serial port.  Either 'E' for even parity, 'o' for
+odd parity, or 'n' for no parity.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [69,111]</p>
 <p>Default value: 110</p>
@@ -492,7 +475,7 @@ setting requires the connection to contain an <a class="link" href="NMSettingPPP
 <div class="refsect2">
 <a name="NMSettingSerial--send-delay"></a><h3>The <code class="literal">“send-delay”</code> property</h3>
 <pre class="programlisting">  “send-delay”               <span class="type">guint64</span></pre>
-<p></p>
+<p>Time to delay between each byte sent to the modem, in microseconds.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -500,7 +483,8 @@ setting requires the connection to contain an <a class="link" href="NMSettingPPP
 <div class="refsect2">
 <a name="NMSettingSerial--stopbits"></a><h3>The <code class="literal">“stopbits”</code> property</h3>
 <pre class="programlisting">  “stopbits”                 <span class="type">guint</span></pre>
-<p></p>
+<p>Number of stop bits for communication on the serial port.  Either 1 or 2.
+The 1 in "8n1" for example.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [1,2]</p>
 <p>Default value: 1</p>
@@ -508,7 +492,6 @@ setting requires the connection to contain an <a class="link" href="NMSettingPPP
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingTeam.html b/docs/libnm-util/html/NMSettingTeam.html
index fb7ee6a7..2e40a312 100644
--- a/docs/libnm-util/html/NMSettingTeam.html
+++ b/docs/libnm-util/html/NMSettingTeam.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingTeam</title>
+<title>NMSettingTeam: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
 <link rel="next" href="NMSettingTeamPort.html" title="NMSettingTeamPort">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -158,9 +158,8 @@ nm_setting_team_error_quark (<em class="parameter"><code><span class="type">void
 <div class="refsect3">
 <a name="id-1.2.16.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingTeam.html" title="NMSettingTeam"><span class="type">NMSettingTeam</span></a> errors.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -173,7 +172,7 @@ nm_setting_team_new (<em class="parameter"><code><span class="type">void</span><
 <p> the new empty <a class="link" href="NMSettingTeam.html" title="NMSettingTeam"><span class="type">NMSettingTeam</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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -198,9 +197,8 @@ nm_setting_team_get_interface_name (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.16.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingTeam.html#NMSettingTeam--interface-name" title="The “interface-name” property"><span class="type">“interface-name”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -225,9 +223,8 @@ nm_setting_team_get_config (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.2.16.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingTeam.html#NMSettingTeam--config" title="The “config” property"><span class="type">“config”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 <div class="refsect1">
@@ -236,8 +233,6 @@ nm_setting_team_get_config (<em class="parameter"><code><a class="link" href="NM
 <a name="NM-SETTING-TEAM-SETTING-NAME:CAPS"></a><h3>NM_SETTING_TEAM_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_TEAM_SETTING_NAME "team"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -282,24 +277,18 @@ required</p>
 <a name="NM-SETTING-TEAM-ERROR:CAPS"></a><h3>NM_SETTING_TEAM_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_TEAM_ERROR nm_setting_team_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-TEAM-INTERFACE-NAME:CAPS"></a><h3>NM_SETTING_TEAM_INTERFACE_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_TEAM_INTERFACE_NAME "interface-name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-TEAM-CONFIG:CAPS"></a><h3>NM_SETTING_TEAM_CONFIG</h3>
 <pre class="programlisting">#define NM_SETTING_TEAM_CONFIG "config"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -307,7 +296,10 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingTeam--config"></a><h3>The <code class="literal">“config”</code> property</h3>
 <pre class="programlisting">  “config”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The JSON configuration for the team network interface.  The property
+should contain raw JSON configuration data suitable for teamd, because
+the value is passed directly to teamd. If not specified, the default
+configuration is used.  See man teamd.conf for the format details.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -315,14 +307,13 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingTeam--interface-name"></a><h3>The <code class="literal">“interface-name”</code> property</h3>
 <pre class="programlisting">  “interface-name”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The name of the virtual in-kernel team network interface</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingTeamPort.html b/docs/libnm-util/html/NMSettingTeamPort.html
index f29e7b88..c08a4eb0 100644
--- a/docs/libnm-util/html/NMSettingTeamPort.html
+++ b/docs/libnm-util/html/NMSettingTeamPort.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingTeamPort</title>
+<title>NMSettingTeamPort: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingTeam.html" title="NMSettingTeam">
 <link rel="next" href="NMSettingGeneric.html" title="NMSettingGeneric">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -139,9 +139,8 @@ nm_setting_team_port_error_quark (<em class="parameter"><code><span class="type"
 <div class="refsect3">
 <a name="id-1.2.17.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingTeamPort.html" title="NMSettingTeamPort"><span class="type">NMSettingTeamPort</span></a> errors.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -154,7 +153,7 @@ nm_setting_team_port_new (<em class="parameter"><code><span class="type">void</s
 <p> the new empty <a class="link" href="NMSettingTeamPort.html" title="NMSettingTeamPort"><span class="type">NMSettingTeamPort</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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -179,9 +178,8 @@ nm_setting_team_port_get_config (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.2.17.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingTeamPort.html#NMSettingTeamPort--config" title="The “config” property"><span class="type">“config”</span></a> property of the setting</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 <div class="refsect1">
@@ -190,8 +188,6 @@ nm_setting_team_port_get_config (<em class="parameter"><code><a class="link" hre
 <a name="NM-SETTING-TEAM-PORT-SETTING-NAME:CAPS"></a><h3>NM_SETTING_TEAM_PORT_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_TEAM_PORT_SETTING_NAME "team-port"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -236,16 +232,12 @@ is required</p>
 <a name="NM-SETTING-TEAM-PORT-ERROR:CAPS"></a><h3>NM_SETTING_TEAM_PORT_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_TEAM_PORT_ERROR nm_setting_team_port_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-TEAM-PORT-CONFIG:CAPS"></a><h3>NM_SETTING_TEAM_PORT_CONFIG</h3>
 <pre class="programlisting">#define NM_SETTING_TEAM_PORT_CONFIG     "config"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -253,14 +245,16 @@ is required</p>
 <div class="refsect2">
 <a name="NMSettingTeamPort--config"></a><h3>The <code class="literal">“config”</code> property</h3>
 <pre class="programlisting">  “config”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The JSON configuration for the team port. The property should contain raw
+JSON configuration data suitable for teamd, because the value is passed
+directly to teamd. If not specified, the default configuration is
+used. See man teamd.conf for the format details.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index 52bf704f..7f44ba65 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingVPN</title>
+<title>NMSettingVPN: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingPPPOE.html" title="NMSettingPPPOE">
 <link rel="next" href="libnm-util-nm-utils.html" title="nm-utils">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -284,7 +284,6 @@ nm_setting_vpn_error_quark (<em class="parameter"><code><span class="type">void<
 <div class="refsect3">
 <a name="id-1.2.29.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingVPN.html" title="NMSettingVPN"><span class="type">NMSettingVPN</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -360,7 +359,6 @@ plugin that should be used to connect to this VPN.</p>
 <div class="refsect3">
 <a name="id-1.2.29.9.5.6"></a><h4>Returns</h4>
 <p> the VPN plugin's service name</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -386,7 +384,6 @@ nm_setting_vpn_get_user_name (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.29.9.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingVPN.html#NMSettingVPN--user-name" title="The “user-name” property"><span class="type">“user-name”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -412,7 +409,6 @@ nm_setting_vpn_get_persistent (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.2.29.9.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingVPN.html#NMSettingVPN--persistent" title="The “persistent” property"><span class="type">“persistent”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -439,7 +435,6 @@ nm_setting_vpn_get_num_data_items (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.2.29.9.8.6"></a><h4>Returns</h4>
 <p> the number of VPN plugin specific configuration data items</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -517,7 +512,6 @@ by <a class="link" href="NMSettingVPN.html#nm-setting-vpn-add-data-item" title="
 <div class="refsect3">
 <a name="id-1.2.29.9.10.6"></a><h4>Returns</h4>
 <p> the data item, if any</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -554,7 +548,6 @@ nm_setting_vpn_remove_data_item (<em class="parameter"><code><a class="link" hre
 <a name="id-1.2.29.9.11.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the data item was found and removed from the internal list,
 <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -621,7 +614,6 @@ nm_setting_vpn_get_num_secrets (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.2.29.9.13.6"></a><h4>Returns</h4>
 <p> the number of VPN plugin specific secrets</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -698,7 +690,6 @@ by <a class="link" href="NMSettingVPN.html#nm-setting-vpn-add-secret" title="nm_
 <div class="refsect3">
 <a name="id-1.2.29.9.15.6"></a><h4>Returns</h4>
 <p> the secret, if any</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -735,7 +726,6 @@ nm_setting_vpn_remove_secret (<em class="parameter"><code><a class="link" href="
 <a name="id-1.2.29.9.16.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the secret was found and removed from the internal list,
 <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -785,8 +775,6 @@ iteration will not be part of the iteration.</p>
 <a name="NM-SETTING-VPN-SETTING-NAME:CAPS"></a><h3>NM_SETTING_VPN_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_SETTING_NAME "vpn"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -831,48 +819,36 @@ required</p>
 <a name="NM-SETTING-VPN-ERROR:CAPS"></a><h3>NM_SETTING_VPN_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VPN-SERVICE-TYPE:CAPS"></a><h3>NM_SETTING_VPN_SERVICE_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VPN-USER-NAME:CAPS"></a><h3>NM_SETTING_VPN_USER_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_USER_NAME    "user-name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VPN-PERSISTENT:CAPS"></a><h3>NM_SETTING_VPN_PERSISTENT</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_PERSISTENT   "persistent"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VPN-DATA:CAPS"></a><h3>NM_SETTING_VPN_DATA</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_DATA         "data"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VPN-SECRETS:CAPS"></a><h3>NM_SETTING_VPN_SECRETS</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_SECRETS      "secrets"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -880,14 +856,17 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingVPN--data"></a><h3>The <code class="literal">“data”</code> property</h3>
 <pre class="programlisting">  “data”                     <span class="type">GHashTable_gchararray+gchararray_*</span></pre>
-<p></p>
+<p>Dictionary of key/value pairs of VPN plugin specific data.  Both keys and
+values must be strings.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingVPN--persistent"></a><h3>The <code class="literal">“persistent”</code> property</h3>
 <pre class="programlisting">  “persistent”               <span class="type">gboolean</span></pre>
-<p></p>
+<p>If the VPN service supports persistence, and this property is <code class="literal">TRUE</code>,
+the VPN will attempt to stay connected across link changes and outages,
+until explicitly disconnected.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
 </div>
@@ -895,14 +874,17 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingVPN--secrets"></a><h3>The <code class="literal">“secrets”</code> property</h3>
 <pre class="programlisting">  “secrets”                  <span class="type">GHashTable_gchararray+gchararray_*</span></pre>
-<p></p>
+<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>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingVPN--service-type"></a><h3>The <code class="literal">“service-type”</code> property</h3>
 <pre class="programlisting">  “service-type”             <span class="type">gchar</span> *</pre>
-<p></p>
+<p>D-Bus service name of the VPN plugin that this setting uses to connect to
+its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc
+plugin.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -910,14 +892,18 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingVPN--user-name"></a><h3>The <code class="literal">“user-name”</code> property</h3>
 <pre class="programlisting">  “user-name”                <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If the VPN connection requires a user name for authentication, that name
+should be provided here.  If the connection is available to more than one
+user, and the VPN requires each user to supply a different name, then
+leave this property empty.  If this property is empty, NetworkManager
+will automatically supply the username of the user which requested the
+VPN connection.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index be791417..35e0e7a9 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingVlan</title>
+<title>NMSettingVlan: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingInfiniband.html" title="NMSettingInfiniband">
 <link rel="next" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -286,7 +286,6 @@ nm_setting_vlan_error_quark (<em class="parameter"><code><span class="type">void
 <div class="refsect3">
 <a name="id-1.2.20.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingVlan.html" title="NMSettingVlan"><span class="type">NMSettingVlan</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -324,7 +323,6 @@ nm_setting_vlan_get_interface_name (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.20.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingVlan.html#NMSettingVlan--interface-name" title="The “interface-name” property"><span class="type">“interface_name”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -350,7 +348,6 @@ nm_setting_vlan_get_parent (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.2.20.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingVlan.html#NMSettingVlan--parent" title="The “parent” property"><span class="type">“parent”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -376,7 +373,6 @@ nm_setting_vlan_get_id (<em class="parameter"><code><a class="link" href="NMSett
 <div class="refsect3">
 <a name="id-1.2.20.9.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingVlan.html#NMSettingVlan--id" title="The “id” property"><span class="type">“id”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -402,7 +398,6 @@ nm_setting_vlan_get_flags (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="id-1.2.20.9.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingVlan.html#NMSettingVlan--flags" title="The “flags” property"><span class="type">“flags”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -439,7 +434,6 @@ properties of this setting.</p>
 <div class="refsect3">
 <a name="id-1.2.20.9.8.6"></a><h4>Returns</h4>
 <p> return the number of ingress/egress priority entries, -1 if error</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -493,7 +487,6 @@ or <a class="link" href="NMSettingVlan.html#NMSettingVlan--egress-priority-map"
 <div class="refsect3">
 <a name="id-1.2.20.9.9.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if a priority map was returned, <code class="literal">FALSE</code> if error</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -558,7 +551,6 @@ to</p></td>
 <a name="id-1.2.20.9.10.8"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the new priority mapping was successfully added to the
 list, <code class="literal">FALSE</code> if error</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -652,9 +644,8 @@ to</p></td>
 <div class="refsect3">
 <a name="id-1.2.20.9.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the priority mapping was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -699,9 +690,8 @@ properties.</p>
 <div class="refsect3">
 <a name="id-1.2.20.9.13.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the priority mapping was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -775,7 +765,6 @@ the Linux SKB priorities to 802.1p priorities.</p>
 <a name="id-1.2.20.9.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the entry was successfully added to the list, or it
 overwrote the old value, <code class="literal">FALSE</code> if error</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -785,8 +774,6 @@ overwrote the old value, <code class="literal">FALSE</code> if error</p>
 <a name="NM-SETTING-VLAN-SETTING-NAME:CAPS"></a><h3>NM_SETTING_VLAN_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_SETTING_NAME "vlan"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -839,56 +826,42 @@ overwrote the old value, <code class="literal">FALSE</code> if error</p>
 <a name="NM-SETTING-VLAN-ERROR:CAPS"></a><h3>NM_SETTING_VLAN_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_ERROR nm_setting_vlan_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VLAN-INTERFACE-NAME:CAPS"></a><h3>NM_SETTING_VLAN_INTERFACE_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_INTERFACE_NAME       "interface-name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VLAN-PARENT:CAPS"></a><h3>NM_SETTING_VLAN_PARENT</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_PARENT               "parent"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VLAN-ID:CAPS"></a><h3>NM_SETTING_VLAN_ID</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_ID                   "id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VLAN-FLAGS:CAPS"></a><h3>NM_SETTING_VLAN_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_FLAGS                "flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VLAN-INGRESS-PRIORITY-MAP:CAPS"></a><h3>NM_SETTING_VLAN_INGRESS_PRIORITY_MAP</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_INGRESS_PRIORITY_MAP "ingress-priority-map"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VLAN-EGRESS-PRIORITY-MAP:CAPS"></a><h3>NM_SETTING_VLAN_EGRESS_PRIORITY_MAP</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -970,14 +943,20 @@ to 802.1p priorities used in VLANs.</p>
 <div class="refsect2">
 <a name="NMSettingVlan--egress-priority-map"></a><h3>The <code class="literal">“egress-priority-map”</code> property</h3>
 <pre class="programlisting">  “egress-priority-map”      <span class="type">GSList_gchararray_</span> *</pre>
-<p></p>
+<p>For outgoing packets, a list of mappings from Linux SKB priorities to
+802.1p priorities.  The mapping is given in the format "from:to" where
+both "from" and "to" are unsigned integers, ie "7:3".</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingVlan--flags"></a><h3>The <code class="literal">“flags”</code> property</h3>
 <pre class="programlisting">  “flags”                    <span class="type">guint</span></pre>
-<p></p>
+<p>One or more flags which control the behavior and features of the VLAN
+interface.  Flags include <a class="link" href="NMSettingVlan.html#NM-VLAN-FLAG-REORDER-HEADERS:CAPS"><code class="literal">NM_VLAN_FLAG_REORDER_HEADERS</code></a> (reordering of
+output packet headers), <a class="link" href="NMSettingVlan.html#NM-VLAN-FLAG-GVRP:CAPS"><code class="literal">NM_VLAN_FLAG_GVRP</code></a> (use of the GVRP protocol),
+and <a class="link" href="NMSettingVlan.html#NM-VLAN-FLAG-LOOSE-BINDING:CAPS"><code class="literal">NM_VLAN_FLAG_LOOSE_BINDING</code></a> (loose binding of the interface to its
+master device's operating state).</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -985,7 +964,8 @@ to 802.1p priorities used in VLANs.</p>
 <div class="refsect2">
 <a name="NMSettingVlan--id"></a><h3>The <code class="literal">“id”</code> property</h3>
 <pre class="programlisting">  “id”                       <span class="type">guint</span></pre>
-<p></p>
+<p>The VLAN identifier that the interface created by this connection should
+be assigned.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 4095</p>
 <p>Default value: 0</p>
@@ -994,14 +974,20 @@ to 802.1p priorities used in VLANs.</p>
 <div class="refsect2">
 <a name="NMSettingVlan--ingress-priority-map"></a><h3>The <code class="literal">“ingress-priority-map”</code> property</h3>
 <pre class="programlisting">  “ingress-priority-map”     <span class="type">GSList_gchararray_</span> *</pre>
-<p></p>
+<p>For incoming packets, a list of mappings from 802.1p priorities to Linux
+SKB priorities.  The mapping is given in the format "from:to" where both
+"from" and "to" are unsigned integers, ie "7:3".</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingVlan--interface-name"></a><h3>The <code class="literal">“interface-name”</code> property</h3>
 <pre class="programlisting">  “interface-name”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If given, specifies the kernel name of the VLAN interface. If not given,
+a default name will be constructed from the interface described by the
+parent interface and the <a class="link" href="NMSettingVlan.html#NMSettingVlan--id" title="The “id” property"><span class="type">“id”</span></a> property, eg "eth2.1". The
+parent interface may be given by the <a class="link" href="NMSettingVlan.html#NMSettingVlan--parent" title="The “parent” property"><span class="type">“parent”</span></a> property or by
+the <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a> property of an <a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> setting.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: NULL</p>
 </div>
@@ -1009,14 +995,16 @@ to 802.1p priorities used in VLANs.</p>
 <div class="refsect2">
 <a name="NMSettingVlan--parent"></a><h3>The <code class="literal">“parent”</code> property</h3>
 <pre class="programlisting">  “parent”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If given, specifies the parent interface name or parent connection UUID
+from which this VLAN interface should be created.  If this property is
+not specified, the connection must contain an <a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> setting
+with a <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a> property.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index 6d0035fb..1b10df76 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingWimax</title>
+<title>NMSettingWimax: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingGsm.html" title="NMSettingGsm">
 <link rel="next" href="NMSettingBond.html" title="NMSettingBond">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -158,7 +158,6 @@ nm_setting_wimax_error_quark (<em class="parameter"><code><span class="type">voi
 <div class="refsect3">
 <a name="id-1.2.12.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingWimax.html" title="NMSettingWimax"><span class="type">NMSettingWimax</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -170,7 +169,6 @@ nm_setting_wimax_new (<em class="parameter"><code><span class="type">void</span>
 <div class="refsect3">
 <a name="id-1.2.12.9.3.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingWimax.html" title="NMSettingWimax"><span class="type">NMSettingWimax</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -198,7 +196,6 @@ specific WiMAX network this setting describes a connection to.</p>
 <div class="refsect3">
 <a name="id-1.2.12.9.4.6"></a><h4>Returns</h4>
 <p> the WiMAX NSP name</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -226,7 +223,6 @@ to.</p>
 <div class="refsect3">
 <a name="id-1.2.12.9.5.6"></a><h4>Returns</h4>
 <p> the MAC address</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -236,8 +232,6 @@ to.</p>
 <a name="NM-SETTING-WIMAX-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIMAX_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIMAX_SETTING_NAME "wimax"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -282,24 +276,18 @@ required</p>
 <a name="NM-SETTING-WIMAX-ERROR:CAPS"></a><h3>NM_SETTING_WIMAX_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_WIMAX_ERROR nm_setting_wimax_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIMAX-NETWORK-NAME:CAPS"></a><h3>NM_SETTING_WIMAX_NETWORK_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIMAX_NETWORK_NAME "network-name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIMAX-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIMAX_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -307,21 +295,23 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingWimax--mac-address"></a><h3>The <code class="literal">“mac-address”</code> property</h3>
 <pre class="programlisting">  “mac-address”              <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>If specified, this connection will only apply to the WiMAX device whose
+MAC address matches. This property does not change the MAC address of the
+device (known as MAC spoofing).</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWimax--network-name"></a><h3>The <code class="literal">“network-name”</code> property</h3>
 <pre class="programlisting">  “network-name”             <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Network Service Provider (NSP) name of the WiMAX network this connection
+should use.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index 3b0bfc3f..75184b1b 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingWired</title>
+<title>NMSettingWired: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingConnection.html" title="NMSettingConnection">
 <link rel="next" href="NMSettingWireless.html" title="NMSettingWireless">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -396,7 +396,6 @@ nm_setting_wired_error_quark (<em class="parameter"><code><span class="type">voi
 <div class="refsect3">
 <a name="id-1.2.5.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -434,7 +433,6 @@ nm_setting_wired_get_port (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="id-1.2.5.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--port" title="The “port” property"><span class="type">“port”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -460,7 +458,6 @@ nm_setting_wired_get_speed (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.2.5.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--speed" title="The “speed” property"><span class="type">“speed”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -486,7 +483,6 @@ nm_setting_wired_get_duplex (<em class="parameter"><code><a class="link" href="N
 <div class="refsect3">
 <a name="id-1.2.5.9.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--duplex" title="The “duplex” property"><span class="type">“duplex”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -512,7 +508,6 @@ nm_setting_wired_get_auto_negotiate (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.5.9.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--auto-negotiate" title="The “auto-negotiate” property"><span class="type">“auto-negotiate”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -538,7 +533,6 @@ nm_setting_wired_get_mac_address (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.2.5.9.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -565,7 +559,6 @@ nm_setting_wired_get_cloned_mac_address
 <div class="refsect3">
 <a name="id-1.2.5.9.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--cloned-mac-address" title="The “cloned-mac-address” property"><span class="type">“cloned-mac-address”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -620,9 +613,8 @@ nm_setting_wired_get_num_mac_blacklist_items
 <div class="refsect3">
 <a name="id-1.2.5.9.11.5"></a><h4>Returns</h4>
 <p> the number of blacklisted MAC addresses</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -658,9 +650,8 @@ nm_setting_wired_get_mac_blacklist_item
 <p> the blacklisted MAC address string (hex-digits-and-colons notation)
 at index <em class="parameter"><code>idx</code></em>
 </p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -696,9 +687,8 @@ nm_setting_wired_add_mac_blacklist_item
 <a name="id-1.2.5.9.13.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the MAC address was added; <code class="literal">FALSE</code> if the MAC address
 is invalid or was already present</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -731,7 +721,7 @@ nm_setting_wired_remove_mac_blacklist_item
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -768,9 +758,8 @@ the blacklist</p></td>
 <div class="refsect3">
 <a name="id-1.2.5.9.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the MAC address was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -794,7 +783,7 @@ nm_setting_wired_clear_mac_blacklist_items
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -819,7 +808,6 @@ nm_setting_wired_get_mtu (<em class="parameter"><code><a class="link" href="NMSe
 <div class="refsect3">
 <a name="id-1.2.5.9.17.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--mtu" title="The “mtu” property"><span class="type">“mtu”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -877,7 +865,6 @@ of 'qeth', 'lcs', or 'ctc'.</p>
 <div class="refsect3">
 <a name="id-1.2.5.9.19.6"></a><h4>Returns</h4>
 <p> the s390 device type</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -906,7 +893,6 @@ option individually using <a class="link" href="NMSettingWired.html#nm-setting-w
 <div class="refsect3">
 <a name="id-1.2.5.9.20.6"></a><h4>Returns</h4>
 <p> the number of s390-specific device options</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -962,7 +948,6 @@ option; this value is owned by the setting and should not be modified. </p></td>
 <p> <code class="literal">TRUE</code> on success if the index was valid and an option was found,
 <code class="literal">FALSE</code> if the index was invalid (ie, greater than the number of options
 currently held by the setting)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1001,7 +986,6 @@ nm_setting_wired_get_s390_option_by_key
 <a name="id-1.2.5.9.22.6"></a><h4>Returns</h4>
 <p> the value, or <code class="literal">NULL</code> if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1046,7 +1030,6 @@ may already exist.</p>
 <a name="id-1.2.5.9.23.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the option was valid and was added to the internal option
 list, <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1084,7 +1067,6 @@ list.</p>
 <a name="id-1.2.5.9.24.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the option was found and removed from the internal option
 list, <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1114,7 +1096,7 @@ nm_setting_wired_get_valid_s390_options
 <p> a <code class="literal">NULL</code>-terminated array of strings of valid s390 options. </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1123,8 +1105,6 @@ nm_setting_wired_get_valid_s390_options
 <a name="NM-SETTING-WIRED-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIRED_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1169,96 +1149,72 @@ required</p>
 <a name="NM-SETTING-WIRED-ERROR:CAPS"></a><h3>NM_SETTING_WIRED_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-PORT:CAPS"></a><h3>NM_SETTING_WIRED_PORT</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_PORT "port"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-SPEED:CAPS"></a><h3>NM_SETTING_WIRED_SPEED</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_SPEED "speed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-DUPLEX:CAPS"></a><h3>NM_SETTING_WIRED_DUPLEX</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_DUPLEX "duplex"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-AUTO-NEGOTIATE:CAPS"></a><h3>NM_SETTING_WIRED_AUTO_NEGOTIATE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRED_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-CLONED-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRED_CLONED_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-MAC-ADDRESS-BLACKLIST:CAPS"></a><h3>NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-MTU:CAPS"></a><h3>NM_SETTING_WIRED_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_MTU "mtu"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-S390-SUBCHANNELS:CAPS"></a><h3>NM_SETTING_WIRED_S390_SUBCHANNELS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-S390-NETTYPE:CAPS"></a><h3>NM_SETTING_WIRED_S390_NETTYPE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-S390-OPTIONS:CAPS"></a><h3>NM_SETTING_WIRED_S390_OPTIONS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1266,7 +1222,9 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingWired--auto-negotiate"></a><h3>The <code class="literal">“auto-negotiate”</code> property</h3>
 <pre class="programlisting">  “auto-negotiate”           <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, allow auto-negotiation of port speed and duplex mode.  If
+<code class="literal">FALSE</code>, do not allow auto-negotiation, in which case the "speed" and
+"duplex" properties should be set.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
@@ -1274,14 +1232,16 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingWired--cloned-mac-address"></a><h3>The <code class="literal">“cloned-mac-address”</code> property</h3>
 <pre class="programlisting">  “cloned-mac-address”       <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>If specified, request that the device use this MAC address instead of its
+permanent MAC address.  This is known as MAC cloning or spoofing.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWired--duplex"></a><h3>The <code class="literal">“duplex”</code> property</h3>
 <pre class="programlisting">  “duplex”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If specified, request that the device only use the specified duplex mode.
+Either "half" or "full".</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1289,21 +1249,27 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingWired--mac-address"></a><h3>The <code class="literal">“mac-address”</code> property</h3>
 <pre class="programlisting">  “mac-address”              <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>If specified, this connection will only apply to the Ethernet device
+whose permanent MAC address matches. This property does not change the
+MAC address of the device (i.e. MAC spoofing).</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWired--mac-address-blacklist"></a><h3>The <code class="literal">“mac-address-blacklist”</code> property</h3>
 <pre class="programlisting">  “mac-address-blacklist”    <span class="type">GSList_gchararray_</span> *</pre>
-<p></p>
+<p>If specified, this connection will never apply to the Ethernet device
+whose permanent MAC address matches an address in the list.  Each MAC
+address is in the standard hex-digits-and-colons notation
+(00:11:22:33:44:55).</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWired--mtu"></a><h3>The <code class="literal">“mtu”</code> property</h3>
 <pre class="programlisting">  “mtu”                      <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple Ethernet frames.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1311,7 +1277,10 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingWired--port"></a><h3>The <code class="literal">“port”</code> property</h3>
 <pre class="programlisting">  “port”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Specific port type to use if multiple the device supports multiple
+attachment methods.  One of "tp" (Twisted Pair), "aui" (Attachment Unit
+Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface.
+If the device supports only one port type, this setting is ignored.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1319,7 +1288,8 @@ required</p>
 <div class="refsect2">
 <a name="NMSettingWired--s390-nettype"></a><h3>The <code class="literal">“s390-nettype”</code> property</h3>
 <pre class="programlisting">  “s390-nettype”             <span class="type">gchar</span> *</pre>
-<p></p>
+<p>s390 network device type; one of "qeth", "lcs", or "ctc", representing
+the different types of virtual network devices available on s390 systems.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1327,28 +1297,37 @@ required</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”             <span class="type">GHashTable_gchararray+gchararray_*</span></pre>
-<p></p>
+<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>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWired--s390-subchannels"></a><h3>The <code class="literal">“s390-subchannels”</code> property</h3>
 <pre class="programlisting">  “s390-subchannels”         <span class="type">GPtrArray_gchararray_</span> *</pre>
-<p></p>
+<p>Identifies specific subchannels that this network device uses for
+communication with z/VM or s390 host.  Like the
+<a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a> property for non-z/VM devices, this property
+can be used to ensure this connection only applies to the network device
+that uses these subchannels.  The list should contain exactly 3 strings,
+and each string may only be composed of hexadecimal characters and the
+period (.) character.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWired--speed"></a><h3>The <code class="literal">“speed”</code> property</h3>
 <pre class="programlisting">  “speed”                    <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, request that the device use only the specified speed.  In
+Mbit/s, ie 100 == 100Mbit/s.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index f668698a..4642d621 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingWireless</title>
+<title>NMSettingWireless: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWired.html" title="NMSettingWired">
 <link rel="next" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -445,7 +445,6 @@ nm_setting_wireless_error_quark (<em class="parameter"><code><span class="type">
 <div class="refsect3">
 <a name="id-1.2.6.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -483,7 +482,6 @@ nm_setting_wireless_get_ssid (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.6.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--ssid" title="The “ssid” property"><span class="type">“ssid”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -509,7 +507,6 @@ nm_setting_wireless_get_mode (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.6.9.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--mode" title="The “mode” property"><span class="type">“mode”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -535,7 +532,6 @@ nm_setting_wireless_get_band (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.6.9.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--band" title="The “band” property"><span class="type">“band”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -561,7 +557,6 @@ nm_setting_wireless_get_channel (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.2.6.9.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--channel" title="The “channel” property"><span class="type">“channel”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -587,7 +582,6 @@ nm_setting_wireless_get_bssid (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.2.6.9.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--bssid" title="The “bssid” property"><span class="type">“bssid”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -613,7 +607,6 @@ nm_setting_wireless_get_rate (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.2.6.9.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--rate" title="The “rate” property"><span class="type">“rate”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -639,7 +632,6 @@ nm_setting_wireless_get_tx_power (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.2.6.9.10.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--tx-power" title="The “tx-power” property"><span class="type">“tx-power”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -665,7 +657,6 @@ nm_setting_wireless_get_mac_address (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.2.6.9.11.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -692,7 +683,6 @@ nm_setting_wireless_get_cloned_mac_address
 <div class="refsect3">
 <a name="id-1.2.6.9.12.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--cloned-mac-address" title="The “cloned-mac-address” property"><span class="type">“cloned-mac-address”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -747,9 +737,8 @@ nm_setting_wireless_get_num_mac_blacklist_items
 <div class="refsect3">
 <a name="id-1.2.6.9.14.5"></a><h4>Returns</h4>
 <p> the number of blacklisted MAC addresses</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -785,9 +774,8 @@ nm_setting_wireless_get_mac_blacklist_item
 <p> the blacklisted MAC address string (hex-digits-and-colons notation)
 at index <em class="parameter"><code>idx</code></em>
 </p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -823,9 +811,8 @@ nm_setting_wireless_add_mac_blacklist_item
 <a name="id-1.2.6.9.16.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the MAC address was added; <code class="literal">FALSE</code> if the MAC address
 is invalid or was already present</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -858,7 +845,7 @@ nm_setting_wireless_remove_mac_blacklist_item
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -895,9 +882,8 @@ the blacklist</p></td>
 <div class="refsect3">
 <a name="id-1.2.6.9.18.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the MAC address was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -921,7 +907,7 @@ nm_setting_wireless_clear_mac_blacklist_items
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -946,7 +932,6 @@ nm_setting_wireless_get_mtu (<em class="parameter"><code><a class="link" href="N
 <div class="refsect3">
 <a name="id-1.2.6.9.20.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--mtu" title="The “mtu” property"><span class="type">“mtu”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -972,7 +957,6 @@ nm_setting_wireless_get_hidden (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.2.6.9.21.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--hidden" title="The “hidden” property"><span class="type">“hidden”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1011,7 +995,6 @@ not be preserved.</p>
 <a name="id-1.2.6.9.22.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>bssid</code></em>
 was already known, <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1038,7 +1021,6 @@ nm_setting_wireless_get_num_seen_bssids
 <div class="refsect3">
 <a name="id-1.2.6.9.23.5"></a><h4>Returns</h4>
 <p> the number of BSSIDs in the previously seen BSSID list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1073,7 +1055,6 @@ nm_setting_wireless_get_seen_bssid (<em class="parameter"><code><a class="link"
 <a name="id-1.2.6.9.24.5"></a><h4>Returns</h4>
 <p> the BSSID at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1141,7 +1122,6 @@ capabilities</p></td>
 <a name="id-1.2.6.9.25.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the given settings are compatible with the access point's
 security flags and mode, <code class="literal">FALSE</code> if they are not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1172,7 +1152,6 @@ the presence of NM_SETTING_WIRELESS_SECURITY_SETTING_NAME in the connection.</p>
 <div class="refsect3">
 <a name="id-1.2.6.9.26.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--security" title="The “security” property"><span class="type">“security”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -1182,8 +1161,6 @@ the presence of NM_SETTING_WIRELESS_SECURITY_SETTING_NAME in the connection.</p>
 <a name="NM-SETTING-WIRELESS-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIRELESS_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1244,120 +1221,90 @@ set to a value that requires the <a class="link" href="NMSettingWireless.html#NM
 <a name="NM-SETTING-WIRELESS-ERROR:CAPS"></a><h3>NM_SETTING_WIRELESS_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SSID:CAPS"></a><h3>NM_SETTING_WIRELESS_SSID</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SSID        "ssid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MODE:CAPS"></a><h3>NM_SETTING_WIRELESS_MODE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MODE        "mode"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-BAND:CAPS"></a><h3>NM_SETTING_WIRELESS_BAND</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_BAND        "band"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-CHANNEL:CAPS"></a><h3>NM_SETTING_WIRELESS_CHANNEL</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_CHANNEL     "channel"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-BSSID:CAPS"></a><h3>NM_SETTING_WIRELESS_BSSID</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_BSSID       "bssid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-RATE:CAPS"></a><h3>NM_SETTING_WIRELESS_RATE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_RATE        "rate"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-TX-POWER:CAPS"></a><h3>NM_SETTING_WIRELESS_TX_POWER</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRELESS_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-CLONED-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MAC-ADDRESS-BLACKLIST:CAPS"></a><h3>NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MTU:CAPS"></a><h3>NM_SETTING_WIRELESS_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MTU         "mtu"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS"></a><h3>NM_SETTING_WIRELESS_SEEN_BSSIDS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-HIDDEN:CAPS"></a><h3>NM_SETTING_WIRELESS_HIDDEN</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_HIDDEN      "hidden"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SEC:CAPS"></a><h3>NM_SETTING_WIRELESS_SEC</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SEC         "security"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1373,7 +1320,7 @@ set to a value that requires the <a class="link" href="NMSettingWireless.html#NM
 </pre>
 <p>Indicates AP/master mode where the wireless device is started as an access
 point/hotspot.</p>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1389,7 +1336,12 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--band"></a><h3>The <code class="literal">“band”</code> property</h3>
 <pre class="programlisting">  “band”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or
+"bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network
+to the specific band, i.e. if "a" is specified, the device will not
+associate with the same network in the 2.4GHz band even if the network's
+settings are compatible.  This setting depends on specific driver
+capability and may not work with all drivers.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1397,14 +1349,20 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--bssid"></a><h3>The <code class="literal">“bssid”</code> property</h3>
 <pre class="programlisting">  “bssid”                    <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>If specified, directs the device to only associate with the given access
+point.  This capability is highly driver dependent and not supported by
+all devices.  Note: this property does not control the BSSID used when
+creating an Ad-Hoc network and is unlikely to in the future.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWireless--channel"></a><h3>The <code class="literal">“channel”</code> property</h3>
 <pre class="programlisting">  “channel”                  <span class="type">guint</span></pre>
-<p></p>
+<p>Wireless channel to use for the Wi-Fi connection.  The device will only
+join (or create for Ad-Hoc networks) a Wi-Fi network on the specified
+channel.  Because channel numbers overlap between bands, this property
+also requires the "band" property to be set.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1412,14 +1370,19 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--cloned-mac-address"></a><h3>The <code class="literal">“cloned-mac-address”</code> property</h3>
 <pre class="programlisting">  “cloned-mac-address”       <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>If specified, request that the Wi-Fi device use this MAC address instead
+of its permanent MAC address.  This is known as MAC cloning or spoofing.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWireless--hidden"></a><h3>The <code class="literal">“hidden”</code> property</h3>
 <pre class="programlisting">  “hidden”                   <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, indicates this network is a non-broadcasting network that hides
+its SSID.  In this case various workarounds may take place, such as
+probe-scanning the SSID for more reliable network discovery.  However,
+these workarounds expose inherent insecurities with hidden SSID networks,
+and thus hidden SSID networks should be used with caution.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1427,21 +1390,26 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--mac-address"></a><h3>The <code class="literal">“mac-address”</code> property</h3>
 <pre class="programlisting">  “mac-address”              <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>If specified, this connection will only apply to the Wi-Fi device whose
+permanent MAC address matches. This property does not change the MAC
+address of the device (i.e. MAC spoofing).</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWireless--mac-address-blacklist"></a><h3>The <code class="literal">“mac-address-blacklist”</code> property</h3>
 <pre class="programlisting">  “mac-address-blacklist”    <span class="type">GSList_gchararray_</span> *</pre>
-<p></p>
+<p>A list of permanent MAC addresses of Wi-Fi devices to which this
+connection should never apply.  Each MAC address should be given in the
+standard hex-digits-and-colons notation (eg "00:11:22:33:44:55").</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWireless--mode"></a><h3>The <code class="literal">“mode”</code> property</h3>
 <pre class="programlisting">  “mode”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap".  If blank,
+infrastructure is assumed.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1449,7 +1417,8 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--mtu"></a><h3>The <code class="literal">“mtu”</code> property</h3>
 <pre class="programlisting">  “mtu”                      <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple Ethernet frames.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1457,7 +1426,10 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--rate"></a><h3>The <code class="literal">“rate”</code> property</h3>
 <pre class="programlisting">  “rate”                     <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, directs the device to only use the specified bitrate for
+communication with the access point.  Units are in Kb/s, ie 5500 = 5.5
+Mbit/s.  This property is highly driver dependent and not all devices
+support setting a static bitrate.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1465,7 +1437,10 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--security"></a><h3>The <code class="literal">“security”</code> property</h3>
 <pre class="programlisting">  “security”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If the wireless connection has any security restrictions, like 802.1x,
+WEP, or WPA, set this property to
+<a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS" title="NM_SETTING_WIRELESS_SECURITY_SETTING_NAME"><code class="literal">NM_SETTING_WIRELESS_SECURITY_SETTING_NAME</code></a> and ensure the connection
+contains a valid <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> setting.</p>
 <div class="warning">
 <p><code class="literal">NMSettingWireless:security</code> has been deprecated since version 0.9.10 and should not be used in newly-written code.</p>
 <p>No longer used. Security restrictions are recognized
@@ -1479,28 +1454,34 @@ connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--seen-bssids"></a><h3>The <code class="literal">“seen-bssids”</code> property</h3>
 <pre class="programlisting">  “seen-bssids”              <span class="type">GSList_gchararray_</span> *</pre>
-<p></p>
+<p>A list of BSSIDs (each BSSID formatted as a MAC address like
+"00:11:22:33:44:55") that have been detected as part of the Wi-Fi
+network.  NetworkManager internally tracks previously seen BSSIDs. The
+property is only meant for reading and reflects the BSSID list of
+NetworkManager. The changes you make to this property will not be
+preserved.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWireless--ssid"></a><h3>The <code class="literal">“ssid”</code> property</h3>
 <pre class="programlisting">  “ssid”                     <span class="type">GArray_guchar_</span> *</pre>
-<p></p>
+<p>SSID of the Wi-Fi network. Must be specified.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWireless--tx-power"></a><h3>The <code class="literal">“tx-power”</code> property</h3>
 <pre class="programlisting">  “tx-power”                 <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, directs the device to use the specified transmit power.
+Units are dBm.  This property is highly driver dependent and not all
+devices support setting a static transmit power.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index 6f4b21a9..d091dda2 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NMSettingWirelessSecurity</title>
+<title>NMSettingWirelessSecurity: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWireless.html" title="NMSettingWireless">
 <link rel="next" href="NMSettingBluetooth.html" title="NMSettingBluetooth">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -537,7 +537,6 @@ nm_setting_wireless_security_error_quark
 <div class="refsect3">
 <a name="id-1.2.7.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -576,7 +575,6 @@ nm_setting_wireless_security_get_key_mgmt
 <div class="refsect3">
 <a name="id-1.2.7.9.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt" title="The “key-mgmt” property"><span class="type">“key-mgmt”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -604,7 +602,6 @@ nm_setting_wireless_security_get_num_protos
 <a name="id-1.2.7.9.5.5"></a><h4>Returns</h4>
 <p> the number of security protocols this connection allows when
 connecting to secure Wi-Fi networks</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -640,7 +637,6 @@ nm_setting_wireless_security_get_proto
 <a name="id-1.2.7.9.6.5"></a><h4>Returns</h4>
 <p> the protocol at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -682,7 +678,6 @@ with the access point.</p>
 <a name="id-1.2.7.9.7.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the protocol was new and and was added to the allowed
 protocol list, or <code class="literal">FALSE</code> if it was already in the list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -749,9 +744,8 @@ nm_setting_wireless_security_remove_proto_by_value
 <div class="refsect3">
 <a name="id-1.2.7.9.9.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the protocol was found and removed; <code class="literal">FALSE</code> it it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -801,7 +795,6 @@ nm_setting_wireless_security_get_num_pairwise
 <div class="refsect3">
 <a name="id-1.2.7.9.11.5"></a><h4>Returns</h4>
 <p> the number of pairwise encryption algorithms in the allowed list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -839,7 +832,6 @@ list.</p>
 <a name="id-1.2.7.9.12.6"></a><h4>Returns</h4>
 <p> the pairwise encryption algorithm at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -879,7 +871,6 @@ compatible with this connection.</p>
 <a name="id-1.2.7.9.13.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the algorithm was added to the list, <code class="literal">FALSE</code> if it was
 already in the list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -948,9 +939,8 @@ algorithm list.</p>
 <div class="refsect3">
 <a name="id-1.2.7.9.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the encryption algorith was found and removed; <code class="literal">FALSE</code> it it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1000,7 +990,6 @@ nm_setting_wireless_security_get_num_groups
 <div class="refsect3">
 <a name="id-1.2.7.9.17.5"></a><h4>Returns</h4>
 <p> the number of groupwise encryption algorithms in the allowed list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1038,7 +1027,6 @@ list.</p>
 <a name="id-1.2.7.9.18.6"></a><h4>Returns</h4>
 <p> the groupwise encryption algorithm at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1079,7 +1067,6 @@ compatible with this connection.</p>
 <a name="id-1.2.7.9.19.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the algorithm was added to the list, <code class="literal">FALSE</code> if it was
 already in the list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1149,9 +1136,8 @@ algorithm list.</p>
 <div class="refsect3">
 <a name="id-1.2.7.9.21.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the algorithm was found and removed; <code class="literal">FALSE</code> it it was not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1200,7 +1186,6 @@ nm_setting_wireless_security_get_psk (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.2.7.9.23.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk" title="The “psk” property"><span class="type">“psk”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1228,7 +1213,6 @@ nm_setting_wireless_security_get_psk_flags
 <a name="id-1.2.7.9.24.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
 <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk" title="The “psk” property"><span class="type">“psk”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1255,7 +1239,6 @@ nm_setting_wireless_security_get_leap_username
 <div class="refsect3">
 <a name="id-1.2.7.9.25.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username" title="The “leap-username” property"><span class="type">“leap-username”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1282,7 +1265,6 @@ nm_setting_wireless_security_get_leap_password
 <div class="refsect3">
 <a name="id-1.2.7.9.26.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password" title="The “leap-password” property"><span class="type">“leap-password”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1310,7 +1292,6 @@ nm_setting_wireless_security_get_leap_password_flags
 <a name="id-1.2.7.9.27.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
 <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password" title="The “leap-password” property"><span class="type">“leap-password”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1345,7 +1326,6 @@ nm_setting_wireless_security_get_wep_key
 <div class="refsect3">
 <a name="id-1.2.7.9.28.5"></a><h4>Returns</h4>
 <p> the WEP key at the given index</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1411,7 +1391,6 @@ nm_setting_wireless_security_get_wep_tx_keyidx
 <div class="refsect3">
 <a name="id-1.2.7.9.30.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-tx-keyidx" title="The “wep-tx-keyidx” property"><span class="type">“wep-tx-keyidx”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1438,7 +1417,6 @@ nm_setting_wireless_security_get_auth_alg
 <div class="refsect3">
 <a name="id-1.2.7.9.31.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg" title="The “auth-alg” property"><span class="type">“auth-alg”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1465,7 +1443,6 @@ nm_setting_wireless_security_get_wep_key_flags
 <div class="refsect3">
 <a name="id-1.2.7.9.32.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the all WEP keys</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1492,7 +1469,6 @@ nm_setting_wireless_security_get_wep_key_type
 <div class="refsect3">
 <a name="id-1.2.7.9.33.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type" title="The “wep-key-type” property"><span class="type">“wep-key-type”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -1502,8 +1478,6 @@ nm_setting_wireless_security_get_wep_key_type
 <a name="NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1581,8 +1555,6 @@ encryption protocol</p>
 <a name="NM-SETTING-WIRELESS-SECURITY-ERROR:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_ERROR</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1648,136 +1620,102 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <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>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-TX-KEYIDX:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-AUTH-ALG:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_AUTH_ALG</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PROTO:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PROTO</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PAIRWISE:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PAIRWISE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-GROUP:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_GROUP</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-LEAP-USERNAME:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME "leap-username"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY0:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY0</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY1</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY2</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY3</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PSK:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PSK</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1785,7 +1723,11 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--auth-alg"></a><h3>The <code class="literal">“auth-alg”</code> property</h3>
 <pre class="programlisting">  “auth-alg”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>When WEP is used (ie, key-mgmt = "none" or "ieee8021x") indicate the
+802.11 authentication algorithm required by the AP here.  One of "open"
+for Open System, "shared" for Shared Key, or "leap" for Cisco LEAP.  When
+using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the
+"leap-username" and "leap-password" properties must be specified.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1793,14 +1735,20 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--group"></a><h3>The <code class="literal">“group”</code> property</h3>
 <pre class="programlisting">  “group”                    <span class="type">GSList_gchararray_</span> *</pre>
-<p></p>
+<p>A list of group/broadcast encryption algorithms which prevents
+connections to Wi-Fi networks that do not utilize one of the algorithms
+in the list.  For maximum compatibility leave this property empty.  Each
+list element may be one of "wep40", "wep104", "tkip", or "ccmp".</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--key-mgmt"></a><h3>The <code class="literal">“key-mgmt”</code> property</h3>
 <pre class="programlisting">  “key-mgmt”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Key management used for the connection.  One of "none" (WEP), "ieee8021x"
+(Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure
+WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for
+any Wi-Fi connection that uses security.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1808,7 +1756,8 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--leap-password"></a><h3>The <code class="literal">“leap-password”</code> property</h3>
 <pre class="programlisting">  “leap-password”            <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The login password for legacy LEAP connections (ie, key-mgmt =
+"ieee8021x" and auth-alg = "leap").</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1816,7 +1765,8 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--leap-password-flags"></a><h3>The <code class="literal">“leap-password-flags”</code> property</h3>
 <pre class="programlisting">  “leap-password-flags”      <span class="type">guint</span></pre>
-<p></p>
+<p>Flags indicating how to handle the
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password" title="The “leap-password” property"><span class="type">“leap-password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -1825,7 +1775,8 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--leap-username"></a><h3>The <code class="literal">“leap-username”</code> property</h3>
 <pre class="programlisting">  “leap-username”            <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The login username for legacy LEAP connections (ie, key-mgmt =
+"ieee8021x" and auth-alg = "leap").</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1833,21 +1784,31 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--pairwise"></a><h3>The <code class="literal">“pairwise”</code> property</h3>
 <pre class="programlisting">  “pairwise”                 <span class="type">GSList_gchararray_</span> *</pre>
-<p></p>
+<p>A list of pairwise encryption algorithms which prevents connections to
+Wi-Fi networks that do not utilize one of the algorithms in the list.
+For maximum compatibility leave this property empty.  Each list element
+may be one of "tkip" or "ccmp".</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--proto"></a><h3>The <code class="literal">“proto”</code> property</h3>
 <pre class="programlisting">  “proto”                    <span class="type">GSList_gchararray_</span> *</pre>
-<p></p>
+<p>List of strings specifying the allowed WPA protocol versions to use.
+Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN).  If
+not specified, both WPA and RSN connections are allowed.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--psk"></a><h3>The <code class="literal">“psk”</code> property</h3>
 <pre class="programlisting">  “psk”                      <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it
+must contain only hexadecimal characters and is interpreted as a
+hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII
+characters (as specified in the 802.11i standard) and is interpreted as a
+WPA passphrase, and is hashed to derive the actual WPA-PSK used when
+connecting to the Wi-Fi network.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1855,7 +1816,8 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--psk-flags"></a><h3>The <code class="literal">“psk-flags”</code> property</h3>
 <pre class="programlisting">  “psk-flags”                <span class="type">guint</span></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk" title="The “psk” property"><span class="type">“psk”</span></a>
+property.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -1864,7 +1826,9 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key-flags"></a><h3>The <code class="literal">“wep-key-flags”</code> property</h3>
 <pre class="programlisting">  “wep-key-flags”            <span class="type">guint</span></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key0" title="The “wep-key0” property"><span class="type">“wep-key0”</span></a>,
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key1" title="The “wep-key1” property"><span class="type">“wep-key1”</span></a>, <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key2" title="The “wep-key2” property"><span class="type">“wep-key2”</span></a>,
+and <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key3" title="The “wep-key3” property"><span class="type">“wep-key3”</span></a> properties.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 7</p>
 <p>Default value: 0</p>
@@ -1873,7 +1837,12 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key-type"></a><h3>The <code class="literal">“wep-key-type”</code> property</h3>
 <pre class="programlisting">  “wep-key-type”             <span class="type">guint</span></pre>
-<p></p>
+<p>Controls the interpretation of WEP keys.  Allowed values are
+<a class="link" href="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-KEY:CAPS"><code class="literal">NM_WEP_KEY_TYPE_KEY</code></a>, in which case the key is either a 10- or
+26-character hexadecimal string, or a 5- or 13-character ASCII password;
+or <a class="link" href="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-PASSPHRASE:CAPS"><code class="literal">NM_WEP_KEY_TYPE_PASSPHRASE</code></a>, in which case the passphrase is provided
+as a string and will be hashed using the de-facto MD5 method to derive
+the actual WEP key.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 2</p>
 <p>Default value: 0</p>
@@ -1882,7 +1851,8 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key0"></a><h3>The <code class="literal">“wep-key0”</code> property</h3>
 <pre class="programlisting">  “wep-key0”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Index 0 WEP key.  This is the WEP key used in most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1890,7 +1860,8 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key1"></a><h3>The <code class="literal">“wep-key1”</code> property</h3>
 <pre class="programlisting">  “wep-key1”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Index 1 WEP key.  This WEP index is not used by most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1898,7 +1869,8 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key2"></a><h3>The <code class="literal">“wep-key2”</code> property</h3>
 <pre class="programlisting">  “wep-key2”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Index 2 WEP key.  This WEP index is not used by most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1906,7 +1878,8 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key3"></a><h3>The <code class="literal">“wep-key3”</code> property</h3>
 <pre class="programlisting">  “wep-key3”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Index 3 WEP key.  This WEP index is not used by most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1914,7 +1887,10 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-tx-keyidx"></a><h3>The <code class="literal">“wep-tx-keyidx”</code> property</h3>
 <pre class="programlisting">  “wep-tx-keyidx”            <span class="type">guint</span></pre>
-<p></p>
+<p>When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key
+index is used by the AP, put that WEP key index here.  Valid values are 0
+(default key) through 3.  Note that some consumer access points (like the
+Linksys WRT54G) number the keys 1 - 4.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 3</p>
 <p>Default value: 0</p>
@@ -1922,7 +1898,6 @@ the actual WEP key using the MD5 hash algorithm.</p>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html
index fbcda20a..76baf202 100644
--- a/docs/libnm-util/html/annotation-glossary.html
+++ b/docs/libnm-util/html/annotation-glossary.html
@@ -2,12 +2,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: Annotation Glossary</title>
+<title>Annotation Glossary: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -53,6 +53,8 @@
 <a name="glsS"></a><h3 class="title">S</h3>
 <dt><span class="glossterm"><a name="annotation-glossterm-scope%20call"></a>scope call</span></dt>
 <dd class="glossdef"><p>The callback is valid only during the call to the method.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-skip"></a>skip</span></dt>
+<dd class="glossdef"><p>Exposed in C code, not necessarily available in other languages.</p></dd>
 <a name="glsT"></a><h3 class="title">T</h3>
 <dt><span class="glossterm"><a name="annotation-glossterm-transfer%20container"></a>transfer container</span></dt>
 <dd class="glossdef"><p>Free data container after the code is done.</p></dd>
@@ -62,7 +64,6 @@
 <dd class="glossdef"><p>Don't free data after the code is done.</p></dd>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 228ba8e6..b7b0aaf5 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: API Index</title>
+<title>API Index: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="object-tree.html" title="Object Hierarchy">
 <link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -5220,7 +5220,6 @@
 <dd></dd>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index ef2dca61..44d6c268 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: libnm-util API Reference</title>
+<title>libnm-util API Reference: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="index.html" title="libnm-util Reference Manual">
 <link rel="next" href="NMConnection.html" title="NMConnection">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -122,7 +122,6 @@ that require PPP to deliver IP capability</span>
 </dl></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 36815443..7be22883 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="next" href="ch01.html" title="libnm-util API Reference">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -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-util Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-util 1.0.2
+      for libnm-util 1.0.4
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm-util/0.9/" target="_top">https://developer.gnome.org/libnm-util/0.9/</a>.
@@ -152,7 +152,6 @@ that require PPP to deliver IP capability</span>
 </dl></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index 417ba768..77fff963 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -73,6 +73,11 @@
 <ANCHOR id="NM-CONNECTION-CHANGED:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-CHANGED:CAPS">
 <ANCHOR id="NM-CONNECTION-PATH:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-PATH:CAPS">
 <ANCHOR id="NMConnectionError" href="libnm-util/NMConnection.html#NMConnectionError">
+<ANCHOR id="NM-CONNECTION-ERROR-UNKNOWN:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-CONNECTION-ERROR-CONNECTION-SETTING-NOT-FOUND:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-ERROR-CONNECTION-SETTING-NOT-FOUND:CAPS">
+<ANCHOR id="NM-CONNECTION-ERROR-CONNECTION-TYPE-INVALID:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-ERROR-CONNECTION-TYPE-INVALID:CAPS">
+<ANCHOR id="NM-CONNECTION-ERROR-SETTING-NOT-FOUND:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-ERROR-SETTING-NOT-FOUND:CAPS">
+<ANCHOR id="NM-CONNECTION-ERROR-INVALID-SETTING:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-ERROR-INVALID-SETTING:CAPS">
 <ANCHOR id="NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS">
 <ANCHOR id="NM-CONNECTION-ERROR:CAPS" href="libnm-util/NMConnection.html#NM-CONNECTION-ERROR:CAPS">
 <ANCHOR id="NMConnection-struct" href="libnm-util/NMConnection.html#NMConnection-struct">
@@ -115,13 +120,37 @@
 <ANCHOR id="nm-setting-get-virtual-iface-name" href="libnm-util/NMSetting.html#nm-setting-get-virtual-iface-name">
 <ANCHOR id="NMSetting.other_details" href="libnm-util/NMSetting.html#NMSetting.other_details">
 <ANCHOR id="NMSettingError" href="libnm-util/NMSetting.html#NMSettingError">
+<ANCHOR id="NM-SETTING-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-ERROR-PROPERTY-NOT-FOUND:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-ERROR-PROPERTY-NOT-FOUND:CAPS">
+<ANCHOR id="NM-SETTING-ERROR-PROPERTY-NOT-SECRET:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-ERROR-PROPERTY-NOT-SECRET:CAPS">
+<ANCHOR id="NM-SETTING-ERROR-PROPERTY-TYPE-MISMATCH:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-ERROR-PROPERTY-TYPE-MISMATCH:CAPS">
 <ANCHOR id="NM-SETTING-ERROR:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-NAME:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingSecretFlags" href="libnm-util/NMSetting.html#NMSettingSecretFlags">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-NONE:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-SECRET-FLAG-NONE:CAPS">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS">
 <ANCHOR id="NMSettingCompareFlags" href="libnm-util/NMSetting.html#NMSettingCompareFlags">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-EXACT:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-COMPARE-FLAG-EXACT:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-FUZZY:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-COMPARE-FLAG-FUZZY:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-IGNORE-ID:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-ID:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-IGNORE-SECRETS:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-SECRETS:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-IGNORE-AGENT-OWNED-SECRETS:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-AGENT-OWNED-SECRETS:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-IGNORE-NOT-SAVED-SECRETS:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-NOT-SAVED-SECRETS:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-DIFF-RESULT-WITH-DEFAULT:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-COMPARE-FLAG-DIFF-RESULT-WITH-DEFAULT:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-DIFF-RESULT-NO-DEFAULT:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-COMPARE-FLAG-DIFF-RESULT-NO-DEFAULT:CAPS">
 <ANCHOR id="NMSetting-struct" href="libnm-util/NMSetting.html#NMSetting-struct">
 <ANCHOR id="NMSettingHashFlags" href="libnm-util/NMSetting.html#NMSettingHashFlags">
+<ANCHOR id="NM-SETTING-HASH-FLAG-ALL:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-HASH-FLAG-ALL:CAPS">
+<ANCHOR id="NM-SETTING-HASH-FLAG-NO-SECRETS:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-HASH-FLAG-NO-SECRETS:CAPS">
+<ANCHOR id="NM-SETTING-HASH-FLAG-ONLY-SECRETS:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-HASH-FLAG-ONLY-SECRETS:CAPS">
 <ANCHOR id="NMSettingDiffResult" href="libnm-util/NMSetting.html#NMSettingDiffResult">
+<ANCHOR id="NM-SETTING-DIFF-RESULT-UNKNOWN:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-DIFF-RESULT-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-DIFF-RESULT-IN-A:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-DIFF-RESULT-IN-A:CAPS">
+<ANCHOR id="NM-SETTING-DIFF-RESULT-IN-B:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-DIFF-RESULT-IN-B:CAPS">
+<ANCHOR id="NM-SETTING-DIFF-RESULT-IN-A-DEFAULT:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-DIFF-RESULT-IN-A-DEFAULT:CAPS">
+<ANCHOR id="NM-SETTING-DIFF-RESULT-IN-B-DEFAULT:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-DIFF-RESULT-IN-B-DEFAULT:CAPS">
 <ANCHOR id="NMSetting.property-details" href="libnm-util/NMSetting.html#NMSetting.property-details">
 <ANCHOR id="NMSetting--name" href="libnm-util/NMSetting.html#NMSetting--name">
 <ANCHOR id="NMSettingConnection" href="libnm-util/NMSettingConnection.html">
@@ -160,6 +189,11 @@
 <ANCHOR id="NMSettingConnection.other_details" href="libnm-util/NMSettingConnection.html#NMSettingConnection.other_details">
 <ANCHOR id="NM-SETTING-CONNECTION-SETTING-NAME:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingConnectionError" href="libnm-util/NMSettingConnection.html#NMSettingConnectionError">
+<ANCHOR id="NM-SETTING-CONNECTION-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-CONNECTION-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-CONNECTION-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-CONNECTION-ERROR-TYPE-SETTING-NOT-FOUND:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-TYPE-SETTING-NOT-FOUND:CAPS">
+<ANCHOR id="NM-SETTING-CONNECTION-ERROR-IP-CONFIG-NOT-ALLOWED:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-IP-CONFIG-NOT-ALLOWED:CAPS">
 <ANCHOR id="NM-SETTING-CONNECTION-ERROR:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-CONNECTION-ID:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ID:CAPS">
 <ANCHOR id="NM-SETTING-CONNECTION-UUID:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-UUID:CAPS">
@@ -224,6 +258,9 @@
 <ANCHOR id="NMSettingWired.other_details" href="libnm-util/NMSettingWired.html#NMSettingWired.other_details">
 <ANCHOR id="NM-SETTING-WIRED-SETTING-NAME:CAPS" href="libnm-util/NMSettingWired.html#NM-SETTING-WIRED-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingWiredError" href="libnm-util/NMSettingWired.html#NMSettingWiredError">
+<ANCHOR id="NM-SETTING-WIRED-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingWired.html#NM-SETTING-WIRED-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-WIRED-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingWired.html#NM-SETTING-WIRED-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-WIRED-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingWired.html#NM-SETTING-WIRED-ERROR-MISSING-PROPERTY:CAPS">
 <ANCHOR id="NM-SETTING-WIRED-ERROR:CAPS" href="libnm-util/NMSettingWired.html#NM-SETTING-WIRED-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-WIRED-PORT:CAPS" href="libnm-util/NMSettingWired.html#NM-SETTING-WIRED-PORT:CAPS">
 <ANCHOR id="NM-SETTING-WIRED-SPEED:CAPS" href="libnm-util/NMSettingWired.html#NM-SETTING-WIRED-SPEED:CAPS">
@@ -284,6 +321,11 @@
 <ANCHOR id="NMSettingWireless.other_details" href="libnm-util/NMSettingWireless.html#NMSettingWireless.other_details">
 <ANCHOR id="NM-SETTING-WIRELESS-SETTING-NAME:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingWirelessError" href="libnm-util/NMSettingWireless.html#NMSettingWirelessError">
+<ANCHOR id="NM-SETTING-WIRELESS-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-ERROR-MISSING-SECURITY-SETTING:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-ERROR-MISSING-SECURITY-SETTING:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-ERROR-CHANNEL-REQUIRES-BAND:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-ERROR-CHANNEL-REQUIRES-BAND:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-ERROR:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SSID:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-SSID:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-MODE:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-MODE:CAPS">
@@ -360,8 +402,19 @@
 <ANCHOR id="NMSettingWirelessSecurity.other_details" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity.other_details">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingWirelessSecurityError" href="libnm-util/NMSettingWirelessSecurity.html#NMSettingWirelessSecurityError">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-ERROR-MISSING-802-1X-SETTING:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-MISSING-802-1X-SETTING:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-ERROR-LEAP-REQUIRES-802-1X:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-LEAP-REQUIRES-802-1X:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-ERROR-LEAP-REQUIRES-USERNAME:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-LEAP-REQUIRES-USERNAME:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-SECURITY-ERROR-SHARED-KEY-REQUIRES-WEP:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-SHARED-KEY-REQUIRES-WEP:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-ERROR:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR:CAPS">
 <ANCHOR id="NMWepKeyType" href="libnm-util/NMSettingWirelessSecurity.html#NMWepKeyType">
+<ANCHOR id="NM-WEP-KEY-TYPE-UNKNOWN:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-UNKNOWN:CAPS">
+<ANCHOR id="NM-WEP-KEY-TYPE-KEY:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-KEY:CAPS">
+<ANCHOR id="NM-WEP-KEY-TYPE-PASSPHRASE:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-PASSPHRASE:CAPS">
+<ANCHOR id="NM-WEP-KEY-TYPE-LAST:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-LAST:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-KEY-MGMT:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-KEY-MGMT:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-TX-KEYIDX:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-TX-KEYIDX:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-AUTH-ALG:CAPS" href="libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-AUTH-ALG:CAPS">
@@ -412,6 +465,10 @@
 <ANCHOR id="NMSettingBluetooth.other_details" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetooth.other_details">
 <ANCHOR id="NM-SETTING-BLUETOOTH-SETTING-NAME:CAPS" href="libnm-util/NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingBluetoothError" href="libnm-util/NMSettingBluetooth.html#NMSettingBluetoothError">
+<ANCHOR id="NM-SETTING-BLUETOOTH-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-BLUETOOTH-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-BLUETOOTH-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-BLUETOOTH-ERROR-TYPE-SETTING-NOT-FOUND:CAPS" href="libnm-util/NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-ERROR-TYPE-SETTING-NOT-FOUND:CAPS">
 <ANCHOR id="NM-SETTING-BLUETOOTH-ERROR:CAPS" href="libnm-util/NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-BLUETOOTH-BDADDR:CAPS" href="libnm-util/NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-BDADDR:CAPS">
 <ANCHOR id="NM-SETTING-BLUETOOTH-TYPE:CAPS" href="libnm-util/NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-TYPE:CAPS">
@@ -438,6 +495,10 @@
 <ANCHOR id="NMSettingSerial.other_details" href="libnm-util/NMSettingSerial.html#NMSettingSerial.other_details">
 <ANCHOR id="NM-SETTING-SERIAL-SETTING-NAME:CAPS" href="libnm-util/NMSettingSerial.html#NM-SETTING-SERIAL-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingSerialError" href="libnm-util/NMSettingSerial.html#NMSettingSerialError">
+<ANCHOR id="NM-SETTING-SERIAL-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingSerial.html#NM-SETTING-SERIAL-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-SERIAL-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingSerial.html#NM-SETTING-SERIAL-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-SERIAL-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingSerial.html#NM-SETTING-SERIAL-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-SERIAL-ERROR-MISSING-PPP-SETTING:CAPS" href="libnm-util/NMSettingSerial.html#NM-SETTING-SERIAL-ERROR-MISSING-PPP-SETTING:CAPS">
 <ANCHOR id="NM-SETTING-SERIAL-ERROR:CAPS" href="libnm-util/NMSettingSerial.html#NM-SETTING-SERIAL-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-SERIAL-BAUD:CAPS" href="libnm-util/NMSettingSerial.html#NM-SETTING-SERIAL-BAUD:CAPS">
 <ANCHOR id="NM-SETTING-SERIAL-BITS:CAPS" href="libnm-util/NMSettingSerial.html#NM-SETTING-SERIAL-BITS:CAPS">
@@ -467,6 +528,10 @@
 <ANCHOR id="NMSettingCdma.other_details" href="libnm-util/NMSettingCdma.html#NMSettingCdma.other_details">
 <ANCHOR id="NM-SETTING-CDMA-SETTING-NAME:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingCdmaError" href="libnm-util/NMSettingCdma.html#NMSettingCdmaError">
+<ANCHOR id="NM-SETTING-CDMA-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-CDMA-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-CDMA-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-CDMA-ERROR-MISSING-SERIAL-SETTING:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-ERROR-MISSING-SERIAL-SETTING:CAPS">
 <ANCHOR id="NM-SETTING-CDMA-ERROR:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-CDMA-NUMBER:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-NUMBER:CAPS">
 <ANCHOR id="NM-SETTING-CDMA-USERNAME:CAPS" href="libnm-util/NMSettingCdma.html#NM-SETTING-CDMA-USERNAME:CAPS">
@@ -502,6 +567,10 @@
 <ANCHOR id="NMSettingGsm.other_details" href="libnm-util/NMSettingGsm.html#NMSettingGsm.other_details">
 <ANCHOR id="NM-SETTING-GSM-SETTING-NAME:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingGsmError" href="libnm-util/NMSettingGsm.html#NMSettingGsmError">
+<ANCHOR id="NM-SETTING-GSM-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-GSM-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-GSM-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-GSM-ERROR-MISSING-SERIAL-SETTING:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-ERROR-MISSING-SERIAL-SETTING:CAPS">
 <ANCHOR id="NM-SETTING-GSM-ERROR:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-GSM-NUMBER:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NUMBER:CAPS">
 <ANCHOR id="NM-SETTING-GSM-USERNAME:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-USERNAME:CAPS">
@@ -515,7 +584,29 @@
 <ANCHOR id="NM-SETTING-GSM-ALLOWED-BANDS:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS">
 <ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE:CAPS">
 <ANCHOR id="NMSettingGsmNetworkType" href="libnm-util/NMSettingGsm.html#NMSettingGsmNetworkType">
+<ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE-ANY:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-ANY:CAPS">
+<ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE-UMTS-HSPA:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-UMTS-HSPA:CAPS">
+<ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE-GPRS-EDGE:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-GPRS-EDGE:CAPS">
+<ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE-PREFER-UMTS-HSPA:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-UMTS-HSPA:CAPS">
+<ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE-PREFER-GPRS-EDGE:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-GPRS-EDGE:CAPS">
+<ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE-PREFER-4G:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-4G:CAPS">
+<ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE-4G:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-4G:CAPS">
 <ANCHOR id="NMSettingGsmNetworkBand" href="libnm-util/NMSettingGsm.html#NMSettingGsmNetworkBand">
+<ANCHOR id="NM-SETTING-GSM-BAND-UNKNOWN:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-ANY:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-ANY:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-EGSM:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-EGSM:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-DCS:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-DCS:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-PCS:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-PCS:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-G850:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-G850:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-U2100:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-U2100:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-U1800:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-U1800:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-U17IV:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-U17IV:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-U800:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-U800:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-U850:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-U850:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-U900:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-U900:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-U17IX:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-U17IX:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-U1900:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-U1900:CAPS">
+<ANCHOR id="NM-SETTING-GSM-BAND-U2600:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-BAND-U2600:CAPS">
 <ANCHOR id="NMSettingGsm.property-details" href="libnm-util/NMSettingGsm.html#NMSettingGsm.property-details">
 <ANCHOR id="NMSettingGsm--allowed-bands" href="libnm-util/NMSettingGsm.html#NMSettingGsm--allowed-bands">
 <ANCHOR id="NMSettingGsm--apn" href="libnm-util/NMSettingGsm.html#NMSettingGsm--apn">
@@ -543,6 +634,9 @@
 <ANCHOR id="NMSettingWimax.other_details" href="libnm-util/NMSettingWimax.html#NMSettingWimax.other_details">
 <ANCHOR id="NM-SETTING-WIMAX-SETTING-NAME:CAPS" href="libnm-util/NMSettingWimax.html#NM-SETTING-WIMAX-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingWimaxError" href="libnm-util/NMSettingWimax.html#NMSettingWimaxError">
+<ANCHOR id="NM-SETTING-WIMAX-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingWimax.html#NM-SETTING-WIMAX-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-WIMAX-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingWimax.html#NM-SETTING-WIMAX-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-WIMAX-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingWimax.html#NM-SETTING-WIMAX-ERROR-MISSING-PROPERTY:CAPS">
 <ANCHOR id="NM-SETTING-WIMAX-ERROR:CAPS" href="libnm-util/NMSettingWimax.html#NM-SETTING-WIMAX-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-WIMAX-NETWORK-NAME:CAPS" href="libnm-util/NMSettingWimax.html#NM-SETTING-WIMAX-NETWORK-NAME:CAPS">
 <ANCHOR id="NM-SETTING-WIMAX-MAC-ADDRESS:CAPS" href="libnm-util/NMSettingWimax.html#NM-SETTING-WIMAX-MAC-ADDRESS:CAPS">
@@ -571,6 +665,11 @@
 <ANCHOR id="NMSettingBond.other_details" href="libnm-util/NMSettingBond.html#NMSettingBond.other_details">
 <ANCHOR id="NM-SETTING-BOND-SETTING-NAME:CAPS" href="libnm-util/NMSettingBond.html#NM-SETTING-BOND-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingBondError" href="libnm-util/NMSettingBond.html#NMSettingBondError">
+<ANCHOR id="NM-SETTING-BOND-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingBond.html#NM-SETTING-BOND-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-BOND-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingBond.html#NM-SETTING-BOND-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-BOND-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingBond.html#NM-SETTING-BOND-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-BOND-ERROR-INVALID-OPTION:CAPS" href="libnm-util/NMSettingBond.html#NM-SETTING-BOND-ERROR-INVALID-OPTION:CAPS">
+<ANCHOR id="NM-SETTING-BOND-ERROR-MISSING-OPTION:CAPS" href="libnm-util/NMSettingBond.html#NM-SETTING-BOND-ERROR-MISSING-OPTION:CAPS">
 <ANCHOR id="NM-SETTING-BOND-ERROR:CAPS" href="libnm-util/NMSettingBond.html#NM-SETTING-BOND-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-BOND-INTERFACE-NAME:CAPS" href="libnm-util/NMSettingBond.html#NM-SETTING-BOND-INTERFACE-NAME:CAPS">
 <ANCHOR id="NM-SETTING-BOND-OPTIONS:CAPS" href="libnm-util/NMSettingBond.html#NM-SETTING-BOND-OPTIONS:CAPS">
@@ -613,6 +712,9 @@
 <ANCHOR id="NMSettingBridge.other_details" href="libnm-util/NMSettingBridge.html#NMSettingBridge.other_details">
 <ANCHOR id="NM-SETTING-BRIDGE-SETTING-NAME:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingBridgeError" href="libnm-util/NMSettingBridge.html#NMSettingBridgeError">
+<ANCHOR id="NM-SETTING-BRIDGE-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR-MISSING-PROPERTY:CAPS">
 <ANCHOR id="NM-SETTING-BRIDGE-ERROR:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-BRIDGE-INTERFACE-NAME:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-INTERFACE-NAME:CAPS">
 <ANCHOR id="NM-SETTING-BRIDGE-MAC-ADDRESS:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-MAC-ADDRESS:CAPS">
@@ -647,6 +749,9 @@
 <ANCHOR id="NMSettingBridgePort.other_details" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePort.other_details">
 <ANCHOR id="NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingBridgePortError" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePortError">
+<ANCHOR id="NM-SETTING-BRIDGE-PORT-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-PORT-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-PORT-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR-MISSING-PROPERTY:CAPS">
 <ANCHOR id="NM-SETTING-BRIDGE-PORT-ERROR:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS">
 <ANCHOR id="NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS">
@@ -670,6 +775,9 @@
 <ANCHOR id="NMSettingTeam.other_details" href="libnm-util/NMSettingTeam.html#NMSettingTeam.other_details">
 <ANCHOR id="NM-SETTING-TEAM-SETTING-NAME:CAPS" href="libnm-util/NMSettingTeam.html#NM-SETTING-TEAM-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingTeamError" href="libnm-util/NMSettingTeam.html#NMSettingTeamError">
+<ANCHOR id="NM-SETTING-TEAM-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingTeam.html#NM-SETTING-TEAM-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-TEAM-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingTeam.html#NM-SETTING-TEAM-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-TEAM-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingTeam.html#NM-SETTING-TEAM-ERROR-MISSING-PROPERTY:CAPS">
 <ANCHOR id="NM-SETTING-TEAM-ERROR:CAPS" href="libnm-util/NMSettingTeam.html#NM-SETTING-TEAM-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-TEAM-INTERFACE-NAME:CAPS" href="libnm-util/NMSettingTeam.html#NM-SETTING-TEAM-INTERFACE-NAME:CAPS">
 <ANCHOR id="NM-SETTING-TEAM-CONFIG:CAPS" href="libnm-util/NMSettingTeam.html#NM-SETTING-TEAM-CONFIG:CAPS">
@@ -690,6 +798,9 @@
 <ANCHOR id="NMSettingTeamPort.other_details" href="libnm-util/NMSettingTeamPort.html#NMSettingTeamPort.other_details">
 <ANCHOR id="NM-SETTING-TEAM-PORT-SETTING-NAME:CAPS" href="libnm-util/NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingTeamPortError" href="libnm-util/NMSettingTeamPort.html#NMSettingTeamPortError">
+<ANCHOR id="NM-SETTING-TEAM-PORT-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-TEAM-PORT-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-TEAM-PORT-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-ERROR-MISSING-PROPERTY:CAPS">
 <ANCHOR id="NM-SETTING-TEAM-PORT-ERROR:CAPS" href="libnm-util/NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-TEAM-PORT-CONFIG:CAPS" href="libnm-util/NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-CONFIG:CAPS">
 <ANCHOR id="NMSettingTeamPort.property-details" href="libnm-util/NMSettingTeamPort.html#NMSettingTeamPort.property-details">
@@ -706,6 +817,9 @@
 <ANCHOR id="NMSettingGeneric.other_details" href="libnm-util/NMSettingGeneric.html#NMSettingGeneric.other_details">
 <ANCHOR id="NM-SETTING-GENERIC-SETTING-NAME:CAPS" href="libnm-util/NMSettingGeneric.html#NM-SETTING-GENERIC-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingGenericError" href="libnm-util/NMSettingGeneric.html#NMSettingGenericError">
+<ANCHOR id="NM-SETTING-GENERIC-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingGeneric.html#NM-SETTING-GENERIC-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-GENERIC-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingGeneric.html#NM-SETTING-GENERIC-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-GENERIC-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingGeneric.html#NM-SETTING-GENERIC-ERROR-MISSING-PROPERTY:CAPS">
 <ANCHOR id="NM-SETTING-GENERIC-ERROR:CAPS" href="libnm-util/NMSettingGeneric.html#NM-SETTING-GENERIC-ERROR:CAPS">
 <ANCHOR id="NMSettingInfiniband" href="libnm-util/NMSettingInfiniband.html">
 <ANCHOR id="NMSettingInfiniband.functions" href="libnm-util/NMSettingInfiniband.html#NMSettingInfiniband.functions">
@@ -725,6 +839,9 @@
 <ANCHOR id="NMSettingInfiniband.other_details" href="libnm-util/NMSettingInfiniband.html#NMSettingInfiniband.other_details">
 <ANCHOR id="NM-SETTING-INFINIBAND-SETTING-NAME:CAPS" href="libnm-util/NMSettingInfiniband.html#NM-SETTING-INFINIBAND-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingInfinibandError" href="libnm-util/NMSettingInfiniband.html#NMSettingInfinibandError">
+<ANCHOR id="NM-SETTING-INFINIBAND-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingInfiniband.html#NM-SETTING-INFINIBAND-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-INFINIBAND-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingInfiniband.html#NM-SETTING-INFINIBAND-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-INFINIBAND-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingInfiniband.html#NM-SETTING-INFINIBAND-ERROR-MISSING-PROPERTY:CAPS">
 <ANCHOR id="NM-SETTING-INFINIBAND-ERROR:CAPS" href="libnm-util/NMSettingInfiniband.html#NM-SETTING-INFINIBAND-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-INFINIBAND-MAC-ADDRESS:CAPS" href="libnm-util/NMSettingInfiniband.html#NM-SETTING-INFINIBAND-MAC-ADDRESS:CAPS">
 <ANCHOR id="NM-SETTING-INFINIBAND-MTU:CAPS" href="libnm-util/NMSettingInfiniband.html#NM-SETTING-INFINIBAND-MTU:CAPS">
@@ -762,6 +879,10 @@
 <ANCHOR id="NMSettingVlan.other_details" href="libnm-util/NMSettingVlan.html#NMSettingVlan.other_details">
 <ANCHOR id="NM-SETTING-VLAN-SETTING-NAME:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingVlanError" href="libnm-util/NMSettingVlan.html#NMSettingVlanError">
+<ANCHOR id="NM-SETTING-VLAN-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-VLAN-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-VLAN-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-VLAN-ERROR-INVALID-PARENT:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-ERROR-INVALID-PARENT:CAPS">
 <ANCHOR id="NM-SETTING-VLAN-ERROR:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-VLAN-INTERFACE-NAME:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-INTERFACE-NAME:CAPS">
 <ANCHOR id="NM-SETTING-VLAN-PARENT:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-PARENT:CAPS">
@@ -770,7 +891,12 @@
 <ANCHOR id="NM-SETTING-VLAN-INGRESS-PRIORITY-MAP:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-INGRESS-PRIORITY-MAP:CAPS">
 <ANCHOR id="NM-SETTING-VLAN-EGRESS-PRIORITY-MAP:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-EGRESS-PRIORITY-MAP:CAPS">
 <ANCHOR id="NMVlanPriorityMap" href="libnm-util/NMSettingVlan.html#NMVlanPriorityMap">
+<ANCHOR id="NM-VLAN-INGRESS-MAP:CAPS" href="libnm-util/NMSettingVlan.html#NM-VLAN-INGRESS-MAP:CAPS">
+<ANCHOR id="NM-VLAN-EGRESS-MAP:CAPS" href="libnm-util/NMSettingVlan.html#NM-VLAN-EGRESS-MAP:CAPS">
 <ANCHOR id="NMVlanFlags" href="libnm-util/NMSettingVlan.html#NMVlanFlags">
+<ANCHOR id="NM-VLAN-FLAG-REORDER-HEADERS:CAPS" href="libnm-util/NMSettingVlan.html#NM-VLAN-FLAG-REORDER-HEADERS:CAPS">
+<ANCHOR id="NM-VLAN-FLAG-GVRP:CAPS" href="libnm-util/NMSettingVlan.html#NM-VLAN-FLAG-GVRP:CAPS">
+<ANCHOR id="NM-VLAN-FLAG-LOOSE-BINDING:CAPS" href="libnm-util/NMSettingVlan.html#NM-VLAN-FLAG-LOOSE-BINDING:CAPS">
 <ANCHOR id="NMSettingVlan.property-details" href="libnm-util/NMSettingVlan.html#NMSettingVlan.property-details">
 <ANCHOR id="NMSettingVlan--egress-priority-map" href="libnm-util/NMSettingVlan.html#NMSettingVlan--egress-priority-map">
 <ANCHOR id="NMSettingVlan--flags" href="libnm-util/NMSettingVlan.html#NMSettingVlan--flags">
@@ -793,6 +919,9 @@
 <ANCHOR id="NMSettingOlpcMesh.other_details" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh.other_details">
 <ANCHOR id="NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS" href="libnm-util/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingOlpcMeshError" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMeshError">
+<ANCHOR id="NM-SETTING-OLPC-MESH-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-OLPC-MESH-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-OLPC-MESH-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR-MISSING-PROPERTY:CAPS">
 <ANCHOR id="NM-SETTING-OLPC-MESH-ERROR:CAPS" href="libnm-util/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-OLPC-MESH-SSID:CAPS" href="libnm-util/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-SSID:CAPS">
 <ANCHOR id="NM-SETTING-OLPC-MESH-CHANNEL:CAPS" href="libnm-util/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-CHANNEL:CAPS">
@@ -821,6 +950,9 @@
 <ANCHOR id="NMSettingAdsl.other_details" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl.other_details">
 <ANCHOR id="NM-SETTING-ADSL-SETTING-NAME:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingAdslError" href="libnm-util/NMSettingAdsl.html#NMSettingAdslError">
+<ANCHOR id="NM-SETTING-ADSL-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-ADSL-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-ADSL-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-ERROR-MISSING-PROPERTY:CAPS">
 <ANCHOR id="NM-SETTING-ADSL-ERROR:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-ADSL-USERNAME:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-USERNAME:CAPS">
 <ANCHOR id="NM-SETTING-ADSL-PASSWORD:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-PASSWORD:CAPS">
@@ -876,8 +1008,15 @@
 <ANCHOR id="NMSettingDcb.other_details" href="libnm-util/NMSettingDcb.html#NMSettingDcb.other_details">
 <ANCHOR id="NM-SETTING-DCB-SETTING-NAME:CAPS" href="libnm-util/NMSettingDcb.html#NM-SETTING-DCB-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingDcbError" href="libnm-util/NMSettingDcb.html#NMSettingDcbError">
+<ANCHOR id="NM-SETTING-DCB-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingDcb.html#NM-SETTING-DCB-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-DCB-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingDcb.html#NM-SETTING-DCB-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-DCB-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingDcb.html#NM-SETTING-DCB-ERROR-MISSING-PROPERTY:CAPS">
 <ANCHOR id="NM-SETTING-DCB-ERROR:CAPS" href="libnm-util/NMSettingDcb.html#NM-SETTING-DCB-ERROR:CAPS">
 <ANCHOR id="NMSettingDcbFlags" href="libnm-util/NMSettingDcb.html#NMSettingDcbFlags">
+<ANCHOR id="NM-SETTING-DCB-FLAG-NONE:CAPS" href="libnm-util/NMSettingDcb.html#NM-SETTING-DCB-FLAG-NONE:CAPS">
+<ANCHOR id="NM-SETTING-DCB-FLAG-ENABLE:CAPS" href="libnm-util/NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS">
+<ANCHOR id="NM-SETTING-DCB-FLAG-ADVERTISE:CAPS" href="libnm-util/NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS">
+<ANCHOR id="NM-SETTING-DCB-FLAG-WILLING:CAPS" href="libnm-util/NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS">
 <ANCHOR id="NM-SETTING-DCB-FCOE-MODE-FABRIC:CAPS" href="libnm-util/NMSettingDcb.html#NM-SETTING-DCB-FCOE-MODE-FABRIC:CAPS">
 <ANCHOR id="NM-SETTING-DCB-FCOE-MODE-VN2VN:CAPS" href="libnm-util/NMSettingDcb.html#NM-SETTING-DCB-FCOE-MODE-VN2VN:CAPS">
 <ANCHOR id="NM-SETTING-DCB-APP-FCOE-FLAGS:CAPS" href="libnm-util/NMSettingDcb.html#NM-SETTING-DCB-APP-FCOE-FLAGS:CAPS">
@@ -990,9 +1129,19 @@
 <ANCHOR id="nm-setting-802-1x-get-phase2-private-key-format" href="libnm-util/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format">
 <ANCHOR id="NMSetting8021x.other_details" href="libnm-util/NMSetting8021x.html#NMSetting8021x.other_details">
 <ANCHOR id="NMSetting8021xCKFormat" href="libnm-util/NMSetting8021x.html#NMSetting8021xCKFormat">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-X509:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-X509:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS">
 <ANCHOR id="NMSetting8021xCKScheme" href="libnm-util/NMSetting8021x.html#NMSetting8021xCKScheme">
+<ANCHOR id="NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-SETTING-NAME:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-SETTING-NAME:CAPS">
 <ANCHOR id="NMSetting8021xError" href="libnm-util/NMSetting8021x.html#NMSetting8021xError">
+<ANCHOR id="NM-SETTING-802-1X-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-ERROR-MISSING-PROPERTY:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-ERROR:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-EAP:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-EAP:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-IDENTITY:CAPS" href="libnm-util/NMSetting8021x.html#NM-SETTING-802-1X-IDENTITY:CAPS">
@@ -1131,6 +1280,10 @@
 <ANCHOR id="NMSettingIP4Config.other_details" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4Config.other_details">
 <ANCHOR id="NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS" href="libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingIP4ConfigError" href="libnm-util/NMSettingIP4Config.html#NMSettingIP4ConfigError">
+<ANCHOR id="NM-SETTING-IP4-CONFIG-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-IP4-CONFIG-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-IP4-CONFIG-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-IP4-CONFIG-ERROR-NOT-ALLOWED-FOR-METHOD:CAPS" href="libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-ERROR-NOT-ALLOWED-FOR-METHOD:CAPS">
 <ANCHOR id="NM-SETTING-IP4-CONFIG-ERROR:CAPS" href="libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-IP4-CONFIG-METHOD:CAPS" href="libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD:CAPS">
 <ANCHOR id="NM-SETTING-IP4-CONFIG-DNS:CAPS" href="libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-DNS:CAPS">
@@ -1235,6 +1388,10 @@
 <ANCHOR id="NMSettingIP6Config.other_details" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config.other_details">
 <ANCHOR id="NM-SETTING-IP6-CONFIG-SETTING-NAME:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingIP6ConfigError" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6ConfigError">
+<ANCHOR id="NM-SETTING-IP6-CONFIG-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-IP6-CONFIG-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-IP6-CONFIG-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-IP6-CONFIG-ERROR-NOT-ALLOWED-FOR-METHOD:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR-NOT-ALLOWED-FOR-METHOD:CAPS">
 <ANCHOR id="NM-SETTING-IP6-CONFIG-ERROR:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-IP6-CONFIG-METHOD:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD:CAPS">
 <ANCHOR id="NM-SETTING-IP6-CONFIG-DNS:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-DNS:CAPS">
@@ -1255,6 +1412,10 @@
 <ANCHOR id="NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS">
 <ANCHOR id="NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS">
 <ANCHOR id="NMSettingIP6ConfigPrivacy" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6ConfigPrivacy">
+<ANCHOR id="NM-SETTING-IP6-CONFIG-PRIVACY-UNKNOWN:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-IP6-CONFIG-PRIVACY-DISABLED:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-DISABLED:CAPS">
+<ANCHOR id="NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-PUBLIC-ADDR:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-PUBLIC-ADDR:CAPS">
+<ANCHOR id="NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-TEMP-ADDR:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-TEMP-ADDR:CAPS">
 <ANCHOR id="NMSettingIP6Config.property-details" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config.property-details">
 <ANCHOR id="NMSettingIP6Config--addresses" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config--addresses">
 <ANCHOR id="NMSettingIP6Config--dhcp-hostname" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config--dhcp-hostname">
@@ -1299,6 +1460,10 @@
 <ANCHOR id="NMSettingPPP.other_details" href="libnm-util/NMSettingPPP.html#NMSettingPPP.other_details">
 <ANCHOR id="NM-SETTING-PPP-SETTING-NAME:CAPS" href="libnm-util/NMSettingPPP.html#NM-SETTING-PPP-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingPPPError" href="libnm-util/NMSettingPPP.html#NMSettingPPPError">
+<ANCHOR id="NM-SETTING-PPP-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingPPP.html#NM-SETTING-PPP-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-PPP-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingPPP.html#NM-SETTING-PPP-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-PPP-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingPPP.html#NM-SETTING-PPP-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-PPP-ERROR-REQUIRE-MPPE-NOT-ALLOWED:CAPS" href="libnm-util/NMSettingPPP.html#NM-SETTING-PPP-ERROR-REQUIRE-MPPE-NOT-ALLOWED:CAPS">
 <ANCHOR id="NM-SETTING-PPP-ERROR:CAPS" href="libnm-util/NMSettingPPP.html#NM-SETTING-PPP-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-PPP-NOAUTH:CAPS" href="libnm-util/NMSettingPPP.html#NM-SETTING-PPP-NOAUTH:CAPS">
 <ANCHOR id="NM-SETTING-PPP-REFUSE-EAP:CAPS" href="libnm-util/NMSettingPPP.html#NM-SETTING-PPP-REFUSE-EAP:CAPS">
@@ -1354,6 +1519,10 @@
 <ANCHOR id="NMSettingPPPOE.other_details" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOE.other_details">
 <ANCHOR id="NM-SETTING-PPPOE-SETTING-NAME:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingPPPOEError" href="libnm-util/NMSettingPPPOE.html#NMSettingPPPOEError">
+<ANCHOR id="NM-SETTING-PPPOE-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-PPPOE-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-PPPOE-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-PPPOE-ERROR-MISSING-PPP-SETTING:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-ERROR-MISSING-PPP-SETTING:CAPS">
 <ANCHOR id="NM-SETTING-PPPOE-ERROR:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-PPPOE-SERVICE:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-SERVICE:CAPS">
 <ANCHOR id="NM-SETTING-PPPOE-USERNAME:CAPS" href="libnm-util/NMSettingPPPOE.html#NM-SETTING-PPPOE-USERNAME:CAPS">
@@ -1391,6 +1560,9 @@
 <ANCHOR id="NMSettingVPN.other_details" href="libnm-util/NMSettingVPN.html#NMSettingVPN.other_details">
 <ANCHOR id="NM-SETTING-VPN-SETTING-NAME:CAPS" href="libnm-util/NMSettingVPN.html#NM-SETTING-VPN-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingVpnError" href="libnm-util/NMSettingVPN.html#NMSettingVpnError">
+<ANCHOR id="NM-SETTING-VPN-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingVPN.html#NM-SETTING-VPN-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-VPN-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingVPN.html#NM-SETTING-VPN-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-VPN-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingVPN.html#NM-SETTING-VPN-ERROR-MISSING-PROPERTY:CAPS">
 <ANCHOR id="NM-SETTING-VPN-ERROR:CAPS" href="libnm-util/NMSettingVPN.html#NM-SETTING-VPN-ERROR:CAPS">
 <ANCHOR id="NM-SETTING-VPN-SERVICE-TYPE:CAPS" href="libnm-util/NMSettingVPN.html#NM-SETTING-VPN-SERVICE-TYPE:CAPS">
 <ANCHOR id="NM-SETTING-VPN-USER-NAME:CAPS" href="libnm-util/NMSettingVPN.html#NM-SETTING-VPN-USER-NAME:CAPS">
@@ -1464,6 +1636,15 @@
 <ANCHOR id="nm-utils-check-virtual-device-compatibility" href="libnm-util/libnm-util-nm-utils.html#nm-utils-check-virtual-device-compatibility">
 <ANCHOR id="libnm-util-nm-utils.other_details" href="libnm-util/libnm-util-nm-utils.html#libnm-util-nm-utils.other_details">
 <ANCHOR id="NMUtilsSecurityType" href="libnm-util/libnm-util-nm-utils.html#NMUtilsSecurityType">
+<ANCHOR id="NMU-SEC-INVALID:CAPS" href="libnm-util/libnm-util-nm-utils.html#NMU-SEC-INVALID:CAPS">
+<ANCHOR id="NMU-SEC-NONE:CAPS" href="libnm-util/libnm-util-nm-utils.html#NMU-SEC-NONE:CAPS">
+<ANCHOR id="NMU-SEC-STATIC-WEP:CAPS" href="libnm-util/libnm-util-nm-utils.html#NMU-SEC-STATIC-WEP:CAPS">
+<ANCHOR id="NMU-SEC-LEAP:CAPS" href="libnm-util/libnm-util-nm-utils.html#NMU-SEC-LEAP:CAPS">
+<ANCHOR id="NMU-SEC-DYNAMIC-WEP:CAPS" href="libnm-util/libnm-util-nm-utils.html#NMU-SEC-DYNAMIC-WEP:CAPS">
+<ANCHOR id="NMU-SEC-WPA-PSK:CAPS" href="libnm-util/libnm-util-nm-utils.html#NMU-SEC-WPA-PSK:CAPS">
+<ANCHOR id="NMU-SEC-WPA-ENTERPRISE:CAPS" href="libnm-util/libnm-util-nm-utils.html#NMU-SEC-WPA-ENTERPRISE:CAPS">
+<ANCHOR id="NMU-SEC-WPA2-PSK:CAPS" href="libnm-util/libnm-util-nm-utils.html#NMU-SEC-WPA2-PSK:CAPS">
+<ANCHOR id="NMU-SEC-WPA2-ENTERPRISE:CAPS" href="libnm-util/libnm-util-nm-utils.html#NMU-SEC-WPA2-ENTERPRISE:CAPS">
 <ANCHOR id="NM-UTILS-HWADDR-LEN-MAX:CAPS" href="libnm-util/libnm-util-nm-utils.html#NM-UTILS-HWADDR-LEN-MAX:CAPS">
 <ANCHOR id="NM-UTILS-INET-ADDRSTRLEN:CAPS" href="libnm-util/libnm-util-nm-utils.html#NM-UTILS-INET-ADDRSTRLEN:CAPS">
 <ANCHOR id="libnm-util-NetworkManager" href="libnm-util/libnm-util-NetworkManager.html">
@@ -1512,19 +1693,171 @@
 <ANCHOR id="NM-DBUS-INTERFACE-SECRET-AGENT:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DBUS-INTERFACE-SECRET-AGENT:CAPS">
 <ANCHOR id="NM-DBUS-PATH-SECRET-AGENT:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DBUS-PATH-SECRET-AGENT:CAPS">
 <ANCHOR id="NMState" href="libnm-util/libnm-util-NetworkManager.html#NMState">
+<ANCHOR id="NM-STATE-UNKNOWN:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-STATE-UNKNOWN:CAPS">
+<ANCHOR id="NM-STATE-ASLEEP:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-STATE-ASLEEP:CAPS">
+<ANCHOR id="NM-STATE-DISCONNECTED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-STATE-DISCONNECTED:CAPS">
+<ANCHOR id="NM-STATE-DISCONNECTING:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-STATE-DISCONNECTING:CAPS">
+<ANCHOR id="NM-STATE-CONNECTING:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-STATE-CONNECTING:CAPS">
+<ANCHOR id="NM-STATE-CONNECTED-LOCAL:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-STATE-CONNECTED-LOCAL:CAPS">
+<ANCHOR id="NM-STATE-CONNECTED-SITE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-STATE-CONNECTED-SITE:CAPS">
+<ANCHOR id="NM-STATE-CONNECTED-GLOBAL:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-STATE-CONNECTED-GLOBAL:CAPS">
 <ANCHOR id="NM-STATE-CONNECTED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-STATE-CONNECTED:CAPS">
 <ANCHOR id="NMConnectivityState" href="libnm-util/libnm-util-NetworkManager.html#NMConnectivityState">
+<ANCHOR id="NM-CONNECTIVITY-UNKNOWN:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-CONNECTIVITY-UNKNOWN:CAPS">
+<ANCHOR id="NM-CONNECTIVITY-NONE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-CONNECTIVITY-NONE:CAPS">
+<ANCHOR id="NM-CONNECTIVITY-PORTAL:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-CONNECTIVITY-PORTAL:CAPS">
+<ANCHOR id="NM-CONNECTIVITY-LIMITED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-CONNECTIVITY-LIMITED:CAPS">
+<ANCHOR id="NM-CONNECTIVITY-FULL:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-CONNECTIVITY-FULL:CAPS">
 <ANCHOR id="NMDeviceType" href="libnm-util/libnm-util-NetworkManager.html#NMDeviceType">
+<ANCHOR id="NM-DEVICE-TYPE-UNKNOWN:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-ETHERNET:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-ETHERNET:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-WIFI:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-WIFI:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-UNUSED1:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-UNUSED1:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-UNUSED2:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-UNUSED2:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-BT:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-BT:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-OLPC-MESH:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-OLPC-MESH:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-WIMAX:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-WIMAX:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-MODEM:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-MODEM:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-INFINIBAND:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-INFINIBAND:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-BOND:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-BOND:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-VLAN:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-VLAN:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-ADSL:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-ADSL:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-BRIDGE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-BRIDGE:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-GENERIC:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-GENERIC:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-TEAM:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-TYPE-TEAM:CAPS">
 <ANCHOR id="NMDeviceCapabilities" href="libnm-util/libnm-util-NetworkManager.html#NMDeviceCapabilities">
+<ANCHOR id="NM-DEVICE-CAP-NONE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-CAP-NONE:CAPS">
+<ANCHOR id="NM-DEVICE-CAP-NM-SUPPORTED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-CAP-NM-SUPPORTED:CAPS">
+<ANCHOR id="NM-DEVICE-CAP-CARRIER-DETECT:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-CAP-CARRIER-DETECT:CAPS">
+<ANCHOR id="NM-DEVICE-CAP-IS-SOFTWARE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-CAP-IS-SOFTWARE:CAPS">
 <ANCHOR id="NMDeviceWifiCapabilities" href="libnm-util/libnm-util-NetworkManager.html#NMDeviceWifiCapabilities">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-NONE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-NONE:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-CIPHER-WEP40:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-CIPHER-WEP40:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-CIPHER-WEP104:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-CIPHER-WEP104:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-CIPHER-TKIP:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-CIPHER-TKIP:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-CIPHER-CCMP:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-CIPHER-CCMP:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-WPA:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-WPA:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-RSN:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-RSN:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-AP:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-AP:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-ADHOC:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-ADHOC:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-FREQ-VALID:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-FREQ-VALID:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-FREQ-2GHZ:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-FREQ-2GHZ:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-FREQ-5GHZ:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-FREQ-5GHZ:CAPS">
 <ANCHOR id="NM80211ApFlags" href="libnm-util/libnm-util-NetworkManager.html#NM80211ApFlags">
+<ANCHOR id="NM-802-11-AP-FLAGS-NONE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-AP-FLAGS-NONE:CAPS">
+<ANCHOR id="NM-802-11-AP-FLAGS-PRIVACY:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-AP-FLAGS-PRIVACY:CAPS">
 <ANCHOR id="NM80211ApSecurityFlags" href="libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags">
+<ANCHOR id="NM-802-11-AP-SEC-NONE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-AP-SEC-NONE:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-PAIR-WEP40:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-AP-SEC-PAIR-WEP40:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-PAIR-WEP104:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-AP-SEC-PAIR-WEP104:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-PAIR-TKIP:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-AP-SEC-PAIR-TKIP:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-PAIR-CCMP:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-AP-SEC-PAIR-CCMP:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-GROUP-WEP40:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-AP-SEC-GROUP-WEP40:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-GROUP-WEP104:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-AP-SEC-GROUP-WEP104:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-GROUP-TKIP:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-AP-SEC-GROUP-TKIP:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-GROUP-CCMP:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-AP-SEC-GROUP-CCMP:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-KEY-MGMT-PSK:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-AP-SEC-KEY-MGMT-PSK:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-KEY-MGMT-802-1X:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-AP-SEC-KEY-MGMT-802-1X:CAPS">
 <ANCHOR id="NM80211Mode" href="libnm-util/libnm-util-NetworkManager.html#NM80211Mode">
+<ANCHOR id="NM-802-11-MODE-UNKNOWN:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-MODE-UNKNOWN:CAPS">
+<ANCHOR id="NM-802-11-MODE-ADHOC:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-MODE-ADHOC:CAPS">
+<ANCHOR id="NM-802-11-MODE-INFRA:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-MODE-INFRA:CAPS">
+<ANCHOR id="NM-802-11-MODE-AP:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-802-11-MODE-AP:CAPS">
 <ANCHOR id="NMBluetoothCapabilities" href="libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities">
+<ANCHOR id="NM-BT-CAPABILITY-NONE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-BT-CAPABILITY-NONE:CAPS">
+<ANCHOR id="NM-BT-CAPABILITY-DUN:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-BT-CAPABILITY-DUN:CAPS">
+<ANCHOR id="NM-BT-CAPABILITY-NAP:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-BT-CAPABILITY-NAP:CAPS">
 <ANCHOR id="NMDeviceModemCapabilities" href="libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities">
+<ANCHOR id="NM-DEVICE-MODEM-CAPABILITY-NONE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-MODEM-CAPABILITY-NONE:CAPS">
+<ANCHOR id="NM-DEVICE-MODEM-CAPABILITY-POTS:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-MODEM-CAPABILITY-POTS:CAPS">
+<ANCHOR id="NM-DEVICE-MODEM-CAPABILITY-CDMA-EVDO:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-MODEM-CAPABILITY-CDMA-EVDO:CAPS">
+<ANCHOR id="NM-DEVICE-MODEM-CAPABILITY-GSM-UMTS:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-MODEM-CAPABILITY-GSM-UMTS:CAPS">
+<ANCHOR id="NM-DEVICE-MODEM-CAPABILITY-LTE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-MODEM-CAPABILITY-LTE:CAPS">
 <ANCHOR id="NMDeviceState" href="libnm-util/libnm-util-NetworkManager.html#NMDeviceState">
+<ANCHOR id="NM-DEVICE-STATE-UNKNOWN:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-UNMANAGED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-UNMANAGED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-UNAVAILABLE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-UNAVAILABLE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-DISCONNECTED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-DISCONNECTED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-PREPARE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-PREPARE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-CONFIG:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-CONFIG:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-NEED-AUTH:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-NEED-AUTH:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-IP-CONFIG:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-IP-CONFIG:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-IP-CHECK:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-IP-CHECK:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-SECONDARIES:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-SECONDARIES:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-ACTIVATED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-ACTIVATED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-DEACTIVATING:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-DEACTIVATING:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-FAILED:CAPS">
 <ANCHOR id="NMDeviceStateReason" href="libnm-util/libnm-util-NetworkManager.html#NMDeviceStateReason">
+<ANCHOR id="NM-DEVICE-STATE-REASON-NONE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-NONE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-UNKNOWN:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-NOW-MANAGED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-NOW-MANAGED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-NOW-UNMANAGED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-NOW-UNMANAGED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-CONFIG-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-CONFIG-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-IP-CONFIG-UNAVAILABLE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-IP-CONFIG-UNAVAILABLE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-IP-CONFIG-EXPIRED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-IP-CONFIG-EXPIRED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-NO-SECRETS:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-NO-SECRETS:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SUPPLICANT-DISCONNECT:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SUPPLICANT-DISCONNECT:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SUPPLICANT-CONFIG-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SUPPLICANT-CONFIG-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SUPPLICANT-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SUPPLICANT-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SUPPLICANT-TIMEOUT:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SUPPLICANT-TIMEOUT:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-PPP-START-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-PPP-START-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-PPP-DISCONNECT:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-PPP-DISCONNECT:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-PPP-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-PPP-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-DHCP-START-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-DHCP-START-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-DHCP-ERROR:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-DHCP-ERROR:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-DHCP-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-DHCP-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SHARED-START-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SHARED-START-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SHARED-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SHARED-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-AUTOIP-START-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-AUTOIP-START-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-AUTOIP-ERROR:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-AUTOIP-ERROR:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-AUTOIP-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-AUTOIP-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-BUSY:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-BUSY:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-NO-DIAL-TONE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-NO-DIAL-TONE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-NO-CARRIER:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-NO-CARRIER:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-DIAL-TIMEOUT:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-DIAL-TIMEOUT:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-DIAL-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-DIAL-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-INIT-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-INIT-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-APN-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-APN-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-REGISTRATION-NOT-SEARCHING:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-NOT-SEARCHING:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-REGISTRATION-DENIED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-DENIED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-REGISTRATION-TIMEOUT:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-TIMEOUT:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-REGISTRATION-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-PIN-CHECK-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-PIN-CHECK-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-FIRMWARE-MISSING:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-FIRMWARE-MISSING:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-REMOVED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-REMOVED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SLEEPING:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SLEEPING:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-CONNECTION-REMOVED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-CONNECTION-REMOVED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-USER-REQUESTED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-USER-REQUESTED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-CARRIER:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-CARRIER:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-CONNECTION-ASSUMED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-CONNECTION-ASSUMED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SUPPLICANT-AVAILABLE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SUPPLICANT-AVAILABLE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-NOT-FOUND:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-NOT-FOUND:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-BT-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-BT-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-SIM-NOT-INSERTED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-SIM-NOT-INSERTED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-SIM-PIN-REQUIRED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-SIM-PIN-REQUIRED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-SIM-PUK-REQUIRED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-SIM-PUK-REQUIRED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-SIM-WRONG:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-SIM-WRONG:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-INFINIBAND-MODE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-INFINIBAND-MODE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-DEPENDENCY-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-DEPENDENCY-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-BR2684-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-BR2684-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-MANAGER-UNAVAILABLE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-MANAGER-UNAVAILABLE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SSID-NOT-FOUND:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SSID-NOT-FOUND:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SECONDARY-CONNECTION-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SECONDARY-CONNECTION-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-DCB-FCOE-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-DCB-FCOE-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-TEAMD-CONTROL-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-TEAMD-CONTROL-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-AVAILABLE:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-AVAILABLE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SIM-PIN-INCORRECT:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SIM-PIN-INCORRECT:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-NEW-ACTIVATION:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-NEW-ACTIVATION:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-PARENT-CHANGED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-PARENT-CHANGED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-PARENT-MANAGED-CHANGED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-PARENT-MANAGED-CHANGED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-LAST:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-LAST:CAPS">
 <ANCHOR id="NMActiveConnectionState" href="libnm-util/libnm-util-NetworkManager.html#NMActiveConnectionState">
+<ANCHOR id="NM-ACTIVE-CONNECTION-STATE-UNKNOWN:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-UNKNOWN:CAPS">
+<ANCHOR id="NM-ACTIVE-CONNECTION-STATE-ACTIVATING:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATING:CAPS">
+<ANCHOR id="NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS">
+<ANCHOR id="NM-ACTIVE-CONNECTION-STATE-DEACTIVATING:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-DEACTIVATING:CAPS">
+<ANCHOR id="NM-ACTIVE-CONNECTION-STATE-DEACTIVATED:CAPS" href="libnm-util/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-DEACTIVATED:CAPS">
 <ANCHOR id="libnm-util-NetworkManagerVPN" href="libnm-util/libnm-util-NetworkManagerVPN.html">
 <ANCHOR id="libnm-util-NetworkManagerVPN.other" href="libnm-util/libnm-util-NetworkManagerVPN.html#libnm-util-NetworkManagerVPN.other">
 <ANCHOR id="libnm-util-NetworkManagerVPN.description" href="libnm-util/libnm-util-NetworkManagerVPN.html#libnm-util-NetworkManagerVPN.description">
@@ -1556,9 +1889,39 @@
 <ANCHOR id="NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS">
 <ANCHOR id="NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS">
 <ANCHOR id="NMVPNServiceState" href="libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNServiceState">
+<ANCHOR id="NM-VPN-SERVICE-STATE-UNKNOWN:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-UNKNOWN:CAPS">
+<ANCHOR id="NM-VPN-SERVICE-STATE-INIT:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-INIT:CAPS">
+<ANCHOR id="NM-VPN-SERVICE-STATE-SHUTDOWN:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-SHUTDOWN:CAPS">
+<ANCHOR id="NM-VPN-SERVICE-STATE-STARTING:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-STARTING:CAPS">
+<ANCHOR id="NM-VPN-SERVICE-STATE-STARTED:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-STARTED:CAPS">
+<ANCHOR id="NM-VPN-SERVICE-STATE-STOPPING:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-STOPPING:CAPS">
+<ANCHOR id="NM-VPN-SERVICE-STATE-STOPPED:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-STOPPED:CAPS">
 <ANCHOR id="NMVPNConnectionState" href="libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNConnectionState">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-UNKNOWN:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-UNKNOWN:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-PREPARE:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-PREPARE:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-NEED-AUTH:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-NEED-AUTH:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-CONNECT:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-CONNECT:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-IP-CONFIG-GET:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-IP-CONFIG-GET:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-ACTIVATED:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-ACTIVATED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-FAILED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-DISCONNECTED:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-DISCONNECTED:CAPS">
 <ANCHOR id="NMVPNConnectionStateReason" href="libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNConnectionStateReason">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-UNKNOWN:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-UNKNOWN:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-NONE:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-NONE:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-USER-DISCONNECTED:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-USER-DISCONNECTED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-DEVICE-DISCONNECTED:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-DEVICE-DISCONNECTED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-SERVICE-STOPPED:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-STOPPED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-IP-CONFIG-INVALID:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-IP-CONFIG-INVALID:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-CONNECT-TIMEOUT:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-CONNECT-TIMEOUT:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-TIMEOUT:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-TIMEOUT:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-FAILED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-NO-SECRETS:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-NO-SECRETS:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-LOGIN-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-LOGIN-FAILED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-CONNECTION-REMOVED:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-CONNECTION-REMOVED:CAPS">
 <ANCHOR id="NMVPNPluginFailure" href="libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNPluginFailure">
+<ANCHOR id="NM-VPN-PLUGIN-FAILURE-LOGIN-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-FAILURE-LOGIN-FAILED:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-FAILURE-CONNECT-FAILED:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-FAILURE-CONNECT-FAILED:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-FAILURE-BAD-IP-CONFIG:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-FAILURE-BAD-IP-CONFIG:CAPS">
 <ANCHOR id="NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS">
 <ANCHOR id="NM-VPN-PLUGIN-CONFIG-BANNER:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-BANNER:CAPS">
 <ANCHOR id="NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS" href="libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS">
@@ -1599,6 +1962,7 @@
 <ANCHOR id="annotation-glossterm-inout" href="libnm-util/annotation-glossary.html#annotation-glossterm-inout">
 <ANCHOR id="annotation-glossterm-out" href="libnm-util/annotation-glossary.html#annotation-glossterm-out">
 <ANCHOR id="annotation-glossterm-scope call" href="libnm-util/annotation-glossary.html#annotation-glossterm-scope call">
+<ANCHOR id="annotation-glossterm-skip" href="libnm-util/annotation-glossary.html#annotation-glossterm-skip">
 <ANCHOR id="annotation-glossterm-transfer container" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer container">
 <ANCHOR id="annotation-glossterm-transfer full" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer full">
 <ANCHOR id="annotation-glossterm-transfer none" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer none">
diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html
index bbad114b..1154416a 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManager.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManager.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NetworkManager</title>
+<title>NetworkManager: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="libnm-util-nm-utils.html" title="nm-utils">
 <link rel="next" href="libnm-util-NetworkManagerVPN.html" title="NetworkManagerVPN">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -260,11 +260,10 @@
 </div>
 <div class="refsect1">
 <a name="libnm-util-NetworkManager.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="libnm-util-NetworkManager.functions_details"></a><h2>Functions</h2>
+<p></p>
 </div>
 <div class="refsect1">
 <a name="libnm-util-NetworkManager.other_details"></a><h2>Types and Values</h2>
@@ -272,320 +271,240 @@
 <a name="NM-DBUS-SERVICE:CAPS"></a><h3>NM_DBUS_SERVICE</h3>
 <pre class="programlisting">#define NM_DBUS_SERVICE                     "org.freedesktop.NetworkManager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH:CAPS"></a><h3>NM_DBUS_PATH</h3>
 <pre class="programlisting">#define NM_DBUS_PATH                        "/org/freedesktop/NetworkManager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE:CAPS"></a><h3>NM_DBUS_INTERFACE</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE                   "org.freedesktop.NetworkManager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE            NM_DBUS_INTERFACE ".Device"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-WIRED:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_WIRED</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_WIRED      NM_DBUS_INTERFACE_DEVICE ".Wired"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-ADSL:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_ADSL</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_ADSL       NM_DBUS_INTERFACE_DEVICE ".Adsl"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-WIRELESS:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_WIRELESS</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_WIRELESS   NM_DBUS_INTERFACE_DEVICE ".Wireless"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-BLUETOOTH:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_BLUETOOTH</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_BLUETOOTH  NM_DBUS_INTERFACE_DEVICE ".Bluetooth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-OLPC-MESH:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_OLPC_MESH</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_OLPC_MESH  NM_DBUS_INTERFACE_DEVICE ".OlpcMesh"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-ACCESS-POINT:CAPS"></a><h3>NM_DBUS_PATH_ACCESS_POINT</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_ACCESS_POINT           NM_DBUS_PATH "/AccessPoint"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-ACCESS-POINT:CAPS"></a><h3>NM_DBUS_INTERFACE_ACCESS_POINT</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_ACCESS_POINT      NM_DBUS_INTERFACE ".AccessPoint"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-MODEM:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_MODEM</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_MODEM      NM_DBUS_INTERFACE_DEVICE ".Modem"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-WIMAX:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_WIMAX</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_WIMAX      NM_DBUS_INTERFACE_DEVICE ".WiMax"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-WIMAX-NSP:CAPS"></a><h3>NM_DBUS_INTERFACE_WIMAX_NSP</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_WIMAX_NSP         NM_DBUS_INTERFACE ".WiMax.Nsp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-WIMAX-NSP:CAPS"></a><h3>NM_DBUS_PATH_WIMAX_NSP</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_WIMAX_NSP              NM_DBUS_PATH "/Nsp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-ACTIVE-CONNECTION:CAPS"></a><h3>NM_DBUS_INTERFACE_ACTIVE_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_ACTIVE_CONNECTION NM_DBUS_INTERFACE ".Connection.Active"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-IP4-CONFIG:CAPS"></a><h3>NM_DBUS_INTERFACE_IP4_CONFIG</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_IP4_CONFIG        NM_DBUS_INTERFACE ".IP4Config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DHCP4-CONFIG:CAPS"></a><h3>NM_DBUS_INTERFACE_DHCP4_CONFIG</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DHCP4_CONFIG      NM_DBUS_INTERFACE ".DHCP4Config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-IP6-CONFIG:CAPS"></a><h3>NM_DBUS_INTERFACE_IP6_CONFIG</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_IP6_CONFIG        NM_DBUS_INTERFACE ".IP6Config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DHCP6-CONFIG:CAPS"></a><h3>NM_DBUS_INTERFACE_DHCP6_CONFIG</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DHCP6_CONFIG      NM_DBUS_INTERFACE ".DHCP6Config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-INFINIBAND:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_INFINIBAND</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_INFINIBAND NM_DBUS_INTERFACE_DEVICE ".Infiniband"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-BOND:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_BOND</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_BOND       NM_DBUS_INTERFACE_DEVICE ".Bond"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-TEAM:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_TEAM</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_TEAM       NM_DBUS_INTERFACE_DEVICE ".Team"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-VLAN:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_VLAN</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_VLAN       NM_DBUS_INTERFACE_DEVICE ".Vlan"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-BRIDGE:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_BRIDGE</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_BRIDGE     NM_DBUS_INTERFACE_DEVICE ".Bridge"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-GENERIC:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_GENERIC</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_GENERIC    NM_DBUS_INTERFACE_DEVICE ".Generic"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-VETH:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_VETH</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_VETH       NM_DBUS_INTERFACE_DEVICE ".Veth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-TUN:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_TUN</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_TUN        NM_DBUS_INTERFACE_DEVICE ".Tun"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-MACVLAN:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_MACVLAN</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_MACVLAN    NM_DBUS_INTERFACE_DEVICE ".Macvlan"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-VXLAN:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_VXLAN</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_VXLAN      NM_DBUS_INTERFACE_DEVICE ".Vxlan"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-GRE:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_GRE</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_GRE        NM_DBUS_INTERFACE_DEVICE ".Gre"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-IFACE-SETTINGS:CAPS"></a><h3>NM_DBUS_IFACE_SETTINGS</h3>
 <pre class="programlisting">#define NM_DBUS_IFACE_SETTINGS            "org.freedesktop.NetworkManager.Settings"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-SETTINGS:CAPS"></a><h3>NM_DBUS_PATH_SETTINGS</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_SETTINGS             "/org/freedesktop/NetworkManager/Settings"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-IFACE-SETTINGS-CONNECTION:CAPS"></a><h3>NM_DBUS_IFACE_SETTINGS_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_IFACE_SETTINGS_CONNECTION "org.freedesktop.NetworkManager.Settings.Connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-SETTINGS-CONNECTION:CAPS"></a><h3>NM_DBUS_PATH_SETTINGS_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_SETTINGS_CONNECTION  "/org/freedesktop/NetworkManager/Settings/Connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-IFACE-SETTINGS-CONNECTION-SECRETS:CAPS"></a><h3>NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS</h3>
 <pre class="programlisting">#define NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS "org.freedesktop.NetworkManager.Settings.Connection.Secrets"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-AGENT-MANAGER:CAPS"></a><h3>NM_DBUS_INTERFACE_AGENT_MANAGER</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_AGENT_MANAGER   NM_DBUS_INTERFACE ".AgentManager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-AGENT-MANAGER:CAPS"></a><h3>NM_DBUS_PATH_AGENT_MANAGER</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_AGENT_MANAGER        "/org/freedesktop/NetworkManager/AgentManager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-SECRET-AGENT:CAPS"></a><h3>NM_DBUS_INTERFACE_SECRET_AGENT</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_SECRET_AGENT    NM_DBUS_INTERFACE ".SecretAgent"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-SECRET-AGENT:CAPS"></a><h3>NM_DBUS_PATH_SECRET_AGENT</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_SECRET_AGENT         "/org/freedesktop/NetworkManager/SecretAgent"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -666,8 +585,6 @@
 <a name="NM-STATE-CONNECTED:CAPS"></a><h3>NM_STATE_CONNECTED</h3>
 <pre class="programlisting">#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -723,7 +640,7 @@
 </tbody>
 </table></div>
 </div>
-<p class="since">Since 0.9.8.6</p>
+<p class="since">Since: 0.9.8.6</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1865,10 +1782,24 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 <td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td class="enum_member_name"><p><a name="NM-DEVICE-STATE-REASON-LAST:CAPS"></a>NM_DEVICE_STATE_REASON_LAST</p></td>
-<td class="enum_member_description"> </td>
+<td class="enum_member_name"><p><a name="NM-DEVICE-STATE-REASON-PARENT-CHANGED:CAPS"></a>NM_DEVICE_STATE_REASON_PARENT_CHANGED</p></td>
+<td class="enum_member_description">
+<p>the device's parent changed</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-DEVICE-STATE-REASON-PARENT-MANAGED-CHANGED:CAPS"></a>NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED</p></td>
+<td class="enum_member_description">
+<p>the device parent's management changed</p>
+</td>
 <td class="enum_member_annotations"> </td>
 </tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-DEVICE-STATE-REASON-LAST:CAPS"></a>NM_DEVICE_STATE_REASON_LAST</p></td>
+<td> </td>
+<td> </td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -1933,7 +1864,6 @@ network.</p>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html b/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html
index 3d488c04..cee007fc 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: NetworkManagerVPN</title>
+<title>NetworkManagerVPN: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="libnm-util-NetworkManager.html" title="NetworkManager">
 <link rel="next" href="object-tree.html" title="Object Hierarchy">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -292,11 +292,10 @@
 </div>
 <div class="refsect1">
 <a name="libnm-util-NetworkManagerVPN.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="libnm-util-NetworkManagerVPN.functions_details"></a><h2>Functions</h2>
+<p></p>
 </div>
 <div class="refsect1">
 <a name="libnm-util-NetworkManagerVPN.other_details"></a><h2>Types and Values</h2>
@@ -304,200 +303,150 @@
 <a name="NM-DBUS-PATH-VPN:CAPS"></a><h3>NM_DBUS_PATH_VPN</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_VPN                  "/org/freedesktop/NetworkManager/VPN/Manager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-VPN:CAPS"></a><h3>NM_DBUS_INTERFACE_VPN</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_VPN             "org.freedesktop.NetworkManager.VPN.Manager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-VPN-CONNECTION:CAPS"></a><h3>NM_DBUS_PATH_VPN_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_VPN_CONNECTION       "/org/freedesktop/NetworkManager/VPN/Connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-VPN-CONNECTION:CAPS"></a><h3>NM_DBUS_INTERFACE_VPN_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_VPN_CONNECTION  "org.freedesktop.NetworkManager.VPN.Connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-DBUS-PLUGIN-PATH:CAPS"></a><h3>NM_VPN_DBUS_PLUGIN_PATH</h3>
 <pre class="programlisting">#define NM_VPN_DBUS_PLUGIN_PATH           "/org/freedesktop/NetworkManager/VPN/Plugin"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-DBUS-PLUGIN-INTERFACE:CAPS"></a><h3>NM_VPN_DBUS_PLUGIN_INTERFACE</h3>
 <pre class="programlisting">#define NM_VPN_DBUS_PLUGIN_INTERFACE      "org.freedesktop.NetworkManager.VPN.Plugin"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-NO-ACTIVE-VPN-CONNECTION:CAPS"></a><h3>NM_DBUS_NO_ACTIVE_VPN_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_NO_ACTIVE_VPN_CONNECTION "org.freedesktop.NetworkManager.VPNConnections.NoActiveVPNConnection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-NO-VPN-CONNECTIONS:CAPS"></a><h3>NM_DBUS_NO_VPN_CONNECTIONS</h3>
 <pre class="programlisting">#define NM_DBUS_NO_VPN_CONNECTIONS       "org.freedesktop.NetworkManager.VPNConnections.NoVPNConnections"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INVALID-VPN-CONNECTION:CAPS"></a><h3>NM_DBUS_INVALID_VPN_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_INVALID_VPN_CONNECTION   "org.freedesktop.NetworkManager.VPNConnections.InvalidVPNConnection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-ERROR-PREFIX:CAPS"></a><h3>NM_DBUS_VPN_ERROR_PREFIX</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_ERROR_PREFIX              "org.freedesktop.NetworkManager.VPN.Error"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-STARTING-IN-PROGRESS:CAPS"></a><h3>NM_DBUS_VPN_STARTING_IN_PROGRESS</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_STARTING_IN_PROGRESS      "StartingInProgress"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-ALREADY-STARTED:CAPS"></a><h3>NM_DBUS_VPN_ALREADY_STARTED</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_ALREADY_STARTED           "AlreadyStarted"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-STOPPING-IN-PROGRESS:CAPS"></a><h3>NM_DBUS_VPN_STOPPING_IN_PROGRESS</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_STOPPING_IN_PROGRESS      "StoppingInProgress"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-ALREADY-STOPPED:CAPS"></a><h3>NM_DBUS_VPN_ALREADY_STOPPED</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_ALREADY_STOPPED           "AlreadyStopped"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-WRONG-STATE:CAPS"></a><h3>NM_DBUS_VPN_WRONG_STATE</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_WRONG_STATE               "WrongState"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-BAD-ARGUMENTS:CAPS"></a><h3>NM_DBUS_VPN_BAD_ARGUMENTS</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_BAD_ARGUMENTS             "BadArguments"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-INTERACTIVE-NOT-SUPPORTED:CAPS"></a><h3>NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED "InteractiveNotSupported"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-LOGIN-BANNER:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_LOGIN_BANNER</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_LOGIN_BANNER   "LoginBanner"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-LOGIN-FAILED:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_LOGIN_FAILED</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_LOGIN_FAILED   "LoginFailed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-LAUNCH-FAILED:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED  "LaunchFailed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-CONNECT-FAILED:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_CONNECT_FAILED</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_CONNECT_FAILED "ConnectFailed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-VPN-CONFIG-BAD:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD "VPNConfigBad"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-IP-CONFIG-BAD:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD  "IPConfigBad"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_STATE_CHANGE</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE   "StateChange"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_IP4_CONFIG</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_IP4_CONFIG     "IP4Config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -803,269 +752,202 @@
 <a name="NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_TUNDEV</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_TUNDEV      "tundev"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-CONFIG-BANNER:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_BANNER</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_BANNER      "banner"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY "gateway"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-CONFIG-MTU:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_MTU</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_MTU         "mtu"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-CONFIG-HAS-IP4:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_HAS_IP4</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_HAS_IP4     "has-ip4"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-CONFIG-HAS-IP6:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_HAS_IP6</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_HAS_IP6     "has-ip6"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-CAN-PERSIST:CAPS"></a><h3>NM_VPN_PLUGIN_CAN_PERSIST</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CAN_PERSIST        "can-persist"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-INT-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY "internal-gateway"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-ADDRESS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS     "address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-PTP:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_PTP</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_PTP         "ptp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-PREFIX:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_PREFIX</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_PREFIX      "prefix"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-DNS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_DNS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_DNS         "dns"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-NBNS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_NBNS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_NBNS        "nbns"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-MSS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_MSS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_MSS         "mss"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-DOMAIN:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN      "domain"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-DOMAINS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS     "domains"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-ROUTES:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_ROUTES      "routes"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT "never-default"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY   NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-BANNER:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_BANNER</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_BANNER      NM_VPN_PLUGIN_CONFIG_BANNER
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-EXT-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-MTU:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_MTU</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_MTU         NM_VPN_PLUGIN_CONFIG_MTU
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-TUNDEV:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV      NM_VPN_PLUGIN_CONFIG_TUNDEV
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-INT-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY "internal-gateway"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-ADDRESS:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS     "address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-PTP:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_PTP</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_PTP         "ptp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-PREFIX:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_PREFIX</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_PREFIX      "prefix"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-DNS:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_DNS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_DNS         "dns"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-MSS:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_MSS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_MSS         "mss"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-DOMAIN:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN      "domain"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-DOMAINS:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS     "domains"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-ROUTES:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_ROUTES      "routes"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT "never-default"
 </pre>
-<p>
-</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index bdd5ddbd..9507d0ab 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: nm-utils</title>
+<title>nm-utils: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingVPN.html" title="NMSettingVPN">
 <link rel="next" href="libnm-util-NetworkManager.html" title="NetworkManager">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -520,7 +520,6 @@ uses libnm-util.  This function can be called more than once.</p>
 <div class="refsect3">
 <a name="id-1.2.30.8.2.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the initialization was successful, <code class="literal">FALSE</code> on failure.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -566,7 +565,6 @@ number of known SSID-cloaking methods.</p>
 <div class="refsect3">
 <a name="id-1.2.30.8.4.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the SSID is "empty", <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -606,7 +604,6 @@ be used for display of SSIDs.</p>
 <a name="id-1.2.30.8.5.6"></a><h4>Returns</h4>
 <p> pointer to the escaped SSID, which uses an internal static buffer
 and will be overwritten by subsequent calls to this function</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -652,7 +649,6 @@ NULLs, even though that is functionally pointless.</p>
 <div class="refsect3">
 <a name="id-1.2.30.8.6.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the SSIDs are the same, <code class="literal">FALSE</code> if they are not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -741,8 +737,9 @@ nm_utils_slist_free (<em class="parameter"><code><span class="type">GSList</span
 <p>use <code class="function">g_slist_free_full()</code>.</p>
 </div>
 <p>Utility function to free a <span class="type">GSList</span>.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.2.30.8.9.6"></a><h4>Parameters</h4>
+<a name="id-1.2.30.8.9.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -840,7 +837,6 @@ e.g. (<a class="link" href="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-PAIR
 <p> <code class="literal">TRUE</code> if the device capabilities and AP capabilties intersect and are
 compatible with the desired <em class="parameter"><code>type</code></em>
 , <code class="literal">FALSE</code> if they are not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -881,9 +877,8 @@ e.g. <a class="link" href="libnm-util-nm-utils.html#NMU-SEC-STATIC-WEP:CAPS"><sp
 <p> <code class="literal">TRUE</code> if the device capabilities are compatible with the desired
 <em class="parameter"><code>type</code></em>
 , <code class="literal">FALSE</code> if they are not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -919,9 +914,8 @@ nm_utils_wep_key_valid (<em class="parameter"><code>const <span class="type">cha
 <a name="id-1.2.30.8.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>key</code></em>
 is a WEP key, <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -949,9 +943,8 @@ nm_utils_wpa_psk_valid (<em class="parameter"><code>const <span class="type">cha
 <a name="id-1.2.30.8.13.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>psk</code></em>
 is a WPA PSK, <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1110,7 +1103,6 @@ nm_utils_ip4_netmask_to_prefix (<em class="parameter"><code><span class="type">g
 <div class="refsect3">
 <a name="id-1.2.30.8.18.5"></a><h4>Returns</h4>
 <p> the CIDR prefix represented by the netmask</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1136,7 +1128,6 @@ nm_utils_ip4_prefix_to_netmask (<em class="parameter"><code><span class="type">g
 <div class="refsect3">
 <a name="id-1.2.30.8.19.5"></a><h4>Returns</h4>
 <p> the netmask represented by the prefix, in network byte order</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1166,7 +1157,6 @@ falls in the predefined classes.</p>
 <div class="refsect3">
 <a name="id-1.2.30.8.20.6"></a><h4>Returns</h4>
 <p> the default class prefix for the given IP</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1311,8 +1301,9 @@ which should be unset by the caller (when no longer needed) with
 nm_utils_ip6_dns_from_gvalue (<em class="parameter"><code>const <span class="type">GValue</span> *value</code></em>);</pre>
 <p>Converts a <span class="type">GValue</span> containing a <span class="type">GPtrArray</span> of IP6 DNS, represented as
 <span class="type">GByteArrays</span> into a <span class="type">GSList</span> of <code class="literal"><span class="type">struct in6_addr</span></code>s.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.2.30.8.25.5"></a><h4>Parameters</h4>
+<a name="id-1.2.30.8.25.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1327,9 +1318,8 @@ nm_utils_ip6_dns_from_gvalue (<em class="parameter"><code>const <span class="typ
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.30.8.25.6"></a><h4>Returns</h4>
+<a name="id-1.2.30.8.25.7"></a><h4>Returns</h4>
 <p> a <span class="type">GSList</span> of IP6 addresses.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1343,8 +1333,9 @@ in6_addr</span></code> structs into a <span class="type">GPtrArray</span> of <sp
 representing each server's IPv6 addresses in network byte order.
 The specific format of this serialization is not guaranteed to be
 stable and may be extended in the future.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.2.30.8.26.5"></a><h4>Parameters</h4>
+<a name="id-1.2.30.8.26.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1377,7 +1368,6 @@ nm_utils_uuid_generate (<em class="parameter"><code><span class="type">void</spa
 <a name="id-1.2.30.8.27.4"></a><h4>Returns</h4>
 <p> a newly allocated UUID suitable for use as the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
 object's <a class="link" href="NMSettingConnection.html#NMSettingConnection--id" title="The “id” property"><span class="type">“id”</span></a>: property.  Should be freed with <code class="function">g_free()</code></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1406,7 +1396,6 @@ nm_utils_uuid_generate_from_string (<em class="parameter"><code>const <span clas
 <a name="id-1.2.30.8.28.6"></a><h4>Returns</h4>
 <p> a newly allocated UUID suitable for use as the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
 object's <a class="link" href="NMSettingConnection.html#NMSettingConnection--id" title="The “id” property"><span class="type">“id”</span></a>: property</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1538,7 +1527,6 @@ nm_utils_file_is_pkcs12 (<em class="parameter"><code>const <span class="type">ch
 <div class="refsect3">
 <a name="id-1.2.30.8.31.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the file is PKCS#12, <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1547,12 +1535,6 @@ nm_utils_file_is_pkcs12 (<em class="parameter"><code>const <span class="type">ch
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 <span class="c_punctuation">(</span>*NMUtilsFileSearchInPathsPredicate<span class="c_punctuation">)</span> (<em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
                                       <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.2.30.8.32.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -1659,7 +1641,6 @@ nm_utils_wifi_freq_to_channel (<em class="parameter"><code><span class="type">gu
 <div class="refsect3">
 <a name="id-1.2.30.8.34.6"></a><h4>Returns</h4>
 <p> the channel represented by the frequency or 0</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1696,7 +1677,6 @@ nm_utils_wifi_channel_to_freq (<em class="parameter"><code><span class="type">gu
 <p> the frequency represented by the channel of the band,
 or -1 when the freq is invalid, or 0 when the band
 is invalid</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1737,7 +1717,6 @@ nm_utils_wifi_find_next_channel (<em class="parameter"><code><span class="type">
 <div class="refsect3">
 <a name="id-1.2.30.8.36.6"></a><h4>Returns</h4>
 <p> the next channel in the specified direction or 0</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1772,7 +1751,6 @@ nm_utils_wifi_is_channel_valid (<em class="parameter"><code><span class="type">g
 <div class="refsect3">
 <a name="id-1.2.30.8.37.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> or <code class="literal">FALSE</code></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1801,7 +1779,6 @@ nm_utils_hwaddr_len (<em class="parameter"><code><span class="type">int</span> t
 <div class="refsect3">
 <a name="id-1.2.30.8.38.6"></a><h4>Returns</h4>
 <p> the positive length, or -1 if the type is unknown/unsupported.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1840,7 +1817,6 @@ a length; but you can just use <a class="link" href="libnm-util-nm-utils.html#nm
 <p> the type, either <code class="literal">ARPHRD_ETHER</code> or
 <code class="literal">ARPHRD_INFINIBAND</code>.  If the length is unexpected, return -1
 (unsupported type/length).</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1970,7 +1946,6 @@ instead of a type.</p>
 <p> <em class="parameter"><code>buffer</code></em>
 , or <code class="literal">NULL</code> if <em class="parameter"><code>asc</code></em>
 couldn't be parsed</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2010,7 +1985,7 @@ nm_utils_hwaddr_ntoa_len (<em class="parameter"><code><span class="type">gconstp
 . </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2059,9 +2034,8 @@ the size of the buffer in bytes.</p></td>
 couldn't be parsed
 or would be shorter or longer than <em class="parameter"><code>length</code></em>
 .</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2090,9 +2064,8 @@ nm_utils_hwaddr_valid (<em class="parameter"><code>const <span class="type">char
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>asc</code></em>
 appears to be a valid hardware address
 of some type, <code class="literal">FALSE</code> if not.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2140,7 +2113,7 @@ array</p></td>
 . </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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2167,9 +2140,8 @@ nm_utils_hex2byte (<em class="parameter"><code>const <span class="type">char</sp
 <a name="id-1.2.30.8.47.6"></a><h4>Returns</h4>
 <p> a byte, or -1 if <em class="parameter"><code>hex</code></em>
 doesn't represent a hex byte</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2209,7 +2181,7 @@ string (it has to be even)</p></td>
 <p> a array of bytes, or <code class="literal">NULL</code> 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 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2236,9 +2208,8 @@ function in net/core/dev.c.</p>
 <div class="refsect3">
 <a name="id-1.2.30.8.49.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if interface name is valid, otherwise <code class="literal">FALSE</code> is returned.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2266,9 +2237,8 @@ nm_utils_is_uuid (<em class="parameter"><code>const <span class="type">char</spa
 <a name="id-1.2.30.8.50.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>str</code></em>
 is a UUID, <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.8</p>
+<p class="since">Since: 0.9.8</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2277,8 +2247,9 @@ is a UUID, <code class="literal">FALSE</code> if not</p>
 nm_utils_inet4_ntop (<em class="parameter"><code><span class="type">in_addr_t</span> inaddr</code></em>,
                      <em class="parameter"><code><span class="type">char</span> *dst</code></em>);</pre>
 <p>Wrapper for inet_ntop.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.2.30.8.51.5"></a><h4>Parameters</h4>
+<a name="id-1.2.30.8.51.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2309,13 +2280,12 @@ buffer to avoid these issues.</p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.30.8.51.6"></a><h4>Returns</h4>
+<a name="id-1.2.30.8.51.7"></a><h4>Returns</h4>
 <p> the input buffer <em class="parameter"><code>dst</code></em>
 , or a pointer to an
 internal, static buffer. This function cannot fail.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2324,8 +2294,9 @@ internal, static buffer. This function cannot fail.</p>
 nm_utils_inet6_ntop (<em class="parameter"><code>const <span class="type">struct in6_addr</span> *in6addr</code></em>,
                      <em class="parameter"><code><span class="type">char</span> *dst</code></em>);</pre>
 <p>Wrapper for inet_ntop.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.2.30.8.52.5"></a><h4>Parameters</h4>
+<a name="id-1.2.30.8.52.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2356,15 +2327,14 @@ buffer to avoid these issues.</p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.30.8.52.6"></a><h4>Returns</h4>
+<a name="id-1.2.30.8.52.7"></a><h4>Returns</h4>
 <p> the input buffer <em class="parameter"><code>dst</code></em>
 , or a pointer to an
 internal, static buffer. <code class="literal">NULL</code> is not allowed as <em class="parameter"><code>in6addr</code></em>
 ,
 otherwise, this function cannot fail.</p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2419,9 +2389,8 @@ underlying device driver.</p>
 <div class="refsect3">
 <a name="id-1.2.30.8.53.9"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> or <code class="literal">FALSE</code></p>
-<p></p>
 </div>
-<p class="since">Since 0.9.10</p>
+<p class="since">Since: 0.9.10</p>
 </div>
 </div>
 <div class="refsect1">
@@ -2529,7 +2498,6 @@ for both <a class="link" href="libnm-util-nm-utils.html#nm-utils-inet4-ntop" tit
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 144f60eb..2530e827 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
 <book xmlns="http://www.devhelp.net/book" title="libnm-util Reference Manual" link="index.html" author="" name="libnm-util" version="2" language="c">
   <chapters>
     <sub name="libnm-util API Reference" link="ch01.html">
@@ -1332,5 +1331,368 @@
     <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS" link="libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAINS:CAPS"/>
     <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_ROUTES" link="libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-ROUTES:CAPS"/>
     <keyword type="macro" name="NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT" link="libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-NEVER-DEFAULT:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_ERROR_UNKNOWN" link="NMConnection.html#NM-CONNECTION-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND" link="NMConnection.html#NM-CONNECTION-ERROR-CONNECTION-SETTING-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID" link="NMConnection.html#NM-CONNECTION-ERROR-CONNECTION-TYPE-INVALID:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_ERROR_SETTING_NOT_FOUND" link="NMConnection.html#NM-CONNECTION-ERROR-SETTING-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_ERROR_INVALID_SETTING" link="NMConnection.html#NM-CONNECTION-ERROR-INVALID-SETTING:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_ERROR_UNKNOWN" link="NMSetting.html#NM-SETTING-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_ERROR_PROPERTY_NOT_FOUND" link="NMSetting.html#NM-SETTING-ERROR-PROPERTY-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_ERROR_PROPERTY_NOT_SECRET" link="NMSetting.html#NM-SETTING-ERROR-PROPERTY-NOT-SECRET:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH" link="NMSetting.html#NM-SETTING-ERROR-PROPERTY-TYPE-MISMATCH:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NONE" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_AGENT_OWNED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NOT_SAVED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NOT_REQUIRED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_EXACT" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-EXACT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_FUZZY" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-FUZZY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_IGNORE_ID" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-ID:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-AGENT-OWNED-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-NOT-SAVED-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-DIFF-RESULT-WITH-DEFAULT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-DIFF-RESULT-NO-DEFAULT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_HASH_FLAG_ALL" link="NMSetting.html#NM-SETTING-HASH-FLAG-ALL:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_HASH_FLAG_NO_SECRETS" link="NMSetting.html#NM-SETTING-HASH-FLAG-NO-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_HASH_FLAG_ONLY_SECRETS" link="NMSetting.html#NM-SETTING-HASH-FLAG-ONLY-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DIFF_RESULT_UNKNOWN" link="NMSetting.html#NM-SETTING-DIFF-RESULT-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DIFF_RESULT_IN_A" link="NMSetting.html#NM-SETTING-DIFF-RESULT-IN-A:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DIFF_RESULT_IN_B" link="NMSetting.html#NM-SETTING-DIFF-RESULT-IN-B:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DIFF_RESULT_IN_A_DEFAULT" link="NMSetting.html#NM-SETTING-DIFF-RESULT-IN-A-DEFAULT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DIFF_RESULT_IN_B_DEFAULT" link="NMSetting.html#NM-SETTING-DIFF-RESULT-IN-B-DEFAULT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_CONNECTION_ERROR_UNKNOWN" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-TYPE-SETTING-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ERROR-IP-CONFIG-NOT-ALLOWED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRED_ERROR_UNKNOWN" link="NMSettingWired.html#NM-SETTING-WIRED-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRED_ERROR_INVALID_PROPERTY" link="NMSettingWired.html#NM-SETTING-WIRED-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRED_ERROR_MISSING_PROPERTY" link="NMSettingWired.html#NM-SETTING-WIRED-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_ERROR_UNKNOWN" link="NMSettingWireless.html#NM-SETTING-WIRELESS-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY" link="NMSettingWireless.html#NM-SETTING-WIRELESS-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY" link="NMSettingWireless.html#NM-SETTING-WIRELESS-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING" link="NMSettingWireless.html#NM-SETTING-WIRELESS-ERROR-MISSING-SECURITY-SETTING:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND" link="NMSettingWireless.html#NM-SETTING-WIRELESS-ERROR-CHANNEL-REQUIRES-BAND:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-MISSING-802-1X-SETTING:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-LEAP-REQUIRES-802-1X:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-LEAP-REQUIRES-USERNAME:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-ERROR-SHARED-KEY-REQUIRES-WEP:CAPS"/>
+    <keyword type="constant" name="NM_WEP_KEY_TYPE_UNKNOWN" link="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_WEP_KEY_TYPE_KEY" link="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-KEY:CAPS"/>
+    <keyword type="constant" name="NM_WEP_KEY_TYPE_PASSPHRASE" link="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-PASSPHRASE:CAPS"/>
+    <keyword type="constant" name="NM_WEP_KEY_TYPE_LAST" link="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-LAST:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BLUETOOTH_ERROR_UNKNOWN" link="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY" link="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY" link="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND" link="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-ERROR-TYPE-SETTING-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SERIAL_ERROR_UNKNOWN" link="NMSettingSerial.html#NM-SETTING-SERIAL-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY" link="NMSettingSerial.html#NM-SETTING-SERIAL-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY" link="NMSettingSerial.html#NM-SETTING-SERIAL-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING" link="NMSettingSerial.html#NM-SETTING-SERIAL-ERROR-MISSING-PPP-SETTING:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_CDMA_ERROR_UNKNOWN" link="NMSettingCdma.html#NM-SETTING-CDMA-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_CDMA_ERROR_INVALID_PROPERTY" link="NMSettingCdma.html#NM-SETTING-CDMA-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_CDMA_ERROR_MISSING_PROPERTY" link="NMSettingCdma.html#NM-SETTING-CDMA-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING" link="NMSettingCdma.html#NM-SETTING-CDMA-ERROR-MISSING-SERIAL-SETTING:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_ERROR_UNKNOWN" link="NMSettingGsm.html#NM-SETTING-GSM-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_ERROR_INVALID_PROPERTY" link="NMSettingGsm.html#NM-SETTING-GSM-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_ERROR_MISSING_PROPERTY" link="NMSettingGsm.html#NM-SETTING-GSM-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING" link="NMSettingGsm.html#NM-SETTING-GSM-ERROR-MISSING-SERIAL-SETTING:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_NETWORK_TYPE_ANY" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-ANY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-UMTS-HSPA:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-GPRS-EDGE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-UMTS-HSPA:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-GPRS-EDGE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-4G:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_NETWORK_TYPE_4G" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-4G:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_UNKNOWN" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_ANY" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-ANY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_EGSM" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-EGSM:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_DCS" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-DCS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_PCS" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-PCS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_G850" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-G850:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_U2100" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-U2100:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_U1800" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-U1800:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_U17IV" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-U17IV:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_U800" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-U800:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_U850" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-U850:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_U900" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-U900:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_U17IX" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-U17IX:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_U1900" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-U1900:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GSM_BAND_U2600" link="NMSettingGsm.html#NM-SETTING-GSM-BAND-U2600:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIMAX_ERROR_UNKNOWN" link="NMSettingWimax.html#NM-SETTING-WIMAX-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY" link="NMSettingWimax.html#NM-SETTING-WIMAX-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY" link="NMSettingWimax.html#NM-SETTING-WIMAX-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BOND_ERROR_UNKNOWN" link="NMSettingBond.html#NM-SETTING-BOND-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BOND_ERROR_INVALID_PROPERTY" link="NMSettingBond.html#NM-SETTING-BOND-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BOND_ERROR_MISSING_PROPERTY" link="NMSettingBond.html#NM-SETTING-BOND-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BOND_ERROR_INVALID_OPTION" link="NMSettingBond.html#NM-SETTING-BOND-ERROR-INVALID-OPTION:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BOND_ERROR_MISSING_OPTION" link="NMSettingBond.html#NM-SETTING-BOND-ERROR-MISSING-OPTION:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BRIDGE_ERROR_UNKNOWN" link="NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY" link="NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY" link="NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_TEAM_ERROR_UNKNOWN" link="NMSettingTeam.html#NM-SETTING-TEAM-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_TEAM_ERROR_INVALID_PROPERTY" link="NMSettingTeam.html#NM-SETTING-TEAM-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_TEAM_ERROR_MISSING_PROPERTY" link="NMSettingTeam.html#NM-SETTING-TEAM-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_TEAM_PORT_ERROR_UNKNOWN" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_TEAM_PORT_ERROR_INVALID_PROPERTY" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_TEAM_PORT_ERROR_MISSING_PROPERTY" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GENERIC_ERROR_UNKNOWN" link="NMSettingGeneric.html#NM-SETTING-GENERIC-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GENERIC_ERROR_INVALID_PROPERTY" link="NMSettingGeneric.html#NM-SETTING-GENERIC-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_GENERIC_ERROR_MISSING_PROPERTY" link="NMSettingGeneric.html#NM-SETTING-GENERIC-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_INFINIBAND_ERROR_UNKNOWN" link="NMSettingInfiniband.html#NM-SETTING-INFINIBAND-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY" link="NMSettingInfiniband.html#NM-SETTING-INFINIBAND-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY" link="NMSettingInfiniband.html#NM-SETTING-INFINIBAND-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_VLAN_ERROR_UNKNOWN" link="NMSettingVlan.html#NM-SETTING-VLAN-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_VLAN_ERROR_INVALID_PROPERTY" link="NMSettingVlan.html#NM-SETTING-VLAN-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_VLAN_ERROR_MISSING_PROPERTY" link="NMSettingVlan.html#NM-SETTING-VLAN-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_VLAN_ERROR_INVALID_PARENT" link="NMSettingVlan.html#NM-SETTING-VLAN-ERROR-INVALID-PARENT:CAPS"/>
+    <keyword type="constant" name="NM_VLAN_INGRESS_MAP" link="NMSettingVlan.html#NM-VLAN-INGRESS-MAP:CAPS"/>
+    <keyword type="constant" name="NM_VLAN_EGRESS_MAP" link="NMSettingVlan.html#NM-VLAN-EGRESS-MAP:CAPS"/>
+    <keyword type="constant" name="NM_VLAN_FLAG_REORDER_HEADERS" link="NMSettingVlan.html#NM-VLAN-FLAG-REORDER-HEADERS:CAPS"/>
+    <keyword type="constant" name="NM_VLAN_FLAG_GVRP" link="NMSettingVlan.html#NM-VLAN-FLAG-GVRP:CAPS"/>
+    <keyword type="constant" name="NM_VLAN_FLAG_LOOSE_BINDING" link="NMSettingVlan.html#NM-VLAN-FLAG-LOOSE-BINDING:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_OLPC_MESH_ERROR_UNKNOWN" link="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY" link="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY" link="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_ADSL_ERROR_UNKNOWN" link="NMSettingAdsl.html#NM-SETTING-ADSL-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_ADSL_ERROR_INVALID_PROPERTY" link="NMSettingAdsl.html#NM-SETTING-ADSL-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_ADSL_ERROR_MISSING_PROPERTY" link="NMSettingAdsl.html#NM-SETTING-ADSL-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DCB_ERROR_UNKNOWN" link="NMSettingDcb.html#NM-SETTING-DCB-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DCB_ERROR_INVALID_PROPERTY" link="NMSettingDcb.html#NM-SETTING-DCB-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DCB_ERROR_MISSING_PROPERTY" link="NMSettingDcb.html#NM-SETTING-DCB-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DCB_FLAG_NONE" link="NMSettingDcb.html#NM-SETTING-DCB-FLAG-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DCB_FLAG_ENABLE" link="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DCB_FLAG_ADVERTISE" link="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DCB_FLAG_WILLING" link="NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_UNKNOWN" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_X509" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-X509:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_RAW_KEY" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_PKCS12" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_SCHEME_UNKNOWN" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_SCHEME_BLOB" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_SCHEME_PATH" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_ERROR_UNKNOWN" link="NMSetting8021x.html#NM-SETTING-802-1X-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_ERROR_INVALID_PROPERTY" link="NMSetting8021x.html#NM-SETTING-802-1X-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_ERROR_MISSING_PROPERTY" link="NMSetting8021x.html#NM-SETTING-802-1X-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-ERROR-NOT-ALLOWED-FOR-METHOD:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR-NOT-ALLOWED-FOR-METHOD:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-DISABLED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-PUBLIC-ADDR:CAPS"/>
+    <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_PPP_ERROR_UNKNOWN" link="NMSettingPPP.html#NM-SETTING-PPP-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_PPP_ERROR_INVALID_PROPERTY" link="NMSettingPPP.html#NM-SETTING-PPP-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_PPP_ERROR_MISSING_PROPERTY" link="NMSettingPPP.html#NM-SETTING-PPP-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED" link="NMSettingPPP.html#NM-SETTING-PPP-ERROR-REQUIRE-MPPE-NOT-ALLOWED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_PPPOE_ERROR_UNKNOWN" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING" link="NMSettingPPPOE.html#NM-SETTING-PPPOE-ERROR-MISSING-PPP-SETTING:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_VPN_ERROR_UNKNOWN" link="NMSettingVPN.html#NM-SETTING-VPN-ERROR-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_VPN_ERROR_INVALID_PROPERTY" link="NMSettingVPN.html#NM-SETTING-VPN-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_VPN_ERROR_MISSING_PROPERTY" link="NMSettingVPN.html#NM-SETTING-VPN-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_INVALID" link="libnm-util-nm-utils.html#NMU-SEC-INVALID:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_NONE" link="libnm-util-nm-utils.html#NMU-SEC-NONE:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_STATIC_WEP" link="libnm-util-nm-utils.html#NMU-SEC-STATIC-WEP:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_LEAP" link="libnm-util-nm-utils.html#NMU-SEC-LEAP:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_DYNAMIC_WEP" link="libnm-util-nm-utils.html#NMU-SEC-DYNAMIC-WEP:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_WPA_PSK" link="libnm-util-nm-utils.html#NMU-SEC-WPA-PSK:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_WPA_ENTERPRISE" link="libnm-util-nm-utils.html#NMU-SEC-WPA-ENTERPRISE:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_WPA2_PSK" link="libnm-util-nm-utils.html#NMU-SEC-WPA2-PSK:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_WPA2_ENTERPRISE" link="libnm-util-nm-utils.html#NMU-SEC-WPA2-ENTERPRISE:CAPS"/>
+    <keyword type="constant" name="NM_STATE_UNKNOWN" link="libnm-util-NetworkManager.html#NM-STATE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_STATE_ASLEEP" link="libnm-util-NetworkManager.html#NM-STATE-ASLEEP:CAPS"/>
+    <keyword type="constant" name="NM_STATE_DISCONNECTED" link="libnm-util-NetworkManager.html#NM-STATE-DISCONNECTED:CAPS"/>
+    <keyword type="constant" name="NM_STATE_DISCONNECTING" link="libnm-util-NetworkManager.html#NM-STATE-DISCONNECTING:CAPS"/>
+    <keyword type="constant" name="NM_STATE_CONNECTING" link="libnm-util-NetworkManager.html#NM-STATE-CONNECTING:CAPS"/>
+    <keyword type="constant" name="NM_STATE_CONNECTED_LOCAL" link="libnm-util-NetworkManager.html#NM-STATE-CONNECTED-LOCAL:CAPS"/>
+    <keyword type="constant" name="NM_STATE_CONNECTED_SITE" link="libnm-util-NetworkManager.html#NM-STATE-CONNECTED-SITE:CAPS"/>
+    <keyword type="constant" name="NM_STATE_CONNECTED_GLOBAL" link="libnm-util-NetworkManager.html#NM-STATE-CONNECTED-GLOBAL:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_UNKNOWN" link="libnm-util-NetworkManager.html#NM-CONNECTIVITY-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_NONE" link="libnm-util-NetworkManager.html#NM-CONNECTIVITY-NONE:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_PORTAL" link="libnm-util-NetworkManager.html#NM-CONNECTIVITY-PORTAL:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_LIMITED" link="libnm-util-NetworkManager.html#NM-CONNECTIVITY-LIMITED:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_FULL" link="libnm-util-NetworkManager.html#NM-CONNECTIVITY-FULL:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_UNKNOWN" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_ETHERNET" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-ETHERNET:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_WIFI" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-WIFI:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_UNUSED1" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-UNUSED1:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_UNUSED2" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-UNUSED2:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_BT" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-BT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_OLPC_MESH" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-OLPC-MESH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_WIMAX" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-WIMAX:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_MODEM" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-MODEM:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_INFINIBAND" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-INFINIBAND:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_BOND" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-BOND:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_VLAN" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-VLAN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_ADSL" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-ADSL:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_BRIDGE" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-BRIDGE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_GENERIC" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-GENERIC:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_TEAM" link="libnm-util-NetworkManager.html#NM-DEVICE-TYPE-TEAM:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_CAP_NONE" link="libnm-util-NetworkManager.html#NM-DEVICE-CAP-NONE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_CAP_NM_SUPPORTED" link="libnm-util-NetworkManager.html#NM-DEVICE-CAP-NM-SUPPORTED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_CAP_CARRIER_DETECT" link="libnm-util-NetworkManager.html#NM-DEVICE-CAP-CARRIER-DETECT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_CAP_IS_SOFTWARE" link="libnm-util-NetworkManager.html#NM-DEVICE-CAP-IS-SOFTWARE:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_NONE" link="libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-NONE:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_CIPHER_WEP40" link="libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-CIPHER-WEP40:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_CIPHER_WEP104" link="libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-CIPHER-WEP104:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_CIPHER_TKIP" link="libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-CIPHER-TKIP:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_CIPHER_CCMP" link="libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-CIPHER-CCMP:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_WPA" link="libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-WPA:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_RSN" link="libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-RSN:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_AP" link="libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-AP:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_ADHOC" link="libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-ADHOC:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_FREQ_VALID" link="libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-FREQ-VALID:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_FREQ_2GHZ" link="libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-FREQ-2GHZ:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_FREQ_5GHZ" link="libnm-util-NetworkManager.html#NM-WIFI-DEVICE-CAP-FREQ-5GHZ:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_FLAGS_NONE" link="libnm-util-NetworkManager.html#NM-802-11-AP-FLAGS-NONE:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_FLAGS_PRIVACY" link="libnm-util-NetworkManager.html#NM-802-11-AP-FLAGS-PRIVACY:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_NONE" link="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-NONE:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_PAIR_WEP40" link="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-PAIR-WEP40:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_PAIR_WEP104" link="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-PAIR-WEP104:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_PAIR_TKIP" link="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-PAIR-TKIP:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_PAIR_CCMP" link="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-PAIR-CCMP:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_GROUP_WEP40" link="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-GROUP-WEP40:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_GROUP_WEP104" link="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-GROUP-WEP104:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_GROUP_TKIP" link="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-GROUP-TKIP:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_GROUP_CCMP" link="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-GROUP-CCMP:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_KEY_MGMT_PSK" link="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-KEY-MGMT-PSK:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_KEY_MGMT_802_1X" link="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-KEY-MGMT-802-1X:CAPS"/>
+    <keyword type="constant" name="NM_802_11_MODE_UNKNOWN" link="libnm-util-NetworkManager.html#NM-802-11-MODE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_802_11_MODE_ADHOC" link="libnm-util-NetworkManager.html#NM-802-11-MODE-ADHOC:CAPS"/>
+    <keyword type="constant" name="NM_802_11_MODE_INFRA" link="libnm-util-NetworkManager.html#NM-802-11-MODE-INFRA:CAPS"/>
+    <keyword type="constant" name="NM_802_11_MODE_AP" link="libnm-util-NetworkManager.html#NM-802-11-MODE-AP:CAPS"/>
+    <keyword type="constant" name="NM_BT_CAPABILITY_NONE" link="libnm-util-NetworkManager.html#NM-BT-CAPABILITY-NONE:CAPS"/>
+    <keyword type="constant" name="NM_BT_CAPABILITY_DUN" link="libnm-util-NetworkManager.html#NM-BT-CAPABILITY-DUN:CAPS"/>
+    <keyword type="constant" name="NM_BT_CAPABILITY_NAP" link="libnm-util-NetworkManager.html#NM-BT-CAPABILITY-NAP:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_NONE" link="libnm-util-NetworkManager.html#NM-DEVICE-MODEM-CAPABILITY-NONE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_POTS" link="libnm-util-NetworkManager.html#NM-DEVICE-MODEM-CAPABILITY-POTS:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO" link="libnm-util-NetworkManager.html#NM-DEVICE-MODEM-CAPABILITY-CDMA-EVDO:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS" link="libnm-util-NetworkManager.html#NM-DEVICE-MODEM-CAPABILITY-GSM-UMTS:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_LTE" link="libnm-util-NetworkManager.html#NM-DEVICE-MODEM-CAPABILITY-LTE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_UNKNOWN" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_UNMANAGED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-UNMANAGED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_UNAVAILABLE" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-UNAVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_DISCONNECTED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-DISCONNECTED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_PREPARE" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-PREPARE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_CONFIG" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-CONFIG:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_NEED_AUTH" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-NEED-AUTH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_IP_CONFIG" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-IP-CONFIG:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_IP_CHECK" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-IP-CHECK:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_SECONDARIES" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-SECONDARIES:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_ACTIVATED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-ACTIVATED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_DEACTIVATING" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-DEACTIVATING:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NONE" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-NONE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_UNKNOWN" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NOW_MANAGED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-NOW-MANAGED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NOW_UNMANAGED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-NOW-UNMANAGED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_CONFIG_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-CONFIG-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-IP-CONFIG-UNAVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-IP-CONFIG-EXPIRED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NO_SECRETS" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-NO-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SUPPLICANT-DISCONNECT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SUPPLICANT-CONFIG-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SUPPLICANT-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SUPPLICANT-TIMEOUT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PPP_START_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-PPP-START-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PPP_DISCONNECT" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-PPP-DISCONNECT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PPP_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-PPP-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DHCP_START_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-DHCP-START-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DHCP_ERROR" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-DHCP-ERROR:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DHCP_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-DHCP-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SHARED_START_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SHARED-START-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SHARED_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SHARED-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-AUTOIP-START-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_AUTOIP_ERROR" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-AUTOIP-ERROR:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_AUTOIP_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-AUTOIP-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_BUSY" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-BUSY:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-NO-DIAL-TONE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-NO-CARRIER:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-DIAL-TIMEOUT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-DIAL-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-INIT-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_APN_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-APN-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-NOT-SEARCHING:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-DENIED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-TIMEOUT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-PIN-CHECK-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_FIRMWARE_MISSING" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-FIRMWARE-MISSING:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_REMOVED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-REMOVED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SLEEPING" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SLEEPING:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_CONNECTION_REMOVED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-CONNECTION-REMOVED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_USER_REQUESTED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-USER-REQUESTED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_CARRIER" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-CARRIER:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-CONNECTION-ASSUMED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SUPPLICANT-AVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_BT_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-BT-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-SIM-NOT-INSERTED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-SIM-PIN-REQUIRED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-SIM-PUK-REQUIRED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_SIM_WRONG" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-GSM-SIM-WRONG:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_INFINIBAND_MODE" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-INFINIBAND-MODE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-DEPENDENCY-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_BR2684_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-BR2684-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-MANAGER-UNAVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SSID_NOT_FOUND" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SSID-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SECONDARY-CONNECTION-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-DCB-FCOE-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-TEAMD-CONTROL-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_FAILED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_AVAILABLE" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-MODEM-AVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-SIM-PIN-INCORRECT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NEW_ACTIVATION" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-NEW-ACTIVATION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PARENT_CHANGED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-PARENT-CHANGED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-PARENT-MANAGED-CHANGED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_LAST" link="libnm-util-NetworkManager.html#NM-DEVICE-STATE-REASON-LAST:CAPS"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_UNKNOWN" link="libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_ACTIVATING" link="libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATING:CAPS"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_ACTIVATED" link="libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_DEACTIVATING" link="libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-DEACTIVATING:CAPS"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_DEACTIVATED" link="libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-DEACTIVATED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_UNKNOWN" link="libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_INIT" link="libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-INIT:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_SHUTDOWN" link="libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-SHUTDOWN:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STARTING" link="libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-STARTING:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STARTED" link="libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-STARTED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STOPPING" link="libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-STOPPING:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STOPPED" link="libnm-util-NetworkManagerVPN.html#NM-VPN-SERVICE-STATE-STOPPED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_UNKNOWN" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_PREPARE" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-PREPARE:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_NEED_AUTH" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-NEED-AUTH:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_CONNECT" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-CONNECT:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_IP_CONFIG_GET" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-IP-CONFIG-GET:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_ACTIVATED" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-ACTIVATED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_FAILED" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_DISCONNECTED" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-DISCONNECTED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_UNKNOWN" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_NONE" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-NONE:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-USER-DISCONNECTED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-DEVICE-DISCONNECTED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-STOPPED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-IP-CONFIG-INVALID:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-CONNECT-TIMEOUT:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-TIMEOUT:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-NO-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-LOGIN-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED" link="libnm-util-NetworkManagerVPN.html#NM-VPN-CONNECTION-STATE-REASON-CONNECTION-REMOVED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED" link="libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-FAILURE-LOGIN-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED" link="libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-FAILURE-CONNECT-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG" link="libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-FAILURE-BAD-IP-CONFIG:CAPS"/>
   </functions>
 </book>
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index 0efce8c7..9c2eaa40 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm-util Reference Manual: Object Hierarchy</title>
+<title>Object Hierarchy: libnm-util Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="libnm-util-NetworkManagerVPN.html" title="NetworkManagerVPN">
 <link rel="next" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -103,7 +103,6 @@
 </pre>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/style.css b/docs/libnm-util/html/style.css
index c141ddd2..36754209 100644
--- a/docs/libnm-util/html/style.css
+++ b/docs/libnm-util/html/style.css
@@ -60,7 +60,7 @@ a:hover
 div.informaltable table
 {
   border-collapse: separate;
-  border-spacing: 1em 0.5em;
+  border-spacing: 1em 0.3em;
   border: none;
 }
 
@@ -148,6 +148,8 @@ div.table table th
 h4
 {
   color: #555753;
+  margin-top: 1em;
+  margin-bottom: 1em;
 }
 
 hr
@@ -166,17 +168,16 @@ dl.toc dt
   padding-bottom: 0.25em;
 }
 
-dl.toc > dd > dl > dt
+dl.toc > dt
 {
   padding-top: 0.25em;
   padding-bottom: 0.25em;
+  font-weight: bold;
 }
 
-dl.toc > dt
+dl.toc > dl
 {
-  padding-top: 1em;
   padding-bottom: 0.5em;
-  font-weight: bold;
 }
 
 .parameter
@@ -346,7 +347,9 @@ acronym,abbr
 }
 
 @media screen {
-  sup a.footnote
+  /* these have a <sup> as a first child, but since there are no parent selectors
+   * we can't use that. */
+  a.footnote
   {
     position: relative;
     top: 0em ! important;
diff --git a/docs/libnm-util/tmpl/NetworkManager.sgml b/docs/libnm-util/tmpl/NetworkManager.sgml
deleted file mode 100644
index 008d08b8..00000000
--- a/docs/libnm-util/tmpl/NetworkManager.sgml
+++ /dev/null
@@ -1,539 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NetworkManager
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DBUS_SERVICE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_WIRED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_ADSL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_WIRELESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_BLUETOOTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_OLPC_MESH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_ACCESS_POINT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_ACCESS_POINT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_MODEM ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_WIMAX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_WIMAX_NSP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_WIMAX_NSP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_ACTIVE_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_IP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DHCP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_IP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DHCP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_INFINIBAND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_BOND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_TEAM ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_VLAN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_BRIDGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_GENERIC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_VETH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_TUN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_MACVLAN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_VXLAN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_GRE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_IFACE_SETTINGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_SETTINGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_IFACE_SETTINGS_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_SETTINGS_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_AGENT_MANAGER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_AGENT_MANAGER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_SECRET_AGENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_SECRET_AGENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMState ##### -->
-<para>
-
-</para>
-
-@NM_STATE_UNKNOWN: 
-@NM_STATE_ASLEEP: 
-@NM_STATE_DISCONNECTED: 
-@NM_STATE_DISCONNECTING: 
-@NM_STATE_CONNECTING: 
-@NM_STATE_CONNECTED_LOCAL: 
-@NM_STATE_CONNECTED_SITE: 
-@NM_STATE_CONNECTED_GLOBAL: 
-
-<!-- ##### MACRO NM_STATE_CONNECTED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMConnectivityState ##### -->
-<para>
-
-</para>
-
-@NM_CONNECTIVITY_UNKNOWN: 
-@NM_CONNECTIVITY_NONE: 
-@NM_CONNECTIVITY_PORTAL: 
-@NM_CONNECTIVITY_LIMITED: 
-@NM_CONNECTIVITY_FULL: 
-
-<!-- ##### ENUM NMDeviceType ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_TYPE_UNKNOWN: 
-@NM_DEVICE_TYPE_ETHERNET: 
-@NM_DEVICE_TYPE_WIFI: 
-@NM_DEVICE_TYPE_UNUSED1: 
-@NM_DEVICE_TYPE_UNUSED2: 
-@NM_DEVICE_TYPE_BT: 
-@NM_DEVICE_TYPE_OLPC_MESH: 
-@NM_DEVICE_TYPE_WIMAX: 
-@NM_DEVICE_TYPE_MODEM: 
-@NM_DEVICE_TYPE_INFINIBAND: 
-@NM_DEVICE_TYPE_BOND: 
-@NM_DEVICE_TYPE_VLAN: 
-@NM_DEVICE_TYPE_ADSL: 
-@NM_DEVICE_TYPE_BRIDGE: 
-@NM_DEVICE_TYPE_GENERIC: 
-@NM_DEVICE_TYPE_TEAM: 
-
-<!-- ##### ENUM NMDeviceCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_CAP_NONE: 
-@NM_DEVICE_CAP_NM_SUPPORTED: 
-@NM_DEVICE_CAP_CARRIER_DETECT: 
-@NM_DEVICE_CAP_IS_SOFTWARE: 
-
-<!-- ##### ENUM NMDeviceWifiCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_WIFI_DEVICE_CAP_NONE: 
-@NM_WIFI_DEVICE_CAP_CIPHER_WEP40: 
-@NM_WIFI_DEVICE_CAP_CIPHER_WEP104: 
-@NM_WIFI_DEVICE_CAP_CIPHER_TKIP: 
-@NM_WIFI_DEVICE_CAP_CIPHER_CCMP: 
-@NM_WIFI_DEVICE_CAP_WPA: 
-@NM_WIFI_DEVICE_CAP_RSN: 
-@NM_WIFI_DEVICE_CAP_AP: 
-@NM_WIFI_DEVICE_CAP_ADHOC: 
-@NM_WIFI_DEVICE_CAP_FREQ_VALID: 
-@NM_WIFI_DEVICE_CAP_FREQ_2GHZ: 
-@NM_WIFI_DEVICE_CAP_FREQ_5GHZ: 
-
-<!-- ##### ENUM NM80211ApFlags ##### -->
-<para>
-
-</para>
-
-@NM_802_11_AP_FLAGS_NONE: 
-@NM_802_11_AP_FLAGS_PRIVACY: 
-
-<!-- ##### ENUM NM80211ApSecurityFlags ##### -->
-<para>
-
-</para>
-
-@NM_802_11_AP_SEC_NONE: 
-@NM_802_11_AP_SEC_PAIR_WEP40: 
-@NM_802_11_AP_SEC_PAIR_WEP104: 
-@NM_802_11_AP_SEC_PAIR_TKIP: 
-@NM_802_11_AP_SEC_PAIR_CCMP: 
-@NM_802_11_AP_SEC_GROUP_WEP40: 
-@NM_802_11_AP_SEC_GROUP_WEP104: 
-@NM_802_11_AP_SEC_GROUP_TKIP: 
-@NM_802_11_AP_SEC_GROUP_CCMP: 
-@NM_802_11_AP_SEC_KEY_MGMT_PSK: 
-@NM_802_11_AP_SEC_KEY_MGMT_802_1X: 
-
-<!-- ##### ENUM NM80211Mode ##### -->
-<para>
-
-</para>
-
-@NM_802_11_MODE_UNKNOWN: 
-@NM_802_11_MODE_ADHOC: 
-@NM_802_11_MODE_INFRA: 
-@NM_802_11_MODE_AP: 
-
-<!-- ##### ENUM NMBluetoothCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_BT_CAPABILITY_NONE: 
-@NM_BT_CAPABILITY_DUN: 
-@NM_BT_CAPABILITY_NAP: 
-
-<!-- ##### ENUM NMDeviceModemCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_MODEM_CAPABILITY_NONE: 
-@NM_DEVICE_MODEM_CAPABILITY_POTS: 
-@NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO: 
-@NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS: 
-@NM_DEVICE_MODEM_CAPABILITY_LTE: 
-
-<!-- ##### ENUM NMDeviceState ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_STATE_UNKNOWN: 
-@NM_DEVICE_STATE_UNMANAGED: 
-@NM_DEVICE_STATE_UNAVAILABLE: 
-@NM_DEVICE_STATE_DISCONNECTED: 
-@NM_DEVICE_STATE_PREPARE: 
-@NM_DEVICE_STATE_CONFIG: 
-@NM_DEVICE_STATE_NEED_AUTH: 
-@NM_DEVICE_STATE_IP_CONFIG: 
-@NM_DEVICE_STATE_IP_CHECK: 
-@NM_DEVICE_STATE_SECONDARIES: 
-@NM_DEVICE_STATE_ACTIVATED: 
-@NM_DEVICE_STATE_DEACTIVATING: 
-@NM_DEVICE_STATE_FAILED: 
-
-<!-- ##### ENUM NMDeviceStateReason ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_STATE_REASON_NONE: 
-@NM_DEVICE_STATE_REASON_UNKNOWN: 
-@NM_DEVICE_STATE_REASON_NOW_MANAGED: 
-@NM_DEVICE_STATE_REASON_NOW_UNMANAGED: 
-@NM_DEVICE_STATE_REASON_CONFIG_FAILED: 
-@NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE: 
-@NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED: 
-@NM_DEVICE_STATE_REASON_NO_SECRETS: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_PPP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_PPP_DISCONNECT: 
-@NM_DEVICE_STATE_REASON_PPP_FAILED: 
-@NM_DEVICE_STATE_REASON_DHCP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_DHCP_ERROR: 
-@NM_DEVICE_STATE_REASON_DHCP_FAILED: 
-@NM_DEVICE_STATE_REASON_SHARED_START_FAILED: 
-@NM_DEVICE_STATE_REASON_SHARED_FAILED: 
-@NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_AUTOIP_ERROR: 
-@NM_DEVICE_STATE_REASON_AUTOIP_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_BUSY: 
-@NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE: 
-@NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER: 
-@NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_APN_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED: 
-@NM_DEVICE_STATE_REASON_FIRMWARE_MISSING: 
-@NM_DEVICE_STATE_REASON_REMOVED: 
-@NM_DEVICE_STATE_REASON_SLEEPING: 
-@NM_DEVICE_STATE_REASON_CONNECTION_REMOVED: 
-@NM_DEVICE_STATE_REASON_USER_REQUESTED: 
-@NM_DEVICE_STATE_REASON_CARRIER: 
-@NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE: 
-@NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND: 
-@NM_DEVICE_STATE_REASON_BT_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_WRONG: 
-@NM_DEVICE_STATE_REASON_INFINIBAND_MODE: 
-@NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: 
-@NM_DEVICE_STATE_REASON_BR2684_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE: 
-@NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: 
-@NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED: 
-@NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED: 
-@NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_AVAILABLE: 
-@NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT: 
-@NM_DEVICE_STATE_REASON_NEW_ACTIVATION: 
-@NM_DEVICE_STATE_REASON_LAST: 
-
-<!-- ##### ENUM NMActiveConnectionState ##### -->
-<para>
-
-</para>
-
-@NM_ACTIVE_CONNECTION_STATE_UNKNOWN: 
-@NM_ACTIVE_CONNECTION_STATE_ACTIVATING: 
-@NM_ACTIVE_CONNECTION_STATE_ACTIVATED: 
-@NM_ACTIVE_CONNECTION_STATE_DEACTIVATING: 
-@NM_ACTIVE_CONNECTION_STATE_DEACTIVATED: 
-
diff --git a/docs/libnm-util/tmpl/NetworkManagerVPN.sgml b/docs/libnm-util/tmpl/NetworkManagerVPN.sgml
deleted file mode 100644
index 03b7f316..00000000
--- a/docs/libnm-util/tmpl/NetworkManagerVPN.sgml
+++ /dev/null
@@ -1,484 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NetworkManagerVPN
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DBUS_PATH_VPN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_VPN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_VPN_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_VPN_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_DBUS_PLUGIN_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_DBUS_PLUGIN_INTERFACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_NO_ACTIVE_VPN_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_NO_VPN_CONNECTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INVALID_VPN_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_ERROR_PREFIX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_STARTING_IN_PROGRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_ALREADY_STARTED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_STOPPING_IN_PROGRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_ALREADY_STOPPED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_WRONG_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_BAD_ARGUMENTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_LOGIN_BANNER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_LOGIN_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_CONNECT_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_STATE_CHANGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_IP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMVPNServiceState ##### -->
-<para>
-
-</para>
-
-@NM_VPN_SERVICE_STATE_UNKNOWN: 
-@NM_VPN_SERVICE_STATE_INIT: 
-@NM_VPN_SERVICE_STATE_SHUTDOWN: 
-@NM_VPN_SERVICE_STATE_STARTING: 
-@NM_VPN_SERVICE_STATE_STARTED: 
-@NM_VPN_SERVICE_STATE_STOPPING: 
-@NM_VPN_SERVICE_STATE_STOPPED: 
-
-<!-- ##### ENUM NMVPNConnectionState ##### -->
-<para>
-
-</para>
-
-@NM_VPN_CONNECTION_STATE_UNKNOWN: 
-@NM_VPN_CONNECTION_STATE_PREPARE: 
-@NM_VPN_CONNECTION_STATE_NEED_AUTH: 
-@NM_VPN_CONNECTION_STATE_CONNECT: 
-@NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: 
-@NM_VPN_CONNECTION_STATE_ACTIVATED: 
-@NM_VPN_CONNECTION_STATE_FAILED: 
-@NM_VPN_CONNECTION_STATE_DISCONNECTED: 
-
-<!-- ##### ENUM NMVPNConnectionStateReason ##### -->
-<para>
-
-</para>
-
-@NM_VPN_CONNECTION_STATE_REASON_UNKNOWN: 
-@NM_VPN_CONNECTION_STATE_REASON_NONE: 
-@NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED: 
-@NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED: 
-@NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID: 
-@NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED: 
-@NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS: 
-@NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED: 
-@NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED: 
-
-<!-- ##### ENUM NMVPNPluginFailure ##### -->
-<para>
-
-</para>
-
-@NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED: 
-@NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED: 
-@NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG: 
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_TUNDEV ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_BANNER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_HAS_IP4 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_HAS_IP6 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CAN_PERSIST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_PTP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_PREFIX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_NBNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_MSS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_BANNER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_PTP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_PREFIX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_MSS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/docs/libnm-util/tmpl/libnm-util-unused.sgml b/docs/libnm-util/tmpl/libnm-util-unused.sgml
deleted file mode 100644
index e69de29b..00000000
--- a/docs/libnm-util/tmpl/libnm-util-unused.sgml
+++ /dev/null
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
deleted file mode 100644
index 27d34bb6..00000000
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ /dev/null
@@ -1,663 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_CONNECTION_SECRETS_UPDATED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CONNECTION_SECRETS_CLEARED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CONNECTION_CHANGED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CONNECTION_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMConnectionError ##### -->
-<para>
-
-</para>
-
-@NM_CONNECTION_ERROR_UNKNOWN: 
-@NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND: 
-@NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID: 
-@NM_CONNECTION_ERROR_SETTING_NOT_FOUND: 
-@NM_CONNECTION_ERROR_INVALID_SETTING: 
-
-<!-- ##### MACRO NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CONNECTION_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_connection_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### STRUCT NMConnection ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL NMConnection::changed ##### -->
-<para>
-
-</para>
-
-@nmconnection: the object which received the signal.
-
-<!-- ##### SIGNAL NMConnection::secrets-cleared ##### -->
-<para>
-
-</para>
-
-@nmconnection: the object which received the signal.
-
-<!-- ##### SIGNAL NMConnection::secrets-updated ##### -->
-<para>
-
-</para>
-
-@nmconnection: the object which received the signal.
-@arg1: 
-
-<!-- ##### ARG NMConnection:path ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION nm_connection_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_new_from_hash ##### -->
-<para>
-
-</para>
-
-@hash: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_duplicate ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_create_setting ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_add_setting ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting: 
-
-
-<!-- ##### FUNCTION nm_connection_remove_setting ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_type: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_by_name ##### -->
-<para>
-
-</para>
-
-@connection: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_replace_settings ##### -->
-<para>
-
-</para>
-
-@connection: 
-@new_settings: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_replace_settings_from_connection ##### -->
-<para>
-
-</para>
-
-@connection: 
-@new_connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_compare ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_diff ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@out_settings: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_verify ##### -->
-<para>
-
-</para>
-
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_normalize ##### -->
-<para>
-
-</para>
-
-@connection: 
-@parameters: 
-@modified: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_need_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-@hints: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_clear_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-
-
-<!-- ##### FUNCTION nm_connection_clear_secrets_with_flags ##### -->
-<para>
-
-</para>
-
-@connection: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_connection_update_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_name: 
-@secrets: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_set_path ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-
-
-<!-- ##### FUNCTION nm_connection_get_path ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_virtual_iface_name ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_interface_name ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_is_type ##### -->
-<para>
-
-</para>
-
-@connection: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_for_each_setting_value ##### -->
-<para>
-
-</para>
-
-@connection: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_connection_to_hash ##### -->
-<para>
-
-</para>
-
-@connection: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_dump ##### -->
-<para>
-
-</para>
-
-@connection: 
-
-
-<!-- ##### FUNCTION nm_connection_lookup_setting_type ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_lookup_setting_type_by_quark ##### -->
-<para>
-
-</para>
-
-@error_quark: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_uuid ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_id ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_connection_type ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_virtual_device_description ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_802_1x ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_bluetooth ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_bond ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_team ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_team_port ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_bridge ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_bridge_port ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_cdma ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_connection ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_dcb ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_generic ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_gsm ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_infiniband ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_ip4_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_ip6_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_olpc_mesh ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_ppp ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_pppoe ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_serial ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_vpn ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_wimax ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_adsl ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_wired ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_wireless ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_wireless_security ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_vlan ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
deleted file mode 100644
index a5b6f315..00000000
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ /dev/null
@@ -1,943 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSetting8021x
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMSetting8021xCKFormat ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_802_1X_CK_FORMAT_UNKNOWN: 
-@NM_SETTING_802_1X_CK_FORMAT_X509: 
-@NM_SETTING_802_1X_CK_FORMAT_RAW_KEY: 
-@NM_SETTING_802_1X_CK_FORMAT_PKCS12: 
-
-<!-- ##### ENUM NMSetting8021xCKScheme ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_802_1X_CK_SCHEME_UNKNOWN: 
-@NM_SETTING_802_1X_CK_SCHEME_BLOB: 
-@NM_SETTING_802_1X_CK_SCHEME_PATH: 
-
-<!-- ##### MACRO NM_SETTING_802_1X_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSetting8021xError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_802_1X_ERROR_UNKNOWN: 
-@NM_SETTING_802_1X_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_802_1X_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_802_1X_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_EAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_IDENTITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_ANONYMOUS_IDENTITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PAC_FILE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CA_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CA_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_SUBJECT_MATCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_ALTSUBJECT_MATCHES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CLIENT_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE1_PEAPVER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE1_PEAPLABEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_AUTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_AUTHEAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CA_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CA_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CLIENT_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD_RAW ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD_RAW_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PRIVATE_KEY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_PRIVATE_KEY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PIN_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_SYSTEM_CA_CERTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_num_eap_methods ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_eap_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_add_eap_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@eap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_eap_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_eap_method_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@eap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_clear_eap_methods ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_identity ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_anonymous_identity ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_pac_file ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_system_ca_certs ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_ca_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_subject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_num_altsubject_matches ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_add_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@altsubject_match: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_altsubject_match_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@altsubject_match: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_clear_altsubject_matches ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_client_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_client_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_client_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_client_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase1_peapver ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase1_peaplabel ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase1_fast_provisioning ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_auth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_autheap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_ca_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_subject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_num_phase2_altsubject_matches ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_add_phase2_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@phase2_altsubject_match: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_phase2_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_phase2_altsubject_match_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@phase2_altsubject_match: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_clear_phase2_altsubject_matches ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_client_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_client_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_client_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_client_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_password_raw ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_password_raw_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_pin ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_pin_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_private_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_format ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_private_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_format ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-adsl.sgml b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
deleted file mode 100644
index aa9a1661..00000000
--- a/docs/libnm-util/tmpl/nm-setting-adsl.sgml
+++ /dev/null
@@ -1,212 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingAdsl
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingAdslError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_ADSL_ERROR_UNKNOWN: 
-@NM_SETTING_ADSL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_ADSL_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_ADSL_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_adsl_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_VPI ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_VCI ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_PPPOA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_PPPOE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_IPOATM ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION_VCMUX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION_LLC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_adsl_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_protocol ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_encapsulation ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_vpi ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_vci ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
deleted file mode 100644
index 058e98fc..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ /dev/null
@@ -1,112 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBluetooth
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingBluetoothError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_BLUETOOTH_ERROR_UNKNOWN: 
-@NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND: 
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_BDADDR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE_DUN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE_PANU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_get_bdaddr ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_get_connection_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml
deleted file mode 100644
index 2131ced0..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bond.sgml
+++ /dev/null
@@ -1,276 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBond
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_BOND_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingBondError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_BOND_ERROR_UNKNOWN: 
-@NM_SETTING_BOND_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BOND_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_BOND_ERROR_INVALID_OPTION: 
-@NM_SETTING_BOND_ERROR_MISSING_OPTION: 
-
-<!-- ##### MACRO NM_SETTING_BOND_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bond_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_BOND_INTERFACE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_MIIMON ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_DOWNDELAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_UPDELAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_ARP_INTERVAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_ARP_IP_TARGET ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_ARP_VALIDATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_PRIMARY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_PRIMARY_RESELECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_FAIL_OVER_MAC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_USE_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_AD_SELECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_RESEND_IGMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_LACP_RATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bond_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_interface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_num_options ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@out_name: 
-@out_value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_option_by_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_add_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@name: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_remove_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_validate_option ##### -->
-<para>
-
-</para>
-
-@name: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_valid_options ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_option_default ##### -->
-<para>
-
-</para>
-
-@setting: 
-@name: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
deleted file mode 100644
index ebbed6db..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
+++ /dev/null
@@ -1,113 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBridgePort
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingBridgePortError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN: 
-@NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_PATH_COST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_get_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_get_path_cost ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_get_hairpin_mode ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge.sgml b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
deleted file mode 100644
index 1b14c3d8..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bridge.sgml
+++ /dev/null
@@ -1,193 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBridge
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingBridgeError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_BRIDGE_ERROR_UNKNOWN: 
-@NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bridge_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_INTERFACE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_STP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_FORWARD_DELAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_HELLO_TIME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_MAX_AGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_AGEING_TIME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bridge_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_interface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_stp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_forward_delay ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_hello_time ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_max_age ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_ageing_time ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
deleted file mode 100644
index fdcad0de..00000000
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ /dev/null
@@ -1,130 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingCdma
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingCdmaError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_CDMA_ERROR_UNKNOWN: 
-@NM_SETTING_CDMA_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_CDMA_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING: 
-
-<!-- ##### MACRO NM_SETTING_CDMA_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_cdma_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_NUMBER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_cdma_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_number ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
deleted file mode 100644
index 732527f6..00000000
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ /dev/null
@@ -1,451 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingConnectionError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_CONNECTION_ERROR_UNKNOWN: 
-@NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND: 
-@NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED: 
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_connection_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_UUID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_INTERFACE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_AUTOCONNECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_TIMESTAMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_READ_ONLY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_PERMISSIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_MASTER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_SLAVE_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_SECONDARIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingConnection ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingConnection:autoconnect ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:gateway-ping-timeout ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:id ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:interface-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:master ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:permissions ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:read-only ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:secondaries ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:slave-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:timestamp ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:uuid ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:zone ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION nm_setting_connection_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_uuid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_interface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_connection_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_autoconnect ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_timestamp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_read_only ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_num_permissions ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_permission ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@out_ptype: 
-@out_pitem: 
-@out_detail: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_zone ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_permissions_user_allowed ##### -->
-<para>
-
-</para>
-
-@setting: 
-@uname: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_add_permission ##### -->
-<para>
-
-</para>
-
-@setting: 
-@ptype: 
-@pitem: 
-@detail: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_remove_permission ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_remove_permission_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@ptype: 
-@pitem: 
-@detail: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_master ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_is_slave_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_slave_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_num_secondaries ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_secondary ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_add_secondary ##### -->
-<para>
-
-</para>
-
-@setting: 
-@sec_uuid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_remove_secondary ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_remove_secondary_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@sec_uuid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_gateway_ping_timeout ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-dcb.sgml b/docs/libnm-util/tmpl/nm-setting-dcb.sgml
deleted file mode 100644
index f7b8abb1..00000000
--- a/docs/libnm-util/tmpl/nm-setting-dcb.sgml
+++ /dev/null
@@ -1,395 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingDcb
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_DCB_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingDcbError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_DCB_ERROR_UNKNOWN: 
-@NM_SETTING_DCB_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_DCB_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_DCB_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_dcb_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### ENUM NMSettingDcbFlags ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_DCB_FLAG_NONE: 
-@NM_SETTING_DCB_FLAG_ENABLE: 
-@NM_SETTING_DCB_FLAG_ADVERTISE: 
-@NM_SETTING_DCB_FLAG_WILLING: 
-
-<!-- ##### MACRO NM_SETTING_DCB_FCOE_MODE_FABRIC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_FCOE_MODE_VN2VN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FCOE_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FCOE_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FCOE_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_ISCSI_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_ISCSI_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FIP_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FIP_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_FLOW_CONTROL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_GROUP_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_GROUP_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_BANDWIDTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_dcb_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fcoe_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fcoe_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fcoe_mode ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_iscsi_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_iscsi_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fip_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fip_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_flow_control_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_flow_control ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_flow_control ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@enabled: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_group_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_group_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_group_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@group_id: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_group_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@group_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_group_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@group_id: 
-@bandwidth_percent: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@bandwidth_percent: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_strict_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_strict_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@strict: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_traffic_class ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_traffic_class ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@traffic_class: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-generic.sgml b/docs/libnm-util/tmpl/nm-setting-generic.sgml
deleted file mode 100644
index 2c88c208..00000000
--- a/docs/libnm-util/tmpl/nm-setting-generic.sgml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingGeneric
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_GENERIC_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingGenericError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_GENERIC_ERROR_UNKNOWN: 
-@NM_SETTING_GENERIC_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_GENERIC_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_GENERIC_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_generic_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_generic_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
deleted file mode 100644
index 6dc2d3bf..00000000
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ /dev/null
@@ -1,283 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingGsm
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_GSM_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingGsmError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_GSM_ERROR_UNKNOWN: 
-@NM_SETTING_GSM_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING: 
-
-<!-- ##### MACRO NM_SETTING_GSM_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_gsm_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_GSM_NUMBER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_APN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_NETWORK_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PIN_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_HOME_ONLY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_ALLOWED_BANDS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_NETWORK_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingGsmNetworkType ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_GSM_NETWORK_TYPE_ANY: 
-@NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G: 
-@NM_SETTING_GSM_NETWORK_TYPE_4G: 
-
-<!-- ##### ENUM NMSettingGsmNetworkBand ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_GSM_BAND_UNKNOWN: 
-@NM_SETTING_GSM_BAND_ANY: 
-@NM_SETTING_GSM_BAND_EGSM: 
-@NM_SETTING_GSM_BAND_DCS: 
-@NM_SETTING_GSM_BAND_PCS: 
-@NM_SETTING_GSM_BAND_G850: 
-@NM_SETTING_GSM_BAND_U2100: 
-@NM_SETTING_GSM_BAND_U1800: 
-@NM_SETTING_GSM_BAND_U17IV: 
-@NM_SETTING_GSM_BAND_U800: 
-@NM_SETTING_GSM_BAND_U850: 
-@NM_SETTING_GSM_BAND_U900: 
-@NM_SETTING_GSM_BAND_U17IX: 
-@NM_SETTING_GSM_BAND_U1900: 
-@NM_SETTING_GSM_BAND_U2600: 
-
-<!-- ##### MACRO NM_SETTING_GSM_BANDS_MAX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_gsm_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_number ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_apn ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_network_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_pin ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_home_only ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_pin_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_network_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_allowed_bands ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
deleted file mode 100644
index 7a695cdd..00000000
--- a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
+++ /dev/null
@@ -1,145 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingInfiniband
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingInfinibandError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_INFINIBAND_ERROR_UNKNOWN: 
-@NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_TRANSPORT_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_P_KEY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_PARENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_transport_mode ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_p_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_parent ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
deleted file mode 100644
index e035c493..00000000
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ /dev/null
@@ -1,711 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingIP4Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingIP4ConfigError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN: 
-@NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DNS_SEARCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_ADDRESSES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_ROUTE_METRIC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_NEVER_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_MAY_FAIL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_AUTO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_MANUAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_SHARED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_DISABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_ip4_address_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_dup ##### -->
-<para>
-
-</para>
-
-@source: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_ref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_unref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_compare ##### -->
-<para>
-
-</para>
-
-@address: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_get_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_set_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@addr: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_get_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_set_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_get_gateway ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_address_set_gateway ##### -->
-<para>
-
-</para>
-
-@address: 
-@gateway: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_dup ##### -->
-<para>
-
-</para>
-
-@source: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_ref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_unref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_compare ##### -->
-<para>
-
-</para>
-
-@route: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_get_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_set_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@dest: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_get_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_set_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_get_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_set_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@next_hop: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_get_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip4_route_set_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@metric: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_num_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_add_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_dns_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_clear_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_num_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_add_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_dns_search_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_clear_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_num_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_add_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_address_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_clear_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_num_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_add_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_remove_route_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_clear_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_route_metric ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_ignore_auto_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_ignore_auto_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dhcp_client_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dhcp_send_hostname ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dhcp_hostname ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_never_default ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_may_fail ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
deleted file mode 100644
index 1f089c63..00000000
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ /dev/null
@@ -1,712 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingIP6Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingIP6ConfigError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN: 
-@NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_DNS_SEARCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_ADDRESSES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_ROUTE_METRIC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_NEVER_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_MAY_FAIL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_IP6_PRIVACY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_IGNORE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_AUTO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_DHCP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_MANUAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_SHARED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingIP6ConfigPrivacy ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR: 
-
-<!-- ##### FUNCTION nm_ip6_address_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_dup ##### -->
-<para>
-
-</para>
-
-@source: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_ref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_unref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_compare ##### -->
-<para>
-
-</para>
-
-@address: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_get_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_set_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@addr: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_get_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_set_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_get_gateway ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_address_set_gateway ##### -->
-<para>
-
-</para>
-
-@address: 
-@gateway: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_dup ##### -->
-<para>
-
-</para>
-
-@source: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_ref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_unref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_compare ##### -->
-<para>
-
-</para>
-
-@route: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_get_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_set_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@dest: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_get_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_set_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_get_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_set_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@next_hop: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_get_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip6_route_set_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@metric: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_num_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_add_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_dns_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_clear_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_num_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_add_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_dns_search_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_clear_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_num_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_add_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_address_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_clear_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_num_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_add_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_remove_route_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_clear_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_ignore_auto_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_route_metric ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_ignore_auto_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_dhcp_hostname ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_never_default ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_may_fail ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_ip6_privacy ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
deleted file mode 100644
index c3971303..00000000
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ /dev/null
@@ -1,113 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingOlpcMesh
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingOlpcMeshError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_OLPC_MESH_ERROR_UNKNOWN: 
-@NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_SSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_CHANNEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_get_ssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_get_channel ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_get_dhcp_anycast_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
deleted file mode 100644
index ccf4f0d9..00000000
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ /dev/null
@@ -1,354 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingPPP
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_PPP_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingPPPError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_PPP_ERROR_UNKNOWN: 
-@NM_SETTING_PPP_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_PPP_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED: 
-
-<!-- ##### MACRO NM_SETTING_PPP_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ppp_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NOAUTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_EAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_PAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_CHAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_MSCHAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_MSCHAPV2 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NOBSDCOMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NODEFLATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NO_VJ_COMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REQUIRE_MPPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REQUIRE_MPPE_128 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_MPPE_STATEFUL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_CRTSCTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_BAUD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_MRU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_LCP_ECHO_FAILURE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_LCP_ECHO_INTERVAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ppp_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_noauth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_eap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_pap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_chap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_mschap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_mschapv2 ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_nobsdcomp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_nodeflate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_no_vj_comp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_require_mppe ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_require_mppe_128 ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_mppe_stateful ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_crtscts ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_baud ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_mru ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_lcp_echo_failure ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_lcp_echo_interval ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
deleted file mode 100644
index f34ba1d2..00000000
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ /dev/null
@@ -1,130 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingPPPOE
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingPPPOEError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_PPPOE_ERROR_UNKNOWN: 
-@NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING: 
-
-<!-- ##### MACRO NM_SETTING_PPPOE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_SERVICE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_service ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
deleted file mode 100644
index fcd7e170..00000000
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ /dev/null
@@ -1,146 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingSerial
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingSerialError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_SERIAL_ERROR_UNKNOWN: 
-@NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING: 
-
-<!-- ##### MACRO NM_SETTING_SERIAL_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_serial_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_BAUD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_BITS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_PARITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_STOPBITS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_SEND_DELAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_serial_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_baud ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_bits ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_parity ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_stopbits ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_send_delay ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-team-port.sgml b/docs/libnm-util/tmpl/nm-setting-team-port.sgml
deleted file mode 100644
index 37ed15ee..00000000
--- a/docs/libnm-util/tmpl/nm-setting-team-port.sgml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingTeamPort
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_PORT_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingTeamPortError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_TEAM_PORT_ERROR_UNKNOWN: 
-@NM_SETTING_TEAM_PORT_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_TEAM_PORT_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_TEAM_PORT_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_team_port_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_PORT_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_team_port_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_team_port_get_config ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-team.sgml b/docs/libnm-util/tmpl/nm-setting-team.sgml
deleted file mode 100644
index 161fc193..00000000
--- a/docs/libnm-util/tmpl/nm-setting-team.sgml
+++ /dev/null
@@ -1,97 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingTeam
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingTeamError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_TEAM_ERROR_UNKNOWN: 
-@NM_SETTING_TEAM_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_TEAM_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_TEAM_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_team_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_INTERFACE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_team_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_team_get_interface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_team_get_config ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
deleted file mode 100644
index 79053ea5..00000000
--- a/docs/libnm-util/tmpl/nm-setting-vlan.sgml
+++ /dev/null
@@ -1,249 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingVlan
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingVlanError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_VLAN_ERROR_UNKNOWN: 
-@NM_SETTING_VLAN_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_VLAN_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_VLAN_ERROR_INVALID_PARENT: 
-
-<!-- ##### MACRO NM_SETTING_VLAN_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_vlan_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_INTERFACE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_PARENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_INGRESS_PRIORITY_MAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_EGRESS_PRIORITY_MAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMVlanPriorityMap ##### -->
-<para>
-
-</para>
-
-@NM_VLAN_INGRESS_MAP: 
-@NM_VLAN_EGRESS_MAP: 
-
-<!-- ##### ENUM NMVlanFlags ##### -->
-<para>
-
-</para>
-
-@NM_VLAN_FLAG_REORDER_HEADERS: 
-@NM_VLAN_FLAG_GVRP: 
-@NM_VLAN_FLAG_LOOSE_BINDING: 
-
-<!-- ##### FUNCTION nm_setting_vlan_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_interface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_parent ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_num_priorities ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@idx: 
-@out_from: 
-@out_to: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_add_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@from: 
-@to: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_remove_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_remove_priority_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@from: 
-@to: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_remove_priority_str_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@str: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_clear_priorities ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_add_priority_str ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@str: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
deleted file mode 100644
index 3d2b9a3a..00000000
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ /dev/null
@@ -1,235 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingVPN
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_VPN_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingVpnError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_VPN_ERROR_UNKNOWN: 
-@NM_SETTING_VPN_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_VPN_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_VPN_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_vpn_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_VPN_SERVICE_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_USER_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_PERSISTENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_DATA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_SECRETS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### USER_FUNCTION NMVPNIterFunc ##### -->
-<para>
-
-</para>
-
-@key: 
-@value: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_service_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_user_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_persistent ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_num_data_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_add_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@item: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_remove_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_foreach_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_num_secrets ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_add_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@secret: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_remove_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_foreach_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
deleted file mode 100644
index ebfbd61a..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml
+++ /dev/null
@@ -1,97 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWimax
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIMAX_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingWimaxError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_WIMAX_ERROR_UNKNOWN: 
-@NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_WIMAX_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wimax_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_WIMAX_NETWORK_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIMAX_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wimax_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wimax_get_network_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wimax_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
deleted file mode 100644
index fe4f2d32..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ /dev/null
@@ -1,349 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWired
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingWiredError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_WIRED_ERROR_UNKNOWN: 
-@NM_SETTING_WIRED_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRED_ERROR_MISSING_PROPERTY: 
-
-<!-- ##### MACRO NM_SETTING_WIRED_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wired_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_PORT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_SPEED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_DUPLEX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_AUTO_NEGOTIATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_CLONED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_SUBCHANNELS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_NETTYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_OPTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wired_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_port ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_speed ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_duplex ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_auto_negotiate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_cloned_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mac_address_blacklist ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_num_mac_blacklist_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_add_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_remove_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_remove_mac_blacklist_item_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_clear_mac_blacklist_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_subchannels ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_nettype ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_num_s390_options ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@out_key: 
-@out_value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_option_by_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_add_s390_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_remove_s390_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_valid_s390_options ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
deleted file mode 100644
index dea50cd7..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ /dev/null
@@ -1,476 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWirelessSecurity
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingWirelessSecurityError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP: 
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### ENUM NMWepKeyType ##### -->
-<para>
-
-</para>
-
-@NM_WEP_KEY_TYPE_UNKNOWN: 
-@NM_WEP_KEY_TYPE_KEY: 
-@NM_WEP_KEY_TYPE_PASSPHRASE: 
-@NM_WEP_KEY_TYPE_LAST: 
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_KEY_MGMT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_AUTH_ALG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PROTO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PAIRWISE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_GROUP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PSK ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_key_mgmt ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_protos ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_proto ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_add_proto ##### -->
-<para>
-
-</para>
-
-@setting: 
-@proto: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_proto ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_proto_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@proto: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_protos ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_add_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@pairwise: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_pairwise_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@pairwise: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_groups ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_group ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_add_group ##### -->
-<para>
-
-</para>
-
-@setting: 
-@group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_group ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_group_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_groups ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_psk ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_psk_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_set_wep_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@key: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_tx_keyidx ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_auth_alg ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
deleted file mode 100644
index 08c526b1..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ /dev/null
@@ -1,402 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWireless
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingWirelessError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_WIRELESS_ERROR_UNKNOWN: 
-@NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING: 
-@NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND: 
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wireless_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_BAND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_CHANNEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_BSSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_RATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_TX_POWER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SEEN_BSSIDS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_HIDDEN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SEC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MODE_ADHOC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MODE_AP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MODE_INFRA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wireless_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_ssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mode ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_band ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_channel ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_bssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_rate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_tx_power ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_cloned_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mac_address_blacklist ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_num_mac_blacklist_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_add_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_remove_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_remove_mac_blacklist_item_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_clear_mac_blacklist_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_hidden ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_add_seen_bssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@bssid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_num_seen_bssids ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_seen_bssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_ap_security_compatible ##### -->
-<para>
-
-</para>
-
-@s_wireless: 
-@s_wireless_sec: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@ap_mode: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_security ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
deleted file mode 100644
index 61a3bdc2..00000000
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ /dev/null
@@ -1,327 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSetting
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMSettingError ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_ERROR_UNKNOWN: 
-@NM_SETTING_ERROR_PROPERTY_NOT_FOUND: 
-@NM_SETTING_ERROR_PROPERTY_NOT_SECRET: 
-@NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH: 
-
-<!-- ##### MACRO NM_SETTING_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_SERIALIZE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_REQUIRED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_SECRET ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_FUZZY_IGNORE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingSecretFlags ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_SECRET_FLAG_NONE: 
-@NM_SETTING_SECRET_FLAG_AGENT_OWNED: 
-@NM_SETTING_SECRET_FLAG_NOT_SAVED: 
-@NM_SETTING_SECRET_FLAG_NOT_REQUIRED: 
-
-<!-- ##### ENUM NMSettingCompareFlags ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_COMPARE_FLAG_EXACT: 
-@NM_SETTING_COMPARE_FLAG_FUZZY: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_ID: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT: 
-@NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT: 
-
-<!-- ##### STRUCT NMSetting ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSetting:name ##### -->
-<para>
-
-</para>
-
-<!-- ##### USER_FUNCTION NMSettingClearSecretsWithFlagsFn ##### -->
-<para>
-
-</para>
-
-@setting: 
-@secret: 
-@flags: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION NMSettingValueIterFn ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@value: 
-@flags: 
-@user_data: 
-
-
-<!-- ##### ENUM NMSettingHashFlags ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_HASH_FLAG_ALL: 
-@NM_SETTING_HASH_FLAG_NO_SECRETS: 
-@NM_SETTING_HASH_FLAG_ONLY_SECRETS: 
-
-<!-- ##### FUNCTION nm_setting_to_hash ##### -->
-<para>
-
-</para>
-
-@setting: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_new_from_hash ##### -->
-<para>
-
-</para>
-
-@setting_type: 
-@hash: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_duplicate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_get_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_verify ##### -->
-<para>
-
-</para>
-
-@setting: 
-@all_settings: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_compare ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### ENUM NMSettingDiffResult ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_DIFF_RESULT_UNKNOWN: 
-@NM_SETTING_DIFF_RESULT_IN_A: 
-@NM_SETTING_DIFF_RESULT_IN_B: 
-@NM_SETTING_DIFF_RESULT_IN_A_DEFAULT: 
-@NM_SETTING_DIFF_RESULT_IN_B_DEFAULT: 
-
-<!-- ##### FUNCTION nm_setting_diff ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@invert_results: 
-@results: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_enumerate_values ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_to_string ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_clear_secrets ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_clear_secrets_with_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_need_secrets ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_update_secrets ##### -->
-<para>
-
-</para>
-
-@setting: 
-@secrets: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_get_secret_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@secret_name: 
-@out_flags: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_set_secret_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@secret_name: 
-@flags: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_get_virtual_iface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
deleted file mode 100644
index 82025822..00000000
--- a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-utils-enum-types
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
deleted file mode 100644
index 2bb22046..00000000
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ /dev/null
@@ -1,562 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-utils
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION nm_utils_init ##### -->
-<para>
-
-</para>
-
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_deinit ##### -->
-<para>
-
-</para>
-
-@void: 
-
-
-<!-- ##### FUNCTION nm_utils_is_empty_ssid ##### -->
-<para>
-
-</para>
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_escape_ssid ##### -->
-<para>
-
-</para>
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_same_ssid ##### -->
-<para>
-
-</para>
-
-@ssid1: 
-@ssid2: 
-@ignore_trailing_null: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ssid_to_utf8 ##### -->
-<para>
-
-</para>
-
-@ssid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_gvalue_hash_dup ##### -->
-<para>
-
-</para>
-
-@hash: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_slist_free ##### -->
-<para>
-
-</para>
-
-@list: 
-@elem_destroy_fn: 
-
-
-<!-- ##### ENUM NMUtilsSecurityType ##### -->
-<para>
-
-</para>
-
-@NMU_SEC_INVALID: 
-@NMU_SEC_NONE: 
-@NMU_SEC_STATIC_WEP: 
-@NMU_SEC_LEAP: 
-@NMU_SEC_DYNAMIC_WEP: 
-@NMU_SEC_WPA_PSK: 
-@NMU_SEC_WPA_ENTERPRISE: 
-@NMU_SEC_WPA2_PSK: 
-@NMU_SEC_WPA2_ENTERPRISE: 
-
-<!-- ##### FUNCTION nm_utils_security_valid ##### -->
-<para>
-
-</para>
-
-@type: 
-@wifi_caps: 
-@have_ap: 
-@adhoc: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ap_mode_security_valid ##### -->
-<para>
-
-</para>
-
-@type: 
-@wifi_caps: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wep_key_valid ##### -->
-<para>
-
-</para>
-
-@key: 
-@wep_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wpa_psk_valid ##### -->
-<para>
-
-</para>
-
-@psk: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_addresses_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_addresses_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_routes_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_routes_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_netmask_to_prefix ##### -->
-<para>
-
-</para>
-
-@netmask: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_prefix_to_netmask ##### -->
-<para>
-
-</para>
-
-@prefix: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_get_default_prefix ##### -->
-<para>
-
-</para>
-
-@ip: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_addresses_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_addresses_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_routes_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_routes_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_dns_from_gvalue ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_dns_to_gvalue ##### -->
-<para>
-
-</para>
-
-@list: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_utils_uuid_generate ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_uuid_generate_from_string ##### -->
-<para>
-
-</para>
-
-@s: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_rsa_key_encrypt ##### -->
-<para>
-
-</para>
-
-@data: 
-@in_password: 
-@out_password: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_rsa_key_encrypt_aes ##### -->
-<para>
-
-</para>
-
-@data: 
-@in_password: 
-@out_password: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_file_is_pkcs12 ##### -->
-<para>
-
-</para>
-
-@filename: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION NMUtilsFileSearchInPathsPredicate ##### -->
-<para>
-
-</para>
-
-@filename: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_file_search_in_paths ##### -->
-<para>
-
-</para>
-
-@progname: 
-@try_first: 
-@paths: 
-@file_test_flags: 
-@predicate: 
-@user_data: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_freq_to_channel ##### -->
-<para>
-
-</para>
-
-@freq: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_channel_to_freq ##### -->
-<para>
-
-</para>
-
-@channel: 
-@band: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_find_next_channel ##### -->
-<para>
-
-</para>
-
-@channel: 
-@direction: 
-@band: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_is_channel_valid ##### -->
-<para>
-
-</para>
-
-@channel: 
-@band: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_UTILS_HWADDR_LEN_MAX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_len ##### -->
-<para>
-
-</para>
-
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_type ##### -->
-<para>
-
-</para>
-
-@len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_ntoa ##### -->
-<para>
-
-</para>
-
-@addr: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_atoba ##### -->
-<para>
-
-</para>
-
-@asc: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_aton ##### -->
-<para>
-
-</para>
-
-@asc: 
-@type: 
-@buffer: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_ntoa_len ##### -->
-<para>
-
-</para>
-
-@addr: 
-@length: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_aton_len ##### -->
-<para>
-
-</para>
-
-@asc: 
-@buffer: 
-@length: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_valid ##### -->
-<para>
-
-</para>
-
-@asc: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_bin2hexstr ##### -->
-<para>
-
-</para>
-
-@bytes: 
-@len: 
-@final_len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hex2byte ##### -->
-<para>
-
-</para>
-
-@hex: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hexstr2bin ##### -->
-<para>
-
-</para>
-
-@hex: 
-@len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_iface_valid_name ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_is_uuid ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_UTILS_INET_ADDRSTRLEN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_utils_inet4_ntop ##### -->
-<para>
-
-</para>
-
-@inaddr: 
-@dst: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_inet6_ntop ##### -->
-<para>
-
-</para>
-
-@in6addr: 
-@dst: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_check_virtual_device_compatibility ##### -->
-<para>
-
-</para>
-
-@virtual_type: 
-@other_type: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index 6d7de6e6..ee90284c 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.0.2
+1.0.4
diff --git a/docs/libnm/Makefile.in b/docs/libnm/Makefile.in
index 04cec2f1..54ad3287 100644
--- a/docs/libnm/Makefile.in
+++ b/docs/libnm/Makefile.in
@@ -142,6 +142,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -255,6 +256,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -495,6 +497,7 @@ GPATH = $(srcdir)
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
 SETUP_FILES = \
 	$(content_files)		\
+	$(expand_content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
@@ -502,9 +505,9 @@ SETUP_FILES = \
 
 # include common portion ...
 EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in
-DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	tmpl.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -539,11 +542,6 @@ GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
 GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
 
-#### templates ####
-GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V))
-GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_TMPL_0 = @echo "  DOC   Rebuilding template files";
-
 #### xml ####
 GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
 GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
@@ -780,18 +778,15 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
-	            destdir=`dirname $(abs_builddir)/$$file` ;\
+	            destdir=`dirname $(abs_builddir)/$$file`; \
 	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
 	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
-	    test -d $(abs_srcdir)/tmpl && \
-	        { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
-	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
 	$(AM_V_at)touch setup-build.stamp
 
@@ -804,7 +799,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$(?)" = "0"; then \
+	    if test "$$?" = "0"; then \
 	        if test "x$(V)" = "x1"; then \
 	            scanobj_options="--verbose"; \
 	        fi; \
@@ -821,23 +816,8 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	$(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	  if test -w $(abs_srcdir) ; then \
-	    cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
-	  fi \
-	fi
-	$(AM_V_at)touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	-$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
@@ -847,17 +827,17 @@ sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(
 sgml.stamp: sgml-build.stamp
 	@true
 
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkhtml_options="$$mkhtml_options --verbose"; \
 	  fi; \
 	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -873,11 +853,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp
 
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
 	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkpdf_options="$$mkpdf_options --verbose"; \
 	  fi; \
@@ -902,13 +882,15 @@ clean-local:
 	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
 	  rm -f $(DOC_MODULE).types; \
 	fi
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+	  rm -f $(DOC_MODULE)-sections.txt; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
-	    rm -rf tmpl; \
+	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local:
@@ -955,9 +937,7 @@ uninstall-local:
 @HAVE_GTK_DOC_FALSE@	@false
 
 dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
-	@mkdir $(distdir)/tmpl
 	@mkdir $(distdir)/html
-	@-cp ./tmpl/*.sgml $(distdir)/tmpl
 	@cp ./html/* $(distdir)/html
 	@-cp ./$(DOC_MODULE).pdf $(distdir)/
 	@-cp ./$(DOC_MODULE).types $(distdir)/
diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html
index 8391ef44..1daa7c01 100644
--- a/docs/libnm/html/NMAccessPoint.html
+++ b/docs/libnm/html/NMAccessPoint.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMAccessPoint</title>
+<title>NMAccessPoint: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMRemoteConnection.html" title="NMRemoteConnection">
 <link rel="next" href="NMWimaxNsp.html" title="NMWimaxNsp">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -256,8 +256,6 @@
 </div>
 <div class="refsect1">
 <a name="NMAccessPoint.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMAccessPoint.functions_details"></a><h2>Functions</h2>
@@ -284,7 +282,6 @@ nm_access_point_get_flags (<em class="parameter"><code><a class="link" href="NMA
 <div class="refsect3">
 <a name="id-1.5.19.8.2.6"></a><h4>Returns</h4>
 <p> the flags</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -311,7 +308,6 @@ nm_access_point_get_wpa_flags (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.5.19.8.3.6"></a><h4>Returns</h4>
 <p> the WPA flags</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -339,7 +335,6 @@ point.</p>
 <div class="refsect3">
 <a name="id-1.5.19.8.4.6"></a><h4>Returns</h4>
 <p> the RSN flags</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -395,7 +390,6 @@ nm_access_point_get_bssid (<em class="parameter"><code><a class="link" href="NMA
 <a name="id-1.5.19.8.6.6"></a><h4>Returns</h4>
 <p> the BSSID of the access point. This is an internal string and must
 not be modified or freed.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -422,7 +416,6 @@ nm_access_point_get_frequency (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.5.19.8.7.6"></a><h4>Returns</h4>
 <p> the frequency</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -449,7 +442,6 @@ nm_access_point_get_mode (<em class="parameter"><code><a class="link" href="NMAc
 <div class="refsect3">
 <a name="id-1.5.19.8.8.6"></a><h4>Returns</h4>
 <p> the mode</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -476,7 +468,6 @@ nm_access_point_get_max_bitrate (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.5.19.8.9.6"></a><h4>Returns</h4>
 <p> the maximum bit rate (kbit/s)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -503,7 +494,6 @@ nm_access_point_get_strength (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.5.19.8.10.6"></a><h4>Returns</h4>
 <p> the signal strength</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -592,7 +582,6 @@ against</p></td>
 <a name="id-1.5.19.8.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection may be activated with this Wi-Fi AP,
 <code class="literal">FALSE</code> if it cannot be.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -602,80 +591,60 @@ against</p></td>
 <a name="NM-ACCESS-POINT-FLAGS:CAPS"></a><h3>NM_ACCESS_POINT_FLAGS</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_FLAGS       "flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-WPA-FLAGS:CAPS"></a><h3>NM_ACCESS_POINT_WPA_FLAGS</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-RSN-FLAGS:CAPS"></a><h3>NM_ACCESS_POINT_RSN_FLAGS</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-SSID:CAPS"></a><h3>NM_ACCESS_POINT_SSID</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_SSID        "ssid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-BSSID:CAPS"></a><h3>NM_ACCESS_POINT_BSSID</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_BSSID       "bssid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-FREQUENCY:CAPS"></a><h3>NM_ACCESS_POINT_FREQUENCY</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_FREQUENCY   "frequency"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-MODE:CAPS"></a><h3>NM_ACCESS_POINT_MODE</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_MODE        "mode"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-MAX-BITRATE:CAPS"></a><h3>NM_ACCESS_POINT_MAX_BITRATE</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-STRENGTH:CAPS"></a><h3>NM_ACCESS_POINT_STRENGTH</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_STRENGTH    "strength"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACCESS-POINT-HW-ADDRESS:CAPS"></a><h3>NM_ACCESS_POINT_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -683,7 +652,7 @@ against</p></td>
 <div class="refsect2">
 <a name="NMAccessPoint--bssid"></a><h3>The <code class="literal">“bssid”</code> property</h3>
 <pre class="programlisting">  “bssid”                    <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The BSSID of the access point.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -691,14 +660,14 @@ against</p></td>
 <div class="refsect2">
 <a name="NMAccessPoint--flags"></a><h3>The <code class="literal">“flags”</code> property</h3>
 <pre class="programlisting">  “flags”                    <a class="link" href="libnm-nm-dbus-interface.html#NM80211ApFlags" title="enum NM80211ApFlags"><span class="type">NM80211ApFlags</span></a></pre>
-<p></p>
+<p>The flags of the access point.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMAccessPoint--frequency"></a><h3>The <code class="literal">“frequency”</code> property</h3>
 <pre class="programlisting">  “frequency”                <span class="type">guint</span></pre>
-<p></p>
+<p>The frequency of the access point.</p>
 <p>Flags: Read</p>
 <p>Allowed values: &lt;= 10000</p>
 <p>Default value: 0</p>
@@ -707,7 +676,7 @@ against</p></td>
 <div class="refsect2">
 <a name="NMAccessPoint--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Alias for <a class="link" href="NMAccessPoint.html#NMAccessPoint--bssid" title="The “bssid” property"><span class="type">“bssid”</span></a>.</p>
 <div class="warning">
 <p><code class="literal">NMAccessPoint:hw-address</code> has been deprecated since version 1.0 and should not be used in newly-written code.</p>
 <p>use <a class="link" href="NMAccessPoint.html#NMAccessPoint--bssid" title="The “bssid” property"><span class="type">“bssid”</span></a>.</p>
@@ -719,7 +688,7 @@ against</p></td>
 <div class="refsect2">
 <a name="NMAccessPoint--max-bitrate"></a><h3>The <code class="literal">“max-bitrate”</code> property</h3>
 <pre class="programlisting">  “max-bitrate”              <span class="type">guint</span></pre>
-<p></p>
+<p>The maximum bit rate of the access point in kbit/s.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -727,7 +696,9 @@ against</p></td>
 <div class="refsect2">
 <a name="NMAccessPoint--mode"></a><h3>The <code class="literal">“mode”</code> property</h3>
 <pre class="programlisting">  “mode”                     <a class="link" href="libnm-nm-dbus-interface.html#NM80211Mode" title="enum NM80211Mode"><span class="type">NM80211Mode</span></a></pre>
-<p></p>
+<p>The mode of the access point; either "infrastructure" (a central
+coordinator of the wireless network allowing clients to connect) or
+"ad-hoc" (a network with no central controller).</p>
 <p>Flags: Read</p>
 <p>Default value: NM_802_11_MODE_INFRA</p>
 </div>
@@ -735,21 +706,21 @@ against</p></td>
 <div class="refsect2">
 <a name="NMAccessPoint--rsn-flags"></a><h3>The <code class="literal">“rsn-flags”</code> property</h3>
 <pre class="programlisting">  “rsn-flags”                <a class="link" href="libnm-nm-dbus-interface.html#NM80211ApSecurityFlags" title="enum NM80211ApSecurityFlags"><span class="type">NM80211ApSecurityFlags</span></a></pre>
-<p></p>
+<p>The RSN flags of the access point.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMAccessPoint--ssid"></a><h3>The <code class="literal">“ssid”</code> property</h3>
 <pre class="programlisting">  “ssid”                     <span class="type">GBytes</span> *</pre>
-<p></p>
+<p>The SSID of the access point, or <code class="literal">NULL</code> if it is not known.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMAccessPoint--strength"></a><h3>The <code class="literal">“strength”</code> property</h3>
 <pre class="programlisting">  “strength”                 <span class="type">guchar</span></pre>
-<p></p>
+<p>The current signal strength of the access point.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -757,13 +728,12 @@ against</p></td>
 <div class="refsect2">
 <a name="NMAccessPoint--wpa-flags"></a><h3>The <code class="literal">“wpa-flags”</code> property</h3>
 <pre class="programlisting">  “wpa-flags”                <a class="link" href="libnm-nm-dbus-interface.html#NM80211ApSecurityFlags" title="enum NM80211ApSecurityFlags"><span class="type">NM80211ApSecurityFlags</span></a></pre>
-<p></p>
+<p>The WPA flags of the access point.</p>
 <p>Flags: Read</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index bbe1a3fe..a059c180 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMActiveConnection</title>
+<title>NMActiveConnection: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceWimax.html" title="NMDeviceWimax">
 <link rel="next" href="NMVpnConnection.html" title="NMVpnConnection">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -338,8 +338,6 @@
 </div>
 <div class="refsect1">
 <a name="NMActiveConnection.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMActiveConnection.functions_details"></a><h2>Functions</h2>
@@ -396,7 +394,6 @@ nm_active_connection_get_id (<em class="parameter"><code><a class="link" href="N
 <a name="id-1.5.16.8.3.6"></a><h4>Returns</h4>
 <p> the ID of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -424,7 +421,6 @@ nm_active_connection_get_uuid (<em class="parameter"><code><a class="link" href=
 <a name="id-1.5.16.8.4.6"></a><h4>Returns</h4>
 <p> the UUID of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -453,7 +449,6 @@ nm_active_connection_get_connection_type
 <a name="id-1.5.16.8.5.6"></a><h4>Returns</h4>
 <p> the type of the <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -488,7 +483,6 @@ resolve it with <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-acces
 <a name="id-1.5.16.8.6.7"></a><h4>Returns</h4>
 <p> the specific object's D-Bus path. This is the internal string used
 by the connection, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -543,7 +537,6 @@ nm_active_connection_get_state (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.5.16.8.8.6"></a><h4>Returns</h4>
 <p> the state</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -598,7 +591,6 @@ the default IPv4 route and DNS information).</p>
 <div class="refsect3">
 <a name="id-1.5.16.8.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the active connection is the default IPv4 connection</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -684,7 +676,6 @@ the default IPv6 route and DNS information).</p>
 <div class="refsect3">
 <a name="id-1.5.16.8.13.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the active connection is the default IPv6 connection</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -769,7 +760,6 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.5.16.8.16.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the active connection is a VPN connection</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -779,120 +769,90 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <a name="NM-ACTIVE-CONNECTION-CONNECTION:CAPS"></a><h3>NM_ACTIVE_CONNECTION_CONNECTION</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_CONNECTION           "connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-ID:CAPS"></a><h3>NM_ACTIVE_CONNECTION_ID</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_ID                   "id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-UUID:CAPS"></a><h3>NM_ACTIVE_CONNECTION_UUID</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_UUID                 "uuid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-TYPE:CAPS"></a><h3>NM_ACTIVE_CONNECTION_TYPE</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_TYPE                 "type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-SPECIFIC-OBJECT-PATH:CAPS"></a><h3>NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT_PATH</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT_PATH "specific-object-path"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-DEVICES:CAPS"></a><h3>NM_ACTIVE_CONNECTION_DEVICES</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_DEVICES              "devices"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-STATE:CAPS"></a><h3>NM_ACTIVE_CONNECTION_STATE</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_STATE                "state"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-DEFAULT:CAPS"></a><h3>NM_ACTIVE_CONNECTION_DEFAULT</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_DEFAULT              "default"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-IP4-CONFIG:CAPS"></a><h3>NM_ACTIVE_CONNECTION_IP4_CONFIG</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_IP4_CONFIG           "ip4-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-DHCP4-CONFIG:CAPS"></a><h3>NM_ACTIVE_CONNECTION_DHCP4_CONFIG</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_DHCP4_CONFIG         "dhcp4-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-DEFAULT6:CAPS"></a><h3>NM_ACTIVE_CONNECTION_DEFAULT6</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_DEFAULT6             "default6"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-IP6-CONFIG:CAPS"></a><h3>NM_ACTIVE_CONNECTION_IP6_CONFIG</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_IP6_CONFIG           "ip6-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-DHCP6-CONFIG:CAPS"></a><h3>NM_ACTIVE_CONNECTION_DHCP6_CONFIG</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_DHCP6_CONFIG         "dhcp6-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-VPN:CAPS"></a><h3>NM_ACTIVE_CONNECTION_VPN</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_VPN                  "vpn"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-ACTIVE-CONNECTION-MASTER:CAPS"></a><h3>NM_ACTIVE_CONNECTION_MASTER</h3>
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_MASTER               "master"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -900,14 +860,14 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--connection"></a><h3>The <code class="literal">“connection”</code> property</h3>
 <pre class="programlisting">  “connection”               <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *</pre>
-<p></p>
+<p>The connection that this is an active instance of.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--default"></a><h3>The <code class="literal">“default”</code> property</h3>
 <pre class="programlisting">  “default”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the active connection is the default IPv4 one.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -915,7 +875,7 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--default6"></a><h3>The <code class="literal">“default6”</code> property</h3>
 <pre class="programlisting">  “default6”                 <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the active connection is the default IPv6 one.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -923,28 +883,29 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--devices"></a><h3>The <code class="literal">“devices”</code> property</h3>
 <pre class="programlisting">  “devices”                  <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<p>The devices of the active connection.</p>
+<p>Element-type: NMDevice</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--dhcp4-config"></a><h3>The <code class="literal">“dhcp4-config”</code> property</h3>
 <pre class="programlisting">  “dhcp4-config”             <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a> *</pre>
-<p></p>
+<p>The IPv4 <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a> of the connection.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--dhcp6-config"></a><h3>The <code class="literal">“dhcp6-config”</code> property</h3>
 <pre class="programlisting">  “dhcp6-config”             <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a> *</pre>
-<p></p>
+<p>The IPv6 <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a> of the connection.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--id"></a><h3>The <code class="literal">“id”</code> property</h3>
 <pre class="programlisting">  “id”                       <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The active connection's ID</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -952,28 +913,29 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--ip4-config"></a><h3>The <code class="literal">“ip4-config”</code> property</h3>
 <pre class="programlisting">  “ip4-config”               <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> *</pre>
-<p></p>
+<p>The IPv4 <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> of the connection.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--ip6-config"></a><h3>The <code class="literal">“ip6-config”</code> property</h3>
 <pre class="programlisting">  “ip6-config”               <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> *</pre>
-<p></p>
+<p>The IPv6 <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> of the connection.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--master"></a><h3>The <code class="literal">“master”</code> property</h3>
 <pre class="programlisting">  “master”                   <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *</pre>
-<p></p>
+<p>The master device if one exists.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMActiveConnection--specific-object-path"></a><h3>The <code class="literal">“specific-object-path”</code> property</h3>
 <pre class="programlisting">  “specific-object-path”     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The path to the "specific object" of the active connection; see
+<a class="link" href="NMActiveConnection.html#nm-active-connection-get-specific-object-path" title="nm_active_connection_get_specific_object_path ()"><code class="function">nm_active_connection_get_specific_object_path()</code></a> for more details.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -981,7 +943,7 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--state"></a><h3>The <code class="literal">“state”</code> property</h3>
 <pre class="programlisting">  “state”                    <a class="link" href="libnm-nm-dbus-interface.html#NMActiveConnectionState" title="enum NMActiveConnectionState"><span class="type">NMActiveConnectionState</span></a></pre>
-<p></p>
+<p>The state of the active connection.</p>
 <p>Flags: Read</p>
 <p>Default value: NM_ACTIVE_CONNECTION_STATE_UNKNOWN</p>
 </div>
@@ -989,7 +951,7 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--type"></a><h3>The <code class="literal">“type”</code> property</h3>
 <pre class="programlisting">  “type”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The active connection's type</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -997,7 +959,7 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--uuid"></a><h3>The <code class="literal">“uuid”</code> property</h3>
 <pre class="programlisting">  “uuid”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The active connection's UUID</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -1005,14 +967,13 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--vpn"></a><h3>The <code class="literal">“vpn”</code> property</h3>
 <pre class="programlisting">  “vpn”                      <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the active connection is a VPN connection.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html
index b038c231..950d7251 100644
--- a/docs/libnm/html/NMClient.html
+++ b/docs/libnm/html/NMClient.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMClient</title>
+<title>NMClient: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch02.html" title="Client Object API Reference">
 <link rel="prev" href="ch02.html" title="Client Object API Reference">
 <link rel="next" href="NMSecretAgentOld.html" title="NMSecretAgentOld">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -759,8 +759,6 @@
 </div>
 <div class="refsect1">
 <a name="NMClient.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMClient.functions_details"></a><h2>Functions</h2>
@@ -772,7 +770,6 @@ nm_client_error_quark (<em class="parameter"><code><span class="type">void</span
 <div class="refsect3">
 <a name="id-1.3.2.9.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> errors.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -810,7 +807,6 @@ that.</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.3.7"></a><h4>Returns</h4>
 <p> a new <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> or NULL on an error</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -886,7 +882,6 @@ nm_client_new_finish (<em class="parameter"><code><span class="type">GAsyncResul
 <div class="refsect3">
 <a name="id-1.3.2.9.5.6"></a><h4>Returns</h4>
 <p> a new <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>, or <code class="literal">NULL</code> on error</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -913,7 +908,6 @@ nm_client_get_version (<em class="parameter"><code><a class="link" href="NMClien
 <div class="refsect3">
 <a name="id-1.3.2.9.6.6"></a><h4>Returns</h4>
 <p> string with the version (or <code class="literal">NULL</code> if NetworkManager is not running)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -940,7 +934,6 @@ nm_client_get_state (<em class="parameter"><code><a class="link" href="NMClient.
 <div class="refsect3">
 <a name="id-1.3.2.9.7.6"></a><h4>Returns</h4>
 <p> the current <a class="link" href="libnm-nm-dbus-interface.html#NMState" title="enum NMState"><code class="literal">NMState</code></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -968,7 +961,6 @@ connections at startup.</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.8.6"></a><h4>Returns</h4>
 <p> whether the daemon is still starting up</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -995,7 +987,6 @@ nm_client_get_nm_running (<em class="parameter"><code><a class="link" href="NMCl
 <div class="refsect3">
 <a name="id-1.3.2.9.9.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the daemon is running</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1022,7 +1013,6 @@ nm_client_networking_get_enabled (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.3.2.9.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if networking is enabled, <code class="literal">FALSE</code> if networking is disabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1065,7 +1055,6 @@ all controlled interfaces are available for activation.</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.11.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1092,7 +1081,6 @@ nm_client_wireless_get_enabled (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.3.2.9.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if wireless is enabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1150,7 +1138,6 @@ nm_client_wireless_hardware_get_enabled
 <div class="refsect3">
 <a name="id-1.3.2.9.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the wireless hardware is enabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1177,7 +1164,6 @@ nm_client_wwan_get_enabled (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.3.2.9.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if WWAN is enabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1234,7 +1220,6 @@ nm_client_wwan_hardware_get_enabled (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.3.2.9.17.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the WWAN hardware is enabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1261,7 +1246,6 @@ nm_client_wimax_get_enabled (<em class="parameter"><code><a class="link" href="N
 <div class="refsect3">
 <a name="id-1.3.2.9.18.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if WiMAX is enabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1318,7 +1302,6 @@ nm_client_wimax_hardware_get_enabled (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.3.2.9.20.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the WiMAX hardware is enabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1366,7 +1349,6 @@ a list of domains separated by ",". </p></td>
 <div class="refsect3">
 <a name="id-1.3.2.9.21.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1414,7 +1396,6 @@ domains separated by ",". (<code class="literal">NULL</code> or an empty string
 <div class="refsect3">
 <a name="id-1.3.2.9.22.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1450,7 +1431,6 @@ client can or cannot perform the action the permission represents</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.23.6"></a><h4>Returns</h4>
 <p> the permission's result, one of <a class="link" href="NMClient.html#NMClientPermissionResult" title="enum NMClientPermissionResult"><span class="type">NMClientPermissionResult</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1480,7 +1460,6 @@ connectivity state first before returning any information.</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.24.6"></a><h4>Returns</h4>
 <p> the current connectivity state</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1525,7 +1504,6 @@ if you do not want to block.</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.25.7"></a><h4>Returns</h4>
 <p> the (new) current connectivity state</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1614,7 +1592,6 @@ call.</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.27.6"></a><h4>Returns</h4>
 <p> the (new) current connectivity state</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1663,7 +1640,6 @@ clear any existing persistent hostname. </p></td>
 <div class="refsect3">
 <a name="id-1.3.2.9.28.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the request was successful, <code class="literal">FALSE</code> if it failed</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1755,7 +1731,6 @@ nm_client_save_hostname_finish (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.3.2.9.30.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the request was successful, <code class="literal">FALSE</code> if it failed</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2256,7 +2231,6 @@ nm_client_deactivate_connection (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.3.2.9.41.6"></a><h4>Returns</h4>
 <p> success or failure</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2347,7 +2321,6 @@ nm_client_deactivate_connection_finish
 <div class="refsect3">
 <a name="id-1.3.2.9.43.6"></a><h4>Returns</h4>
 <p> success or failure</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2668,7 +2641,6 @@ filenames that failed to load. </p></td>
 <p> <code class="literal">TRUE</code> if NetworkManager at least tried to load <em class="parameter"><code>filenames</code></em>
 ,
 <code class="literal">FALSE</code> if an error occurred (eg, permission denied).</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2770,7 +2742,6 @@ filenames that failed to load. </p></td>
 <p> <code class="literal">TRUE</code> if NetworkManager at least tried to load <em class="parameter"><code>filenames</code></em>
 ,
 <code class="literal">FALSE</code> if an error occurred (eg, permission denied).</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2813,7 +2784,6 @@ the in-memory state matches the on-disk state.</p>
 <div class="refsect3">
 <a name="id-1.3.2.9.53.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on failure</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2899,7 +2869,6 @@ nm_client_reload_connections_finish (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.3.2.9.55.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on failure</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -2909,192 +2878,144 @@ nm_client_reload_connections_finish (<em class="parameter"><code><a class="link"
 <a name="NM-CLIENT-VERSION:CAPS"></a><h3>NM_CLIENT_VERSION</h3>
 <pre class="programlisting">#define NM_CLIENT_VERSION "version"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-STATE:CAPS"></a><h3>NM_CLIENT_STATE</h3>
 <pre class="programlisting">#define NM_CLIENT_STATE "state"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-STARTUP:CAPS"></a><h3>NM_CLIENT_STARTUP</h3>
 <pre class="programlisting">#define NM_CLIENT_STARTUP "startup"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-NM-RUNNING:CAPS"></a><h3>NM_CLIENT_NM_RUNNING</h3>
 <pre class="programlisting">#define NM_CLIENT_NM_RUNNING "nm-running"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-NETWORKING-ENABLED:CAPS"></a><h3>NM_CLIENT_NETWORKING_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-WIRELESS-ENABLED:CAPS"></a><h3>NM_CLIENT_WIRELESS_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-WIRELESS-HARDWARE-ENABLED:CAPS"></a><h3>NM_CLIENT_WIRELESS_HARDWARE_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WIRELESS_HARDWARE_ENABLED "wireless-hardware-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-WWAN-ENABLED:CAPS"></a><h3>NM_CLIENT_WWAN_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-WWAN-HARDWARE-ENABLED:CAPS"></a><h3>NM_CLIENT_WWAN_HARDWARE_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WWAN_HARDWARE_ENABLED "wwan-hardware-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-WIMAX-ENABLED:CAPS"></a><h3>NM_CLIENT_WIMAX_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-WIMAX-HARDWARE-ENABLED:CAPS"></a><h3>NM_CLIENT_WIMAX_HARDWARE_ENABLED</h3>
 <pre class="programlisting">#define NM_CLIENT_WIMAX_HARDWARE_ENABLED "wimax-hardware-enabled"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-ACTIVE-CONNECTIONS:CAPS"></a><h3>NM_CLIENT_ACTIVE_CONNECTIONS</h3>
 <pre class="programlisting">#define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-CONNECTIVITY:CAPS"></a><h3>NM_CLIENT_CONNECTIVITY</h3>
 <pre class="programlisting">#define NM_CLIENT_CONNECTIVITY "connectivity"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-PRIMARY-CONNECTION:CAPS"></a><h3>NM_CLIENT_PRIMARY_CONNECTION</h3>
 <pre class="programlisting">#define NM_CLIENT_PRIMARY_CONNECTION "primary-connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-ACTIVATING-CONNECTION:CAPS"></a><h3>NM_CLIENT_ACTIVATING_CONNECTION</h3>
 <pre class="programlisting">#define NM_CLIENT_ACTIVATING_CONNECTION "activating-connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-DEVICES:CAPS"></a><h3>NM_CLIENT_DEVICES</h3>
 <pre class="programlisting">#define NM_CLIENT_DEVICES "devices"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-CONNECTIONS:CAPS"></a><h3>NM_CLIENT_CONNECTIONS</h3>
 <pre class="programlisting">#define NM_CLIENT_CONNECTIONS "connections"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-HOSTNAME:CAPS"></a><h3>NM_CLIENT_HOSTNAME</h3>
 <pre class="programlisting">#define NM_CLIENT_HOSTNAME "hostname"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-CAN-MODIFY:CAPS"></a><h3>NM_CLIENT_CAN_MODIFY</h3>
 <pre class="programlisting">#define NM_CLIENT_CAN_MODIFY "can-modify"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-DEVICE-ADDED:CAPS"></a><h3>NM_CLIENT_DEVICE_ADDED</h3>
 <pre class="programlisting">#define NM_CLIENT_DEVICE_ADDED "device-added"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-DEVICE-REMOVED:CAPS"></a><h3>NM_CLIENT_DEVICE_REMOVED</h3>
 <pre class="programlisting">#define NM_CLIENT_DEVICE_REMOVED "device-removed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-PERMISSION-CHANGED:CAPS"></a><h3>NM_CLIENT_PERMISSION_CHANGED</h3>
 <pre class="programlisting">#define NM_CLIENT_PERMISSION_CHANGED "permission-changed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-CONNECTION-ADDED:CAPS"></a><h3>NM_CLIENT_CONNECTION_ADDED</h3>
 <pre class="programlisting">#define NM_CLIENT_CONNECTION_ADDED "connection-added"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CLIENT-CONNECTION-REMOVED:CAPS"></a><h3>NM_CLIENT_CONNECTION_REMOVED</h3>
 <pre class="programlisting">#define NM_CLIENT_CONNECTION_REMOVED "connection-removed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -3313,8 +3234,6 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <a name="NM-CLIENT-ERROR:CAPS"></a><h3>NM_CLIENT_ERROR</h3>
 <pre class="programlisting">#define NM_CLIENT_ERROR nm_client_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -3322,21 +3241,23 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--activating-connection"></a><h3>The <code class="literal">“activating-connection”</code> property</h3>
 <pre class="programlisting">  “activating-connection”    <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> of the activating connection that is
+likely to become the new <a class="link" href="NMClient.html#NMClient--primary-connection" title="The “primary-connection” property"><span class="type">“primary-connection”</span></a>.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMClient--active-connections"></a><h3>The <code class="literal">“active-connections”</code> property</h3>
 <pre class="programlisting">  “active-connections”       <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<p>The active connections.</p>
+<p>Element-type: NMActiveConnection</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMClient--can-modify"></a><h3>The <code class="literal">“can-modify”</code> property</h3>
 <pre class="programlisting">  “can-modify”               <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, adding and modifying connections is supported.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -3344,14 +3265,18 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--connections"></a><h3>The <code class="literal">“connections”</code> property</h3>
 <pre class="programlisting">  “connections”              <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<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>Element-type: NMRemoteConnection</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMClient--connectivity"></a><h3>The <code class="literal">“connectivity”</code> property</h3>
 <pre class="programlisting">  “connectivity”             <a class="link" href="libnm-nm-dbus-interface.html#NMConnectivityState" title="enum NMConnectivityState"><span class="type">NMConnectivityState</span></a></pre>
-<p></p>
+<p>The network connectivity state.</p>
 <p>Flags: Read</p>
 <p>Default value: NM_CONNECTIVITY_UNKNOWN</p>
 </div>
@@ -3359,14 +3284,16 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--devices"></a><h3>The <code class="literal">“devices”</code> property</h3>
 <pre class="programlisting">  “devices”                  <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<p>List of known network devices.</p>
+<p>Element-type: NMDevice</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMClient--hostname"></a><h3>The <code class="literal">“hostname”</code> property</h3>
 <pre class="programlisting">  “hostname”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The machine hostname stored in persistent configuration. This can be
+modified by calling <a class="link" href="NMClient.html#nm-client-save-hostname" title="nm_client_save_hostname ()"><code class="function">nm_client_save_hostname()</code></a>.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -3374,7 +3301,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--networking-enabled"></a><h3>The <code class="literal">“networking-enabled”</code> property</h3>
 <pre class="programlisting">  “networking-enabled”       <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether networking is enabled.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: TRUE</p>
 </div>
@@ -3382,7 +3309,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--nm-running"></a><h3>The <code class="literal">“nm-running”</code> property</h3>
 <pre class="programlisting">  “nm-running”               <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the daemon is running.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -3390,14 +3317,15 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--primary-connection"></a><h3>The <code class="literal">“primary-connection”</code> property</h3>
 <pre class="programlisting">  “primary-connection”       <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> of the device with the default route;
+see <a class="link" href="NMClient.html#nm-client-get-primary-connection" title="nm_client_get_primary_connection ()"><code class="function">nm_client_get_primary_connection()</code></a> for more details.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMClient--startup"></a><h3>The <code class="literal">“startup”</code> property</h3>
 <pre class="programlisting">  “startup”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the daemon is still starting up.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -3405,7 +3333,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--state"></a><h3>The <code class="literal">“state”</code> property</h3>
 <pre class="programlisting">  “state”                    <a class="link" href="libnm-nm-dbus-interface.html#NMState" title="enum NMState"><span class="type">NMState</span></a></pre>
-<p></p>
+<p>The current daemon state.</p>
 <p>Flags: Read</p>
 <p>Default value: NM_STATE_UNKNOWN</p>
 </div>
@@ -3413,7 +3341,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--version"></a><h3>The <code class="literal">“version”</code> property</h3>
 <pre class="programlisting">  “version”                  <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The NetworkManager version.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -3421,7 +3349,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--wimax-enabled"></a><h3>The <code class="literal">“wimax-enabled”</code> property</h3>
 <pre class="programlisting">  “wimax-enabled”            <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether WiMAX functionality is enabled.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
 </div>
@@ -3429,7 +3357,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--wimax-hardware-enabled"></a><h3>The <code class="literal">“wimax-hardware-enabled”</code> property</h3>
 <pre class="programlisting">  “wimax-hardware-enabled”   <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the WiMAX hardware is enabled.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -3437,7 +3365,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--wireless-enabled"></a><h3>The <code class="literal">“wireless-enabled”</code> property</h3>
 <pre class="programlisting">  “wireless-enabled”         <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether wireless is enabled.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
 </div>
@@ -3445,7 +3373,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--wireless-hardware-enabled"></a><h3>The <code class="literal">“wireless-hardware-enabled”</code> property</h3>
 <pre class="programlisting">  “wireless-hardware-enabled” <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the wireless hardware is enabled.</p>
 <p>Flags: Read</p>
 <p>Default value: TRUE</p>
 </div>
@@ -3453,7 +3381,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--wwan-enabled"></a><h3>The <code class="literal">“wwan-enabled”</code> property</h3>
 <pre class="programlisting">  “wwan-enabled”             <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether WWAN functionality is enabled.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
 </div>
@@ -3461,7 +3389,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <div class="refsect2">
 <a name="NMClient--wwan-hardware-enabled"></a><h3>The <code class="literal">“wwan-hardware-enabled”</code> property</h3>
 <pre class="programlisting">  “wwan-hardware-enabled”    <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the WWAN hardware is enabled.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -3474,6 +3402,34 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 user_function (<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>           *client,
                <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection,
                <span class="type">gpointer</span>            user_data)</pre>
+<p>Notifies that a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> has been added.</p>
+<div class="refsect3">
+<a name="id-1.3.2.12.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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 settings object that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>connection</p></td>
+<td class="parameter_description"><p>the new connection</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 <hr>
@@ -3483,6 +3439,34 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
 user_function (<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>           *client,
                <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection,
                <span class="type">gpointer</span>            user_data)</pre>
+<p>Notifies that a <a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> has been removed.</p>
+<div class="refsect3">
+<a name="id-1.3.2.12.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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 settings object that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>connection</p></td>
+<td class="parameter_description"><p>the removed connection</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 <hr>
@@ -3492,6 +3476,34 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
 user_function (<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client,
                <span class="type">GObject</span>  *device,
                <span class="type">gpointer</span>  user_data)</pre>
+<p>Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> is added.</p>
+<div class="refsect3">
+<a name="id-1.3.2.12.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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 client that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>device</p></td>
+<td class="parameter_description"><p> the new device. </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> NMDevice]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 <hr>
@@ -3501,6 +3513,34 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
 user_function (<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client,
                <span class="type">GObject</span>  *device,
                <span class="type">gpointer</span>  user_data)</pre>
+<p>Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> is removed.</p>
+<div class="refsect3">
+<a name="id-1.3.2.12.5.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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 client that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>device</p></td>
+<td class="parameter_description"><p> the removed device. </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> NMDevice]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 <hr>
@@ -3511,12 +3551,44 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
                <span class="type">guint</span>     permission,
                <span class="type">guint</span>     result,
                <span class="type">gpointer</span>  user_data)</pre>
+<p>Notifies that a permission has changed</p>
+<div class="refsect3">
+<a name="id-1.3.2.12.6.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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 client that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>permission</p></td>
+<td class="parameter_description"><p>a permission from <a class="link" href="NMClient.html#NMClientPermission" title="enum NMClientPermission"><span class="type">NMClientPermission</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 permission's result, one of <a class="link" href="NMClient.html#NMClientPermissionResult" title="enum NMClientPermissionResult"><span class="type">NMClientPermissionResult</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index 13cae2db..8065247c 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDevice</title>
+<title>NMDevice: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="next" href="NMDeviceAdsl.html" title="NMDeviceAdsl">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -626,8 +626,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDevice.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDevice.functions_details"></a><h2>Functions</h2>
@@ -655,7 +653,6 @@ nm_device_get_iface (<em class="parameter"><code><a class="link" href="NMDevice.
 <a name="id-1.5.2.9.2.6"></a><h4>Returns</h4>
 <p> the interface of the device. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -684,7 +681,6 @@ when the device is in the ACTIVATED state.</p>
 <a name="id-1.5.2.9.3.6"></a><h4>Returns</h4>
 <p> the IP traffic interface of the device. This is the internal string
 used by the device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -711,7 +707,6 @@ nm_device_get_device_type (<em class="parameter"><code><a class="link" href="NMD
 <div class="refsect3">
 <a name="id-1.5.2.9.4.6"></a><h4>Returns</h4>
 <p> the device type</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -740,7 +735,6 @@ nm_device_get_udi (<em class="parameter"><code><a class="link" href="NMDevice.ht
 <p> the Unique Device Identifier of the device.  This identifier may be
 used to gather more information about the device from various operating
 system services like udev or sysfs.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -768,7 +762,6 @@ nm_device_get_driver (<em class="parameter"><code><a class="link" href="NMDevice
 <a name="id-1.5.2.9.6.6"></a><h4>Returns</h4>
 <p> the driver of the device. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -796,7 +789,6 @@ nm_device_get_driver_version (<em class="parameter"><code><a class="link" href="
 <a name="id-1.5.2.9.7.6"></a><h4>Returns</h4>
 <p> the version of the device driver. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -824,7 +816,6 @@ nm_device_get_firmware_version (<em class="parameter"><code><a class="link" href
 <a name="id-1.5.2.9.8.6"></a><h4>Returns</h4>
 <p> the firmware version of the device. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -854,7 +845,6 @@ nm_device_get_type_description (<em class="parameter"><code><a class="link" href
 <a name="id-1.5.2.9.9.6"></a><h4>Returns</h4>
 <p> the type description of the device. This is the internal
 string used by the device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -883,7 +873,6 @@ nm_device_get_hw_address (<em class="parameter"><code><a class="link" href="NMDe
 <a name="id-1.5.2.9.10.6"></a><h4>Returns</h4>
 <p> the current MAC of the device, or <code class="literal">NULL</code>.
 This is the internal string used by the device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -910,7 +899,6 @@ nm_device_get_capabilities (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.5.2.9.11.6"></a><h4>Returns</h4>
 <p> the capabilities</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -937,7 +925,6 @@ nm_device_get_managed (<em class="parameter"><code><a class="link" href="NMDevic
 <div class="refsect3">
 <a name="id-1.5.2.9.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device is managed by NetworkManager</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -964,7 +951,6 @@ nm_device_get_autoconnect (<em class="parameter"><code><a class="link" href="NMD
 <div class="refsect3">
 <a name="id-1.5.2.9.13.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device is allowed to be autoconnected</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1023,7 +1009,6 @@ to be missing.</p>
 <a name="id-1.5.2.9.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if firmware required for the device's operation is likely
 to be missing.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1169,7 +1154,6 @@ nm_device_get_state (<em class="parameter"><code><a class="link" href="NMDevice.
 <div class="refsect3">
 <a name="id-1.5.2.9.20.6"></a><h4>Returns</h4>
 <p> the current device state</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1196,7 +1180,6 @@ nm_device_get_state_reason (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.5.2.9.21.6"></a><h4>Returns</h4>
 <p> the reason for entering the current device state</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1287,7 +1270,6 @@ ports on a single physical port. (Eg, NPAR / SR-IOV.)</p>
 <p> the physical port ID of the device, or <code class="literal">NULL</code> if the port
 ID is unknown. This is the internal string used by the device and
 must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1314,7 +1296,6 @@ nm_device_get_mtu (<em class="parameter"><code><a class="link" href="NMDevice.ht
 <div class="refsect3">
 <a name="id-1.5.2.9.25.6"></a><h4>Returns</h4>
 <p> the MTU of the device.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1342,7 +1323,6 @@ nm_device_is_software (<em class="parameter"><code><a class="link" href="NMDevic
 <a name="id-1.5.2.9.26.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>device</code></em>
 is a software device, <code class="literal">FALSE</code> if it is a hardware device.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1370,7 +1350,6 @@ nm_device_get_product (<em class="parameter"><code><a class="link" href="NMDevic
 <a name="id-1.5.2.9.27.6"></a><h4>Returns</h4>
 <p> the product name of the device. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1398,7 +1377,6 @@ nm_device_get_vendor (<em class="parameter"><code><a class="link" href="NMDevice
 <a name="id-1.5.2.9.28.6"></a><h4>Returns</h4>
 <p> the vendor name of the device. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1428,7 +1406,6 @@ nm_device_get_description (<em class="parameter"><code><a class="link" href="NMD
 <p> a description of <em class="parameter"><code>device</code></em>
 . If either the vendor or the
 product name is unknown, this returns the interface name.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1510,7 +1487,6 @@ request.</p>
 <a name="id-1.5.2.9.31.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1597,7 +1573,6 @@ nm_device_disconnect_finish (<em class="parameter"><code><a class="link" href="N
 <a name="id-1.5.2.9.33.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1639,7 +1614,6 @@ nm_device_delete (<em class="parameter"><code><a class="link" href="NMDevice.htm
 <a name="id-1.5.2.9.34.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1725,7 +1699,6 @@ nm_device_delete_finish (<em class="parameter"><code><a class="link" href="NMDev
 <a name="id-1.5.2.9.36.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1817,7 +1790,6 @@ against</p></td>
 <a name="id-1.5.2.9.38.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection may be activated with this device, <code class="literal">FALSE</code>
 if is incompatible with the device's capabilities and characteristics.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1871,7 +1843,6 @@ against</p></td>
 <a name="id-1.5.2.9.39.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection may be activated with this device, <code class="literal">FALSE</code>
 if is incompatible with the device's capabilities and characteristics.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1901,7 +1872,6 @@ that can be used on <em class="parameter"><code>device</code></em>
 <a name="id-1.5.2.9.40.6"></a><h4>Returns</h4>
 <p> <em class="parameter"><code>device</code></em>
 's associated <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> type</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -1911,184 +1881,138 @@ that can be used on <em class="parameter"><code>device</code></em>
 <a name="NM-DEVICE-DEVICE-TYPE:CAPS"></a><h3>NM_DEVICE_DEVICE_TYPE</h3>
 <pre class="programlisting">#define NM_DEVICE_DEVICE_TYPE "device-type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-UDI:CAPS"></a><h3>NM_DEVICE_UDI</h3>
 <pre class="programlisting">#define NM_DEVICE_UDI "udi"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-INTERFACE:CAPS"></a><h3>NM_DEVICE_INTERFACE</h3>
 <pre class="programlisting">#define NM_DEVICE_INTERFACE "interface"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-IP-INTERFACE:CAPS"></a><h3>NM_DEVICE_IP_INTERFACE</h3>
 <pre class="programlisting">#define NM_DEVICE_IP_INTERFACE "ip-interface"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-DRIVER:CAPS"></a><h3>NM_DEVICE_DRIVER</h3>
 <pre class="programlisting">#define NM_DEVICE_DRIVER "driver"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-DRIVER-VERSION:CAPS"></a><h3>NM_DEVICE_DRIVER_VERSION</h3>
 <pre class="programlisting">#define NM_DEVICE_DRIVER_VERSION "driver-version"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-FIRMWARE-VERSION:CAPS"></a><h3>NM_DEVICE_FIRMWARE_VERSION</h3>
 <pre class="programlisting">#define NM_DEVICE_FIRMWARE_VERSION "firmware-version"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_DEVICE_CAPABILITIES "capabilities"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-MANAGED:CAPS"></a><h3>NM_DEVICE_MANAGED</h3>
 <pre class="programlisting">#define NM_DEVICE_MANAGED "managed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-AUTOCONNECT:CAPS"></a><h3>NM_DEVICE_AUTOCONNECT</h3>
 <pre class="programlisting">#define NM_DEVICE_AUTOCONNECT "autoconnect"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-FIRMWARE-MISSING:CAPS"></a><h3>NM_DEVICE_FIRMWARE_MISSING</h3>
 <pre class="programlisting">#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-IP4-CONFIG:CAPS"></a><h3>NM_DEVICE_IP4_CONFIG</h3>
 <pre class="programlisting">#define NM_DEVICE_IP4_CONFIG "ip4-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-DHCP4-CONFIG:CAPS"></a><h3>NM_DEVICE_DHCP4_CONFIG</h3>
 <pre class="programlisting">#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-IP6-CONFIG:CAPS"></a><h3>NM_DEVICE_IP6_CONFIG</h3>
 <pre class="programlisting">#define NM_DEVICE_IP6_CONFIG "ip6-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-DHCP6-CONFIG:CAPS"></a><h3>NM_DEVICE_DHCP6_CONFIG</h3>
 <pre class="programlisting">#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-STATE:CAPS"></a><h3>NM_DEVICE_STATE</h3>
 <pre class="programlisting">#define NM_DEVICE_STATE "state"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-STATE-REASON:CAPS"></a><h3>NM_DEVICE_STATE_REASON</h3>
 <pre class="programlisting">#define NM_DEVICE_STATE_REASON "state-reason"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-ACTIVE-CONNECTION:CAPS"></a><h3>NM_DEVICE_ACTIVE_CONNECTION</h3>
 <pre class="programlisting">#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-AVAILABLE-CONNECTIONS:CAPS"></a><h3>NM_DEVICE_AVAILABLE_CONNECTIONS</h3>
 <pre class="programlisting">#define NM_DEVICE_AVAILABLE_CONNECTIONS "available-connections"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-VENDOR:CAPS"></a><h3>NM_DEVICE_VENDOR</h3>
 <pre class="programlisting">#define NM_DEVICE_VENDOR "vendor"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-PRODUCT:CAPS"></a><h3>NM_DEVICE_PRODUCT</h3>
 <pre class="programlisting">#define NM_DEVICE_PRODUCT "product"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-PHYSICAL-PORT-ID:CAPS"></a><h3>NM_DEVICE_PHYSICAL_PORT_ID</h3>
 <pre class="programlisting">#define NM_DEVICE_PHYSICAL_PORT_ID "physical-port-id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-MTU:CAPS"></a><h3>NM_DEVICE_MTU</h3>
 <pre class="programlisting">#define NM_DEVICE_MTU "mtu"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -2096,14 +2020,14 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--active-connection"></a><h3>The <code class="literal">“active-connection”</code> property</h3>
 <pre class="programlisting">  “active-connection”        <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *</pre>
-<p></p>
+<p>The <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object that "owns" this device during activation.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--autoconnect"></a><h3>The <code class="literal">“autoconnect”</code> property</h3>
 <pre class="programlisting">  “autoconnect”              <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device can auto-activate a connection.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: TRUE</p>
 </div>
@@ -2111,21 +2035,22 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--available-connections"></a><h3>The <code class="literal">“available-connections”</code> property</h3>
 <pre class="programlisting">  “available-connections”    <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<p>The available connections of the device</p>
+<p>Element-type: NMRemoteConnection</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--capabilities"></a><h3>The <code class="literal">“capabilities”</code> property</h3>
 <pre class="programlisting">  “capabilities”             <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceCapabilities" title="enum NMDeviceCapabilities"><span class="type">NMDeviceCapabilities</span></a></pre>
-<p></p>
+<p>The capabilities of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--device-type"></a><h3>The <code class="literal">“device-type”</code> property</h3>
 <pre class="programlisting">  “device-type”              <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceType" title="enum NMDeviceType"><span class="type">NMDeviceType</span></a></pre>
-<p></p>
+<p>The numeric type of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NM_DEVICE_TYPE_UNKNOWN</p>
 </div>
@@ -2133,21 +2058,21 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--dhcp4-config"></a><h3>The <code class="literal">“dhcp4-config”</code> property</h3>
 <pre class="programlisting">  “dhcp4-config”             <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a> *</pre>
-<p></p>
+<p>The IPv4 <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a> of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--dhcp6-config"></a><h3>The <code class="literal">“dhcp6-config”</code> property</h3>
 <pre class="programlisting">  “dhcp6-config”             <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a> *</pre>
-<p></p>
+<p>The IPv6 <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a> of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--driver"></a><h3>The <code class="literal">“driver”</code> property</h3>
 <pre class="programlisting">  “driver”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The driver of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2155,7 +2080,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--driver-version"></a><h3>The <code class="literal">“driver-version”</code> property</h3>
 <pre class="programlisting">  “driver-version”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The version of the device driver.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2163,7 +2088,8 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--firmware-missing"></a><h3>The <code class="literal">“firmware-missing”</code> property</h3>
 <pre class="programlisting">  “firmware-missing”         <span class="type">gboolean</span></pre>
-<p></p>
+<p>When <code class="literal">TRUE</code> indicates the device is likely missing firmware required
+for its operation.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2171,7 +2097,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--firmware-version"></a><h3>The <code class="literal">“firmware-version”</code> property</h3>
 <pre class="programlisting">  “firmware-version”         <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The firmware version of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2179,7 +2105,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--interface"></a><h3>The <code class="literal">“interface”</code> property</h3>
 <pre class="programlisting">  “interface”                <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The interface of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2187,7 +2113,8 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--ip-interface"></a><h3>The <code class="literal">“ip-interface”</code> property</h3>
 <pre class="programlisting">  “ip-interface”             <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The IP interface of the device which should be used for all IP-related
+operations like addressing and routing.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2195,21 +2122,21 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--ip4-config"></a><h3>The <code class="literal">“ip4-config”</code> property</h3>
 <pre class="programlisting">  “ip4-config”               <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> *</pre>
-<p></p>
+<p>The <a href="https://developer.gnome.org/libnm-glib/0.9/NMIP4Config.html"><span class="type">NMIP4Config</span></a> of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--ip6-config"></a><h3>The <code class="literal">“ip6-config”</code> property</h3>
 <pre class="programlisting">  “ip6-config”               <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> *</pre>
-<p></p>
+<p>The IPv6 <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDevice--managed"></a><h3>The <code class="literal">“managed”</code> property</h3>
 <pre class="programlisting">  “managed”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device is managed by NetworkManager.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -2217,7 +2144,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--mtu"></a><h3>The <code class="literal">“mtu”</code> property</h3>
 <pre class="programlisting">  “mtu”                      <span class="type">guint</span></pre>
-<p></p>
+<p>The MTU of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: 1500</p>
 </div>
@@ -2225,7 +2152,8 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--physical-port-id"></a><h3>The <code class="literal">“physical-port-id”</code> property</h3>
 <pre class="programlisting">  “physical-port-id”         <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The physical port ID of the device. (See
+<a class="link" href="NMDevice.html#nm-device-get-physical-port-id" title="nm_device_get_physical_port_id ()"><code class="function">nm_device_get_physical_port_id()</code></a>.)</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2233,7 +2161,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--product"></a><h3>The <code class="literal">“product”</code> property</h3>
 <pre class="programlisting">  “product”                  <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The product string of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2241,7 +2169,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--state"></a><h3>The <code class="literal">“state”</code> property</h3>
 <pre class="programlisting">  “state”                    <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceState" title="enum NMDeviceState"><span class="type">NMDeviceState</span></a></pre>
-<p></p>
+<p>The state of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NM_DEVICE_STATE_UNKNOWN</p>
 </div>
@@ -2249,7 +2177,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--state-reason"></a><h3>The <code class="literal">“state-reason”</code> property</h3>
 <pre class="programlisting">  “state-reason”             <span class="type">guint</span></pre>
-<p></p>
+<p>The reason for the device state.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -2257,7 +2185,12 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--udi"></a><h3>The <code class="literal">“udi”</code> property</h3>
 <pre class="programlisting">  “udi”                      <span class="type">gchar</span> *</pre>
-<p></p>
+<p>An operating-system specific device hardware identifier; this is not
+unique to a specific hardware device across reboots or hotplugs.  It
+is an opaque string which for some device types (Bluetooth, Modem)
+contains an identifier provided by the underlying hardware service daemon
+such as Bluez or ModemManager, and clients can use this property to
+request more information about the device from those services.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2265,7 +2198,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect2">
 <a name="NMDevice--vendor"></a><h3>The <code class="literal">“vendor”</code> property</h3>
 <pre class="programlisting">  “vendor”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The vendor string of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -2280,12 +2213,49 @@ user_function (<a class="link" href="NMDevice.html" title="NMDevice"><span class
                <span class="type">guint</span>     old_state,
                <span class="type">guint</span>     reason,
                <span class="type">gpointer</span>  user_data)</pre>
+<p>Notifies the state change of a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
+<div class="refsect3">
+<a name="id-1.5.2.12.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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>the device object that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>new_state</p></td>
+<td class="parameter_description"><p>the new state of the device</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>old_state</p></td>
+<td class="parameter_description"><p>the previous state of the device</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>reason</p></td>
+<td class="parameter_description"><p>the reason describing the state change</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceAdsl.html b/docs/libnm/html/NMDeviceAdsl.html
index 168d4ad8..7c9c5612 100644
--- a/docs/libnm/html/NMDeviceAdsl.html
+++ b/docs/libnm/html/NMDeviceAdsl.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDeviceAdsl</title>
+<title>NMDeviceAdsl: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDevice.html" title="NMDevice">
 <link rel="next" href="NMDeviceBond.html" title="NMDeviceBond">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -88,8 +88,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceAdsl.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceAdsl.functions_details"></a><h2>Functions</h2>
@@ -116,7 +114,6 @@ nm_device_adsl_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.5.3.8.2.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -126,8 +123,6 @@ nm_device_adsl_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <a name="NM-DEVICE-ADSL-CARRIER:CAPS"></a><h3>NM_DEVICE_ADSL_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_ADSL_CARRIER "carrier"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -135,14 +130,13 @@ nm_device_adsl_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect2">
 <a name="NMDeviceAdsl--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html
index 03023581..b99d8ba3 100644
--- a/docs/libnm/html/NMDeviceBond.html
+++ b/docs/libnm/html/NMDeviceBond.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDeviceBond</title>
+<title>NMDeviceBond: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceAdsl.html" title="NMDeviceAdsl">
 <link rel="next" href="NMDeviceBridge.html" title="NMDeviceBridge">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -128,8 +128,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceBond.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceBond.functions_details"></a><h2>Functions</h2>
@@ -157,7 +155,6 @@ nm_device_bond_get_hw_address (<em class="parameter"><code><a class="link" href=
 <a name="id-1.5.4.8.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -184,7 +181,6 @@ nm_device_bond_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.5.4.8.3.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -225,24 +221,18 @@ copy used by the device, and must not be modified. </p>
 <a name="NM-DEVICE-BOND-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_BOND_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_BOND_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BOND-CARRIER:CAPS"></a><h3>NM_DEVICE_BOND_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_BOND_CARRIER     "carrier"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BOND-SLAVES:CAPS"></a><h3>NM_DEVICE_BOND_SLAVES</h3>
 <pre class="programlisting">#define NM_DEVICE_BOND_SLAVES      "slaves"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -250,7 +240,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceBond--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -258,7 +248,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceBond--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -266,13 +256,13 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceBond--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<p>The devices slaved to the bond device.</p>
+<p>Element-type: NMDevice</p>
 <p>Flags: Read</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html
index 6fd332de..dee83c75 100644
--- a/docs/libnm/html/NMDeviceBridge.html
+++ b/docs/libnm/html/NMDeviceBridge.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDeviceBridge</title>
+<title>NMDeviceBridge: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceBond.html" title="NMDeviceBond">
 <link rel="next" href="NMDeviceBt.html" title="NMDeviceBt">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -128,8 +128,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceBridge.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceBridge.functions_details"></a><h2>Functions</h2>
@@ -157,7 +155,6 @@ nm_device_bridge_get_hw_address (<em class="parameter"><code><a class="link" hre
 <a name="id-1.5.5.8.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -184,7 +181,6 @@ nm_device_bridge_get_carrier (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.5.5.8.3.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -225,24 +221,18 @@ copy used by the device, and must not be modified. </p>
 <a name="NM-DEVICE-BRIDGE-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_BRIDGE_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_BRIDGE_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BRIDGE-CARRIER:CAPS"></a><h3>NM_DEVICE_BRIDGE_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_BRIDGE_CARRIER     "carrier"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BRIDGE-SLAVES:CAPS"></a><h3>NM_DEVICE_BRIDGE_SLAVES</h3>
 <pre class="programlisting">#define NM_DEVICE_BRIDGE_SLAVES      "slaves"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -250,7 +240,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceBridge--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -258,7 +248,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceBridge--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -266,13 +256,13 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceBridge--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<p>The devices slaved to the bridge device.</p>
+<p>Element-type: NMDevice</p>
 <p>Flags: Read</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceBt.html b/docs/libnm/html/NMDeviceBt.html
index 8aad8df8..b8cb2689 100644
--- a/docs/libnm/html/NMDeviceBt.html
+++ b/docs/libnm/html/NMDeviceBt.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDeviceBt</title>
+<title>NMDeviceBt: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceBridge.html" title="NMDeviceBridge">
 <link rel="next" href="NMDeviceEthernet.html" title="NMDeviceEthernet">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -128,8 +128,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceBt.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceBt.functions_details"></a><h2>Functions</h2>
@@ -157,7 +155,6 @@ nm_device_bt_get_hw_address (<em class="parameter"><code><a class="link" href="N
 <a name="id-1.5.6.8.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -184,7 +181,6 @@ nm_device_bt_get_name (<em class="parameter"><code><a class="link" href="NMDevic
 <div class="refsect3">
 <a name="id-1.5.6.8.3.6"></a><h4>Returns</h4>
 <p> the name of the device</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -211,7 +207,6 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.5.6.8.4.6"></a><h4>Returns</h4>
 <p> a combination of <a class="link" href="libnm-nm-dbus-interface.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -221,24 +216,18 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <a name="NM-DEVICE-BT-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_BT_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_BT_HW_ADDRESS   "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BT-NAME:CAPS"></a><h3>NM_DEVICE_BT_NAME</h3>
 <pre class="programlisting">#define NM_DEVICE_BT_NAME         "name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-BT-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_BT_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -246,14 +235,14 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <div class="refsect2">
 <a name="NMDeviceBt--bt-capabilities"></a><h3>The <code class="literal">“bt-capabilities”</code> property</h3>
 <pre class="programlisting">  “bt-capabilities”          <a class="link" href="libnm-nm-dbus-interface.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a></pre>
-<p></p>
+<p>The device's bluetooth capabilities, a combination of <a class="link" href="libnm-nm-dbus-interface.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a>.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceBt--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -261,14 +250,13 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <div class="refsect2">
 <a name="NMDeviceBt--name"></a><h3>The <code class="literal">“name”</code> property</h3>
 <pre class="programlisting">  “name”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The name of the bluetooth device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceEthernet.html b/docs/libnm/html/NMDeviceEthernet.html
index 2beee10d..04e68bda 100644
--- a/docs/libnm/html/NMDeviceEthernet.html
+++ b/docs/libnm/html/NMDeviceEthernet.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDeviceEthernet</title>
+<title>NMDeviceEthernet: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceBt.html" title="NMDeviceBt">
 <link rel="next" href="NMDeviceGeneric.html" title="NMDeviceGeneric">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -145,8 +145,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceEthernet.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceEthernet.functions_details"></a><h2>Functions</h2>
@@ -174,7 +172,6 @@ nm_device_ethernet_get_hw_address (<em class="parameter"><code><a class="link" h
 <a name="id-1.5.7.8.2.6"></a><h4>Returns</h4>
 <p> the active hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -203,7 +200,6 @@ nm_device_ethernet_get_permanent_hw_address
 <a name="id-1.5.7.8.3.6"></a><h4>Returns</h4>
 <p> the permanent hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -230,7 +226,6 @@ nm_device_ethernet_get_speed (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.5.7.8.4.6"></a><h4>Returns</h4>
 <p> the speed of the device</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -257,7 +252,6 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.5.7.8.5.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -267,32 +261,24 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 <a name="NM-DEVICE-ETHERNET-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_ETHERNET_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-ETHERNET-PERMANENT-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS "perm-hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-ETHERNET-SPEED:CAPS"></a><h3>NM_DEVICE_ETHERNET_SPEED</h3>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_SPEED       "speed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-ETHERNET-CARRIER:CAPS"></a><h3>NM_DEVICE_ETHERNET_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -300,7 +286,7 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 <div class="refsect2">
 <a name="NMDeviceEthernet--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -308,7 +294,7 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 <div class="refsect2">
 <a name="NMDeviceEthernet--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The active hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -316,7 +302,7 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 <div class="refsect2">
 <a name="NMDeviceEthernet--perm-hw-address"></a><h3>The <code class="literal">“perm-hw-address”</code> property</h3>
 <pre class="programlisting">  “perm-hw-address”          <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The permanent hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -324,14 +310,13 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 <div class="refsect2">
 <a name="NMDeviceEthernet--speed"></a><h3>The <code class="literal">“speed”</code> property</h3>
 <pre class="programlisting">  “speed”                    <span class="type">guint</span></pre>
-<p></p>
+<p>The speed of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceGeneric.html b/docs/libnm/html/NMDeviceGeneric.html
index 28a8bb86..8144c52f 100644
--- a/docs/libnm/html/NMDeviceGeneric.html
+++ b/docs/libnm/html/NMDeviceGeneric.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDeviceGeneric</title>
+<title>NMDeviceGeneric: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceEthernet.html" title="NMDeviceEthernet">
 <link rel="next" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -102,8 +102,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceGeneric.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceGeneric.functions_details"></a><h2>Functions</h2>
@@ -131,7 +129,6 @@ nm_device_generic_get_hw_address (<em class="parameter"><code><a class="link" hr
 <a name="id-1.5.8.8.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -141,16 +138,12 @@ device, and must not be modified.</p>
 <a name="NM-DEVICE-GENERIC-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_GENERIC_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_GENERIC_HW_ADDRESS       "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-GENERIC-TYPE-DESCRIPTION:CAPS"></a><h3>NM_DEVICE_GENERIC_TYPE_DESCRIPTION</h3>
 <pre class="programlisting">#define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -158,7 +151,7 @@ device, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMDeviceGeneric--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -166,14 +159,14 @@ device, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMDeviceGeneric--type-description"></a><h3>The <code class="literal">“type-description”</code> property</h3>
 <pre class="programlisting">  “type-description”         <span class="type">gchar</span> *</pre>
-<p></p>
+<p>A description of the specific type of device this is, or <code class="literal">NULL</code>
+if not known.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceInfiniband.html b/docs/libnm/html/NMDeviceInfiniband.html
index 60783944..310d8550 100644
--- a/docs/libnm/html/NMDeviceInfiniband.html
+++ b/docs/libnm/html/NMDeviceInfiniband.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDeviceInfiniband</title>
+<title>NMDeviceInfiniband: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceGeneric.html" title="NMDeviceGeneric">
 <link rel="next" href="NMDeviceModem.html" title="NMDeviceModem">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -111,8 +111,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceInfiniband.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceInfiniband.functions_details"></a><h2>Functions</h2>
@@ -140,7 +138,6 @@ nm_device_infiniband_get_hw_address (<em class="parameter"><code><a class="link"
 <a name="id-1.5.9.8.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -167,7 +164,6 @@ nm_device_infiniband_get_carrier (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.5.9.8.3.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -177,16 +173,12 @@ nm_device_infiniband_get_carrier (<em class="parameter"><code><a class="link" hr
 <a name="NM-DEVICE-INFINIBAND-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_INFINIBAND_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_INFINIBAND_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-INFINIBAND-CARRIER:CAPS"></a><h3>NM_DEVICE_INFINIBAND_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -194,7 +186,7 @@ nm_device_infiniband_get_carrier (<em class="parameter"><code><a class="link" hr
 <div class="refsect2">
 <a name="NMDeviceInfiniband--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -202,14 +194,13 @@ nm_device_infiniband_get_carrier (<em class="parameter"><code><a class="link" hr
 <div class="refsect2">
 <a name="NMDeviceInfiniband--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceModem.html b/docs/libnm/html/NMDeviceModem.html
index 49cd12df..63f1dbf6 100644
--- a/docs/libnm/html/NMDeviceModem.html
+++ b/docs/libnm/html/NMDeviceModem.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDeviceModem</title>
+<title>NMDeviceModem: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband">
 <link rel="next" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -111,8 +111,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceModem.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceModem.functions_details"></a><h2>Functions</h2>
@@ -142,7 +140,6 @@ may require a firmware reload or reinitialization.</p>
 <div class="refsect3">
 <a name="id-1.5.10.8.2.6"></a><h4>Returns</h4>
 <p> the generic access technology families the modem supports</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -173,7 +170,6 @@ represents the network types the modem can immediately connect to.</p>
 <a name="id-1.5.10.8.3.6"></a><h4>Returns</h4>
 <p> the generic access technology families the modem supports without
 a firmware reload or other reinitialization</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -183,16 +179,12 @@ a firmware reload or other reinitialization</p>
 <a name="NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_MODEM_MODEM_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_MODEM_CURRENT_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -200,20 +192,23 @@ a firmware reload or other reinitialization</p>
 <div class="refsect2">
 <a name="NMDeviceModem--current-capabilities"></a><h3>The <code class="literal">“current-capabilities”</code> property</h3>
 <pre class="programlisting">  “current-capabilities”     <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceModemCapabilities" title="enum NMDeviceModemCapabilities"><span class="type">NMDeviceModemCapabilities</span></a></pre>
-<p></p>
+<p>The generic family of access technologies the modem currently supports
+without a firmware reload or reinitialization.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceModem--modem-capabilities"></a><h3>The <code class="literal">“modem-capabilities”</code> property</h3>
 <pre class="programlisting">  “modem-capabilities”       <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceModemCapabilities" title="enum NMDeviceModemCapabilities"><span class="type">NMDeviceModemCapabilities</span></a></pre>
-<p></p>
+<p>The generic family of access technologies the modem supports.  Not all
+capabilities are available at the same time however; some modems require
+a firmware reload or other reinitialization to switch between eg
+CDMA/EVDO and GSM/UMTS.</p>
 <p>Flags: Read</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceOlpcMesh.html b/docs/libnm/html/NMDeviceOlpcMesh.html
index 0bdbf9aa..1e4e036a 100644
--- a/docs/libnm/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm/html/NMDeviceOlpcMesh.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDeviceOlpcMesh</title>
+<title>NMDeviceOlpcMesh: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceModem.html" title="NMDeviceModem">
 <link rel="next" href="NMDeviceTeam.html" title="NMDeviceTeam">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -129,8 +129,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceOlpcMesh.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceOlpcMesh.functions_details"></a><h2>Functions</h2>
@@ -158,7 +156,6 @@ nm_device_olpc_mesh_get_hw_address (<em class="parameter"><code><a class="link"
 <a name="id-1.5.11.8.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -213,7 +210,6 @@ nm_device_olpc_mesh_get_active_channel
 <div class="refsect3">
 <a name="id-1.5.11.8.4.6"></a><h4>Returns</h4>
 <p> active channel of the device</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -223,24 +219,18 @@ nm_device_olpc_mesh_get_active_channel
 <a name="NM-DEVICE-OLPC-MESH-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_OLPC_MESH_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_OLPC_MESH_HW_ADDRESS     "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-OLPC-MESH-COMPANION:CAPS"></a><h3>NM_DEVICE_OLPC_MESH_COMPANION</h3>
 <pre class="programlisting">#define NM_DEVICE_OLPC_MESH_COMPANION      "companion"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-OLPC-MESH-ACTIVE-CHANNEL:CAPS"></a><h3>NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL</h3>
 <pre class="programlisting">#define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -248,7 +238,7 @@ nm_device_olpc_mesh_get_active_channel
 <div class="refsect2">
 <a name="NMDeviceOlpcMesh--active-channel"></a><h3>The <code class="literal">“active-channel”</code> property</h3>
 <pre class="programlisting">  “active-channel”           <span class="type">guint</span></pre>
-<p></p>
+<p>The device's active channel.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -256,21 +246,20 @@ nm_device_olpc_mesh_get_active_channel
 <div class="refsect2">
 <a name="NMDeviceOlpcMesh--companion"></a><h3>The <code class="literal">“companion”</code> property</h3>
 <pre class="programlisting">  “companion”                <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *</pre>
-<p></p>
+<p>The companion device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceOlpcMesh--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html
index ded0ca8f..9290d518 100644
--- a/docs/libnm/html/NMDeviceTeam.html
+++ b/docs/libnm/html/NMDeviceTeam.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDeviceTeam</title>
+<title>NMDeviceTeam: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">
 <link rel="next" href="NMDeviceVlan.html" title="NMDeviceVlan">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -128,8 +128,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceTeam.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceTeam.functions_details"></a><h2>Functions</h2>
@@ -157,7 +155,6 @@ nm_device_team_get_hw_address (<em class="parameter"><code><a class="link" href=
 <a name="id-1.5.12.8.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -184,7 +181,6 @@ nm_device_team_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.5.12.8.3.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -225,24 +221,18 @@ copy used by the device, and must not be modified. </p>
 <a name="NM-DEVICE-TEAM-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_TEAM_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_TEAM_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-TEAM-CARRIER:CAPS"></a><h3>NM_DEVICE_TEAM_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_TEAM_CARRIER     "carrier"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-TEAM-SLAVES:CAPS"></a><h3>NM_DEVICE_TEAM_SLAVES</h3>
 <pre class="programlisting">#define NM_DEVICE_TEAM_SLAVES      "slaves"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -250,7 +240,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceTeam--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -258,7 +248,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceTeam--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -266,13 +256,13 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceTeam--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<p>The devices enslaved to the team device.</p>
+<p>Element-type: NMDevice</p>
 <p>Flags: Read</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceVlan.html b/docs/libnm/html/NMDeviceVlan.html
index 3febf838..1101eb80 100644
--- a/docs/libnm/html/NMDeviceVlan.html
+++ b/docs/libnm/html/NMDeviceVlan.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDeviceVlan</title>
+<title>NMDeviceVlan: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceTeam.html" title="NMDeviceTeam">
 <link rel="next" href="NMDeviceWifi.html" title="NMDeviceWifi">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -146,8 +146,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceVlan.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceVlan.functions_details"></a><h2>Functions</h2>
@@ -175,7 +173,6 @@ nm_device_vlan_get_hw_address (<em class="parameter"><code><a class="link" href=
 <a name="id-1.5.13.8.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -202,7 +199,6 @@ nm_device_vlan_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.5.13.8.3.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -254,7 +250,6 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.5.13.8.5.5"></a><h4>Returns</h4>
 <p> the device's VLAN ID</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -264,32 +259,24 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 <a name="NM-DEVICE-VLAN-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_VLAN_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_VLAN_HW_ADDRESS  "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-VLAN-CARRIER:CAPS"></a><h3>NM_DEVICE_VLAN_CARRIER</h3>
 <pre class="programlisting">#define NM_DEVICE_VLAN_CARRIER     "carrier"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-VLAN-PARENT:CAPS"></a><h3>NM_DEVICE_VLAN_PARENT</h3>
 <pre class="programlisting">#define NM_DEVICE_VLAN_PARENT      "parent"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-VLAN-VLAN-ID:CAPS"></a><h3>NM_DEVICE_VLAN_VLAN_ID</h3>
 <pre class="programlisting">#define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -297,7 +284,7 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect2">
 <a name="NMDeviceVlan--carrier"></a><h3>The <code class="literal">“carrier”</code> property</h3>
 <pre class="programlisting">  “carrier”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>Whether the device has carrier.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -305,7 +292,7 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect2">
 <a name="NMDeviceVlan--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -313,14 +300,14 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect2">
 <a name="NMDeviceVlan--parent"></a><h3>The <code class="literal">“parent”</code> property</h3>
 <pre class="programlisting">  “parent”                   <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *</pre>
-<p></p>
+<p>The devices's parent device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceVlan--vlan-id"></a><h3>The <code class="literal">“vlan-id”</code> property</h3>
 <pre class="programlisting">  “vlan-id”                  <span class="type">guint</span></pre>
-<p></p>
+<p>The device's VLAN ID.</p>
 <p>Flags: Read</p>
 <p>Allowed values: &lt;= 4095</p>
 <p>Default value: 0</p>
@@ -328,7 +315,6 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html
index 6bbad017..db0dca47 100644
--- a/docs/libnm/html/NMDeviceWifi.html
+++ b/docs/libnm/html/NMDeviceWifi.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDeviceWifi</title>
+<title>NMDeviceWifi: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceVlan.html" title="NMDeviceVlan">
 <link rel="next" href="NMDeviceWimax.html" title="NMDeviceWimax">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -252,8 +252,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceWifi.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceWifi.functions_details"></a><h2>Functions</h2>
@@ -281,7 +279,6 @@ nm_device_wifi_get_hw_address (<em class="parameter"><code><a class="link" href=
 <a name="id-1.5.14.9.2.6"></a><h4>Returns</h4>
 <p> the actual hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -310,7 +307,6 @@ nm_device_wifi_get_permanent_hw_address
 <a name="id-1.5.14.9.3.6"></a><h4>Returns</h4>
 <p> the permanent hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -337,7 +333,6 @@ nm_device_wifi_get_mode (<em class="parameter"><code><a class="link" href="NMDev
 <div class="refsect3">
 <a name="id-1.5.14.9.4.6"></a><h4>Returns</h4>
 <p> the mode</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -364,7 +359,6 @@ nm_device_wifi_get_bitrate (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.5.14.9.5.6"></a><h4>Returns</h4>
 <p> the bit rate (kbit/s)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -391,7 +385,6 @@ nm_device_wifi_get_capabilities (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.5.14.9.6.6"></a><h4>Returns</h4>
 <p> the capabilities</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -530,7 +523,6 @@ after that for the scan to complete.</p>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be
 set.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -620,7 +612,6 @@ nm_device_wifi_request_scan_finish (<em class="parameter"><code><a class="link"
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be
 set.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -630,56 +621,42 @@ set.</p>
 <a name="NM-DEVICE-WIFI-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_WIFI_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIFI-PERMANENT-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIFI-MODE:CAPS"></a><h3>NM_DEVICE_WIFI_MODE</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_MODE                "mode"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIFI-BITRATE:CAPS"></a><h3>NM_DEVICE_WIFI_BITRATE</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_BITRATE             "bitrate"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIFI-ACTIVE-ACCESS-POINT:CAPS"></a><h3>NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIFI-CAPABILITIES:CAPS"></a><h3>NM_DEVICE_WIFI_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIFI-ACCESS-POINTS:CAPS"></a><h3>NM_DEVICE_WIFI_ACCESS_POINTS</h3>
 <pre class="programlisting">#define NM_DEVICE_WIFI_ACCESS_POINTS       "access-points"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -687,21 +664,22 @@ set.</p>
 <div class="refsect2">
 <a name="NMDeviceWifi--access-points"></a><h3>The <code class="literal">“access-points”</code> property</h3>
 <pre class="programlisting">  “access-points”            <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<p>List of all Wi-Fi access points the device can see.</p>
+<p>Element-type: NMAccessPoint</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceWifi--active-access-point"></a><h3>The <code class="literal">“active-access-point”</code> property</h3>
 <pre class="programlisting">  “active-access-point”      <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *</pre>
-<p></p>
+<p>The active <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceWifi--bitrate"></a><h3>The <code class="literal">“bitrate”</code> property</h3>
 <pre class="programlisting">  “bitrate”                  <span class="type">guint</span></pre>
-<p></p>
+<p>The bit rate of the device in kbit/s.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -709,7 +687,7 @@ set.</p>
 <div class="refsect2">
 <a name="NMDeviceWifi--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -717,7 +695,7 @@ set.</p>
 <div class="refsect2">
 <a name="NMDeviceWifi--mode"></a><h3>The <code class="literal">“mode”</code> property</h3>
 <pre class="programlisting">  “mode”                     <a class="link" href="libnm-nm-dbus-interface.html#NM80211Mode" title="enum NM80211Mode"><span class="type">NM80211Mode</span></a></pre>
-<p></p>
+<p>The mode of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NM_802_11_MODE_UNKNOWN</p>
 </div>
@@ -725,7 +703,7 @@ set.</p>
 <div class="refsect2">
 <a name="NMDeviceWifi--perm-hw-address"></a><h3>The <code class="literal">“perm-hw-address”</code> property</h3>
 <pre class="programlisting">  “perm-hw-address”          <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -733,7 +711,7 @@ set.</p>
 <div class="refsect2">
 <a name="NMDeviceWifi--wireless-capabilities"></a><h3>The <code class="literal">“wireless-capabilities”</code> property</h3>
 <pre class="programlisting">  “wireless-capabilities”    <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceWifiCapabilities" title="enum NMDeviceWifiCapabilities"><span class="type">NMDeviceWifiCapabilities</span></a></pre>
-<p></p>
+<p>The wireless capabilities of the device.</p>
 <p>Flags: Read</p>
 </div>
 </div>
@@ -745,6 +723,34 @@ set.</p>
 user_function (<a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device,
                <span class="type">GObject</span>      *ap,
                <span class="type">gpointer</span>      user_data)</pre>
+<p>Notifies that a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> is added to the Wi-Fi device.</p>
+<div class="refsect3">
+<a name="id-1.5.14.12.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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>the Wi-Fi device that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>ap</p></td>
+<td class="parameter_description"><p>the new access point</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 <hr>
@@ -754,12 +760,39 @@ user_function (<a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><sp
 user_function (<a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device,
                <span class="type">GObject</span>      *ap,
                <span class="type">gpointer</span>      user_data)</pre>
+<p>Notifies that a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> is removed from the Wi-Fi device.</p>
+<div class="refsect3">
+<a name="id-1.5.14.12.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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>the Wi-Fi device that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>ap</p></td>
+<td class="parameter_description"><p>the removed access point</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceWimax.html b/docs/libnm/html/NMDeviceWimax.html
index f1d58b57..4fc7c558 100644
--- a/docs/libnm/html/NMDeviceWimax.html
+++ b/docs/libnm/html/NMDeviceWimax.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDeviceWimax</title>
+<title>NMDeviceWimax: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceWifi.html" title="NMDeviceWifi">
 <link rel="next" href="NMActiveConnection.html" title="NMActiveConnection">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -245,8 +245,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDeviceWimax.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDeviceWimax.functions_details"></a><h2>Functions</h2>
@@ -274,7 +272,6 @@ nm_device_wimax_get_hw_address (<em class="parameter"><code><a class="link" href
 <a name="id-1.5.15.9.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -394,7 +391,6 @@ device is not connected.</p>
 <div class="refsect3">
 <a name="id-1.5.15.9.6.6"></a><h4>Returns</h4>
 <p> the center frequency in KHz, or 0</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -424,7 +420,6 @@ device is not connected.</p>
 <div class="refsect3">
 <a name="id-1.5.15.9.7.6"></a><h4>Returns</h4>
 <p> the RSSI in dBm, or 0</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -453,7 +448,6 @@ meaning when the device is not connected.</p>
 <div class="refsect3">
 <a name="id-1.5.15.9.8.6"></a><h4>Returns</h4>
 <p> the CINR in dB, or 0</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -482,7 +476,6 @@ nm_device_wimax_get_tx_power (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.5.15.9.9.6"></a><h4>Returns</h4>
 <p> the TX power in dBm, or 0</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -509,7 +502,6 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect3">
 <a name="id-1.5.15.9.10.6"></a><h4>Returns</h4>
 <p> the ID of the serving Base Station, or <code class="literal">NULL</code></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -519,64 +511,48 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <a name="NM-DEVICE-WIMAX-HW-ADDRESS:CAPS"></a><h3>NM_DEVICE_WIMAX_HW_ADDRESS</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-ACTIVE-NSP:CAPS"></a><h3>NM_DEVICE_WIMAX_ACTIVE_NSP</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-CENTER-FREQUENCY:CAPS"></a><h3>NM_DEVICE_WIMAX_CENTER_FREQUENCY</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-RSSI:CAPS"></a><h3>NM_DEVICE_WIMAX_RSSI</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_RSSI             "rssi"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-CINR:CAPS"></a><h3>NM_DEVICE_WIMAX_CINR</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_CINR             "cinr"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-TX-POWER:CAPS"></a><h3>NM_DEVICE_WIMAX_TX_POWER</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_TX_POWER         "tx-power"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-BSID:CAPS"></a><h3>NM_DEVICE_WIMAX_BSID</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_BSID             "bsid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEVICE-WIMAX-NSPS:CAPS"></a><h3>NM_DEVICE_WIMAX_NSPS</h3>
 <pre class="programlisting">#define NM_DEVICE_WIMAX_NSPS             "nsps"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -584,14 +560,15 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect2">
 <a name="NMDeviceWimax--active-nsp"></a><h3>The <code class="literal">“active-nsp”</code> property</h3>
 <pre class="programlisting">  “active-nsp”               <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *</pre>
-<p></p>
+<p>The active <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> of the device.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceWimax--bsid"></a><h3>The <code class="literal">“bsid”</code> property</h3>
 <pre class="programlisting">  “bsid”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The ID of the serving base station as received from the network.  Has
+no meaning when the device is not connected.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -599,7 +576,9 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect2">
 <a name="NMDeviceWimax--center-frequency"></a><h3>The <code class="literal">“center-frequency”</code> property</h3>
 <pre class="programlisting">  “center-frequency”         <span class="type">guint</span></pre>
-<p></p>
+<p>The center frequency (in KHz) of the radio channel the device is using to
+communicate with the network when connected.  Has no meaning when the
+device is not connected.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -607,7 +586,9 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect2">
 <a name="NMDeviceWimax--cinr"></a><h3>The <code class="literal">“cinr”</code> property</h3>
 <pre class="programlisting">  “cinr”                     <span class="type">gint</span></pre>
-<p></p>
+<p>CINR (Carrier to Interference + Noise Ratio) of the current radio link
+in dB.  CINR is a more accurate measure of radio link quality.  Has no
+meaning when the device is not connected.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -615,7 +596,7 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect2">
 <a name="NMDeviceWimax--hw-address"></a><h3>The <code class="literal">“hw-address”</code> property</h3>
 <pre class="programlisting">  “hw-address”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The hardware (MAC) address of the device.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -623,14 +604,18 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect2">
 <a name="NMDeviceWimax--nsps"></a><h3>The <code class="literal">“nsps”</code> property</h3>
 <pre class="programlisting">  “nsps”                     <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<p>List of all WiMAX Network Service Providers the device can see.</p>
+<p>Element-type: NMWimaxNsp</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMDeviceWimax--rssi"></a><h3>The <code class="literal">“rssi”</code> property</h3>
 <pre class="programlisting">  “rssi”                     <span class="type">gint</span></pre>
-<p></p>
+<p>RSSI of the current radio link in dBm.  This value indicates how strong
+the raw received RF signal from the base station is, but does not
+indicate the overall quality of the radio link.  Has no meaning when the
+device is not connected.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -638,7 +623,9 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect2">
 <a name="NMDeviceWimax--tx-power"></a><h3>The <code class="literal">“tx-power”</code> property</h3>
 <pre class="programlisting">  “tx-power”                 <span class="type">gint</span></pre>
-<p></p>
+<p>Average power of the last burst transmitted by the device, in units of
+0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+-5.5 dBm.  Has no meaning when the device is not connected.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -651,6 +638,34 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 user_function (<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self,
                <span class="type">GObject</span>       *nsp,
                <span class="type">gpointer</span>       user_data)</pre>
+<p>Notifies that a <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> is added to the wimax device.</p>
+<div class="refsect3">
+<a name="id-1.5.15.12.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the wimax device that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>nsp</p></td>
+<td class="parameter_description"><p>the new NSP</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 <hr>
@@ -660,12 +675,39 @@ user_function (<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><
 user_function (<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a> *self,
                <span class="type">GObject</span>       *nsp,
                <span class="type">gpointer</span>       user_data)</pre>
+<p>Notifies that a <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> is removed from the wimax device.</p>
+<div class="refsect3">
+<a name="id-1.5.15.12.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the wimax device that received the signal</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>nsp</p></td>
+<td class="parameter_description"><p>the removed NSP</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>user data set when the signal handler was connected.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <p>Flags: Run First</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDhcpConfig.html b/docs/libnm/html/NMDhcpConfig.html
index 3a4a0229..a1e97a8a 100644
--- a/docs/libnm/html/NMDhcpConfig.html
+++ b/docs/libnm/html/NMDhcpConfig.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMDhcpConfig</title>
+<title>NMDhcpConfig: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMIPConfig.html" title="NMIPConfig">
 <link rel="next" href="ch05.html" title="Utility API Reference">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -118,8 +118,6 @@
 </div>
 <div class="refsect1">
 <a name="NMDhcpConfig.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMDhcpConfig.functions_details"></a><h2>Functions</h2>
@@ -147,7 +145,6 @@ nm_dhcp_config_get_family (<em class="parameter"><code><a class="link" href="NMD
 <a name="id-1.5.22.8.2.6"></a><h4>Returns</h4>
 <p> the IP address family; either <code class="literal">AF_INET</code> or
 <code class="literal">AF_INET6</code></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -212,7 +209,6 @@ nm_dhcp_config_get_one_option (<em class="parameter"><code><a class="link" href=
 <a name="id-1.5.22.8.4.6"></a><h4>Returns</h4>
 <p> the configuration option's value. This is the internal string used by the
 configuration, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -222,16 +218,12 @@ configuration, and must not be modified.</p>
 <a name="NM-DHCP-CONFIG-FAMILY:CAPS"></a><h3>NM_DHCP_CONFIG_FAMILY</h3>
 <pre class="programlisting">#define NM_DHCP_CONFIG_FAMILY  "family"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DHCP-CONFIG-OPTIONS:CAPS"></a><h3>NM_DHCP_CONFIG_OPTIONS</h3>
 <pre class="programlisting">#define NM_DHCP_CONFIG_OPTIONS "options"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -239,7 +231,8 @@ configuration, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMDhcpConfig--family"></a><h3>The <code class="literal">“family”</code> property</h3>
 <pre class="programlisting">  “family”                   <span class="type">gint</span></pre>
-<p></p>
+<p>The IP address family of the configuration; either
+<code class="literal">AF_INET</code> or <code class="literal">AF_INET6</code>.</p>
 <p>Flags: Read</p>
 <p>Allowed values: [0,255]</p>
 <p>Default value: 0</p>
@@ -248,13 +241,13 @@ 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”                  <span class="type">GHashTable</span> *</pre>
-<p></p>
+<p>The <span class="type">GHashTable</span> containing options of the configuration.</p>
+<p>Type: GLib.HashTable(utf8,utf8)</p>
 <p>Flags: Read</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMIPConfig.html b/docs/libnm/html/NMIPConfig.html
index a93213ab..9a32ecb6 100644
--- a/docs/libnm/html/NMIPConfig.html
+++ b/docs/libnm/html/NMIPConfig.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMIPConfig</title>
+<title>NMIPConfig: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMWimaxNsp.html" title="NMWimaxNsp">
 <link rel="next" href="NMDhcpConfig.html" title="NMDhcpConfig">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -210,8 +210,6 @@
 </div>
 <div class="refsect1">
 <a name="NMIPConfig.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMIPConfig.functions_details"></a><h2>Functions</h2>
@@ -239,7 +237,6 @@ nm_ip_config_get_family (<em class="parameter"><code><a class="link" href="NMIPC
 <a name="id-1.5.21.8.2.6"></a><h4>Returns</h4>
 <p> the IP address family; either <code class="literal">AF_INET</code> or
 <code class="literal">AF_INET6</code></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -445,64 +442,48 @@ nm_ip_config_get_wins_servers (<em class="parameter"><code><a class="link" href=
 <a name="NM-IP-CONFIG-FAMILY:CAPS"></a><h3>NM_IP_CONFIG_FAMILY</h3>
 <pre class="programlisting">#define NM_IP_CONFIG_FAMILY "family"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP-CONFIG-GATEWAY:CAPS"></a><h3>NM_IP_CONFIG_GATEWAY</h3>
 <pre class="programlisting">#define NM_IP_CONFIG_GATEWAY "gateway"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP-CONFIG-ADDRESSES:CAPS"></a><h3>NM_IP_CONFIG_ADDRESSES</h3>
 <pre class="programlisting">#define NM_IP_CONFIG_ADDRESSES "addresses"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP-CONFIG-ROUTES:CAPS"></a><h3>NM_IP_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_IP_CONFIG_ROUTES "routes"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP-CONFIG-NAMESERVERS:CAPS"></a><h3>NM_IP_CONFIG_NAMESERVERS</h3>
 <pre class="programlisting">#define NM_IP_CONFIG_NAMESERVERS "nameservers"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP-CONFIG-DOMAINS:CAPS"></a><h3>NM_IP_CONFIG_DOMAINS</h3>
 <pre class="programlisting">#define NM_IP_CONFIG_DOMAINS "domains"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP-CONFIG-SEARCHES:CAPS"></a><h3>NM_IP_CONFIG_SEARCHES</h3>
 <pre class="programlisting">#define NM_IP_CONFIG_SEARCHES "searches"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-IP-CONFIG-WINS-SERVERS:CAPS"></a><h3>NM_IP_CONFIG_WINS_SERVERS</h3>
 <pre class="programlisting">#define NM_IP_CONFIG_WINS_SERVERS "wins-servers"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -510,21 +491,22 @@ nm_ip_config_get_wins_servers (<em class="parameter"><code><a class="link" href=
 <div class="refsect2">
 <a name="NMIPConfig--addresses"></a><h3>The <code class="literal">“addresses”</code> property</h3>
 <pre class="programlisting">  “addresses”                <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<p>A <span class="type">GPtrArray</span> containing the addresses (<a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a>) of the configuration.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIPConfig--domains"></a><h3>The <code class="literal">“domains”</code> property</h3>
 <pre class="programlisting">  “domains”                  <span class="type">GStrv</span></pre>
-<p></p>
+<p>The array containing domain strings of the configuration.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIPConfig--family"></a><h3>The <code class="literal">“family”</code> property</h3>
 <pre class="programlisting">  “family”                   <span class="type">gint</span></pre>
-<p></p>
+<p>The IP address family of the configuration; either
+<code class="literal">AF_INET</code> or <code class="literal">AF_INET6</code>.</p>
 <p>Flags: Read</p>
 <p>Allowed values: [0,255]</p>
 <p>Default value: 0</p>
@@ -533,7 +515,7 @@ nm_ip_config_get_wins_servers (<em class="parameter"><code><a class="link" href=
 <div class="refsect2">
 <a name="NMIPConfig--gateway"></a><h3>The <code class="literal">“gateway”</code> property</h3>
 <pre class="programlisting">  “gateway”                  <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The IP gateway address of the configuration as string.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -541,34 +523,34 @@ nm_ip_config_get_wins_servers (<em class="parameter"><code><a class="link" href=
 <div class="refsect2">
 <a name="NMIPConfig--nameservers"></a><h3>The <code class="literal">“nameservers”</code> property</h3>
 <pre class="programlisting">  “nameservers”              <span class="type">GStrv</span></pre>
-<p></p>
+<p>The array containing name server IP addresses of the configuration.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIPConfig--routes"></a><h3>The <code class="literal">“routes”</code> property</h3>
 <pre class="programlisting">  “routes”                   <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<p>A <span class="type">GPtrArray</span> containing the routes (<a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a>) of the configuration.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIPConfig--searches"></a><h3>The <code class="literal">“searches”</code> property</h3>
 <pre class="programlisting">  “searches”                 <span class="type">GStrv</span></pre>
-<p></p>
+<p>The array containing DNS search strings of the configuration.</p>
 <p>Flags: Read</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMIPConfig--wins-servers"></a><h3>The <code class="literal">“wins-servers”</code> property</h3>
 <pre class="programlisting">  “wins-servers”             <span class="type">GStrv</span></pre>
-<p></p>
+<p>The array containing WINS server IP addresses of the configuration.
+(This will always be empty for IPv6 configurations.)</p>
 <p>Flags: Read</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMObject.html b/docs/libnm/html/NMObject.html
index 38da67a0..c9779152 100644
--- a/docs/libnm/html/NMObject.html
+++ b/docs/libnm/html/NMObject.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMObject</title>
+<title>NMObject: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch02.html" title="Client Object API Reference">
 <link rel="prev" href="NMSecretAgentOld.html" title="NMSecretAgentOld">
 <link rel="next" href="libnm-nm-errors.html" title="nm-errors">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -112,8 +112,6 @@
 </div>
 <div class="refsect1">
 <a name="NMObject.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMObject.functions_details"></a><h2>Functions</h2>
@@ -141,7 +139,6 @@ nm_object_get_path (<em class="parameter"><code><a class="link" href="NMObject.h
 <a name="id-1.3.4.8.2.6"></a><h4>Returns</h4>
 <p> the object's path. This is the internal string used by the
 device, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -151,16 +148,12 @@ device, and must not be modified.</p>
 <a name="NM-OBJECT-PATH:CAPS"></a><h3>NM_OBJECT_PATH</h3>
 <pre class="programlisting">#define NM_OBJECT_PATH "path"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-OBJECT-DBUS-CONNECTION:CAPS"></a><h3>NM_OBJECT_DBUS_CONNECTION</h3>
 <pre class="programlisting">#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -168,14 +161,14 @@ device, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMObject--dbus-connection"></a><h3>The <code class="literal">“dbus-connection”</code> property</h3>
 <pre class="programlisting">  “dbus-connection”          <span class="type">GDBusConnection</span> *</pre>
-<p></p>
+<p>The <span class="type">GDBusConnection</span> of the object.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <p>Flags: Read / Write / Construct Only</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMObject--nm-running-internal"></a><h3>The <code class="literal">“nm-running-internal”</code> property</h3>
 <pre class="programlisting">  “nm-running-internal”      <span class="type">gboolean</span></pre>
-<p></p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -183,14 +176,13 @@ device, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMObject--path"></a><h3>The <code class="literal">“path”</code> property</h3>
 <pre class="programlisting">  “path”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The D-Bus object path.</p>
 <p>Flags: Read / Write / Construct Only</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html
index 0bead3ba..d413162d 100644
--- a/docs/libnm/html/NMRemoteConnection.html
+++ b/docs/libnm/html/NMRemoteConnection.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMRemoteConnection</title>
+<title>NMRemoteConnection: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMVpnConnection.html" title="NMVpnConnection">
 <link rel="next" href="NMAccessPoint.html" title="NMAccessPoint">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -214,8 +214,6 @@
 </div>
 <div class="refsect1">
 <a name="NMRemoteConnection.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMRemoteConnection.functions_details"></a><h2>Functions</h2>
@@ -267,7 +265,6 @@ disk; if <code class="literal">FALSE</code>, then only the in-memory representat
 <a name="id-1.5.18.8.2.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -365,7 +362,6 @@ nm_remote_connection_commit_changes_finish
 <a name="id-1.5.18.8.4.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -408,7 +404,6 @@ been written to disk, or if the connection has never been saved.</p>
 <a name="id-1.5.18.8.5.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -494,7 +489,6 @@ nm_remote_connection_save_finish (<em class="parameter"><code><a class="link" hr
 <a name="id-1.5.18.8.7.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -536,7 +530,6 @@ nm_remote_connection_delete (<em class="parameter"><code><a class="link" href="N
 <a name="id-1.5.18.8.8.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -621,7 +614,6 @@ nm_remote_connection_delete_finish (<em class="parameter"><code><a class="link"
 <a name="id-1.5.18.8.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -671,7 +663,6 @@ not a simple property accessor.</p>
 <p> a <span class="type">GVariant</span> of type <code class="literal">NM_VARIANT_TYPE_CONNECTION</code> containing
 <em class="parameter"><code>connection</code></em>
 's secrets, or <code class="literal">NULL</code> on error.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -793,7 +784,6 @@ nm_remote_connection_get_unsaved (<em class="parameter"><code><a class="link" hr
 <p> <code class="literal">TRUE</code> if the remote connection contains changes that have not
 been saved to disk, <code class="literal">FALSE</code> if the connection is the same as its on-disk
 representation.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -828,7 +818,6 @@ reference to it.)</p>
 <a name="id-1.5.18.8.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the remote connection is visible to the current
 user, <code class="literal">FALSE</code> if not.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -838,32 +827,24 @@ user, <code class="literal">FALSE</code> if not.</p>
 <a name="NM-REMOTE-CONNECTION-DBUS-CONNECTION:CAPS"></a><h3>NM_REMOTE_CONNECTION_DBUS_CONNECTION</h3>
 <pre class="programlisting">#define NM_REMOTE_CONNECTION_DBUS_CONNECTION "dbus-connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-REMOTE-CONNECTION-PATH:CAPS"></a><h3>NM_REMOTE_CONNECTION_PATH</h3>
 <pre class="programlisting">#define NM_REMOTE_CONNECTION_PATH            "path"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-REMOTE-CONNECTION-UNSAVED:CAPS"></a><h3>NM_REMOTE_CONNECTION_UNSAVED</h3>
 <pre class="programlisting">#define NM_REMOTE_CONNECTION_UNSAVED         "unsaved"
 </pre>
-<p>
-</p>
 </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>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -871,7 +852,8 @@ user, <code class="literal">FALSE</code> if not.</p>
 <div class="refsect2">
 <a name="NMRemoteConnection--unsaved"></a><h3>The <code class="literal">“unsaved”</code> property</h3>
 <pre class="programlisting">  “unsaved”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p><code class="literal">TRUE</code> if the remote connection contains changes that have not been saved
+to disk, <code class="literal">FALSE</code> if the connection is the same as its on-disk representation.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
@@ -879,14 +861,19 @@ user, <code class="literal">FALSE</code> if not.</p>
 <div class="refsect2">
 <a name="NMRemoteConnection--visible"></a><h3>The <code class="literal">“visible”</code> property</h3>
 <pre class="programlisting">  “visible”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p><code class="literal">TRUE</code> if the remote connection is visible to the current user, <code class="literal">FALSE</code> if
+not.  If the connection is not visible then it is essentially useless; it
+will not contain any settings, and operations such as
+<a class="link" href="NMRemoteConnection.html#nm-remote-connection-save" title="nm_remote_connection_save ()"><code class="function">nm_remote_connection_save()</code></a> and <a class="link" href="NMRemoteConnection.html#nm-remote-connection-delete" title="nm_remote_connection_delete ()"><code class="function">nm_remote_connection_delete()</code></a> will always
+fail. (<a href="https://developer.gnome.org/libnm-glib/0.9/NMRemoteSettings.html"><span class="type">NMRemoteSettings</span></a> will not normally return non-visible connections
+to callers, but it is possible for a connection's visibility to change
+after you already have a reference to it.)</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html
index 4eb3641b..ab20b0eb 100644
--- a/docs/libnm/html/NMSecretAgentOld.html
+++ b/docs/libnm/html/NMSecretAgentOld.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSecretAgentOld</title>
+<title>NMSecretAgentOld: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch02.html" title="Client Object API Reference">
 <link rel="prev" href="NMClient.html" title="NMClient">
 <link rel="next" href="NMObject.html" title="NMObject">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -216,8 +216,6 @@
 </div>
 <div class="refsect1">
 <a name="NMSecretAgentOld.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMSecretAgentOld.functions_details"></a><h2>Functions</h2>
@@ -267,7 +265,7 @@ something like this:</p>
 <span class="normal">              <a href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS">NM_SETTING_WIRELESS_SECURITY_PSK</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"my really cool PSK"</span><span class="symbol">,</span>
 <span class="normal">              NULL</span><span class="symbol">);</span>
 <span class="function"><a href="libnm-NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_wsec</span><span class="symbol">));</span>
-<span class="normal">secrets_dict </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="libnm-NMConnection.html#nm-connection-to-dbus">nm_connection_to_dbus</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> NM_CONNECTION_SERIALIZE_ALL</span><span class="symbol">);</span>
+<span class="normal">secrets_dict </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="libnm-NMConnection.html#nm-connection-to-dbus">nm_connection_to_dbus</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> <a href="libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-ALL:CAPS">NM_CONNECTION_SERIALIZE_ALL</a></span><span class="symbol">);</span>
 
 <span class="symbol">(</span><span class="normal">call the NMSecretAgentOldGetSecretsFunc </span><span class="usertype">with</span><span class="normal"> secrets_dict</span><span class="symbol">)</span>
 
@@ -461,7 +459,6 @@ registered, or in the process of registering.</p>
 <div class="refsect3">
 <a name="id-1.3.3.8.5.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if registration was successful, <code class="literal">FALSE</code> on error.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -549,7 +546,6 @@ nm_secret_agent_old_register_finish (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.3.3.8.7.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if registration was successful, <code class="literal">FALSE</code> on error.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -594,7 +590,6 @@ registered.</p>
 <div class="refsect3">
 <a name="id-1.3.3.8.8.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if unregistration was successful, <code class="literal">FALSE</code> on error</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -682,7 +677,6 @@ nm_secret_agent_old_unregister_finish (<em class="parameter"><code><a class="lin
 <div class="refsect3">
 <a name="id-1.3.3.8.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if unregistration was successful, <code class="literal">FALSE</code> on error.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -708,7 +702,6 @@ nm_secret_agent_old_get_registered (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.3.3.8.11.5"></a><h4>Returns</h4>
 <p> a <code class="literal">TRUE</code> if the agent is registered, <code class="literal">FALSE</code> if it is not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -879,32 +872,24 @@ nm_secret_agent_old_delete_secrets (<em class="parameter"><code><a class="link"
 <a name="NM-SECRET-AGENT-OLD-IDENTIFIER:CAPS"></a><h3>NM_SECRET_AGENT_OLD_IDENTIFIER</h3>
 <pre class="programlisting">#define NM_SECRET_AGENT_OLD_IDENTIFIER          "identifier"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SECRET-AGENT-OLD-AUTO-REGISTER:CAPS"></a><h3>NM_SECRET_AGENT_OLD_AUTO_REGISTER</h3>
 <pre class="programlisting">#define NM_SECRET_AGENT_OLD_AUTO_REGISTER       "auto-register"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SECRET-AGENT-OLD-REGISTERED:CAPS"></a><h3>NM_SECRET_AGENT_OLD_REGISTERED</h3>
 <pre class="programlisting">#define NM_SECRET_AGENT_OLD_REGISTERED          "registered"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SECRET-AGENT-OLD-CAPABILITIES:CAPS"></a><h3>NM_SECRET_AGENT_OLD_CAPABILITIES</h3>
 <pre class="programlisting">#define NM_SECRET_AGENT_OLD_CAPABILITIES        "capabilities"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -912,7 +897,20 @@ nm_secret_agent_old_delete_secrets (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSecretAgentOld--auto-register"></a><h3>The <code class="literal">“auto-register”</code> property</h3>
 <pre class="programlisting">  “auto-register”            <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code> (the default), the agent will always be registered when
+NetworkManager is running; if NetworkManager exits and restarts, the
+agent will re-register itself automatically.</p>
+<p>In particular, if this property is <code class="literal">TRUE</code> at construct time, then the
+agent will register itself with NetworkManager during
+construction/initialization, and initialization will fail with an error
+if the agent is unable to register itself.</p>
+<p>If the property is <code class="literal">FALSE</code>, the agent will not automatically register with
+NetworkManager, and <a class="link" href="NMSecretAgentOld.html#nm-secret-agent-old-register" title="nm_secret_agent_old_register ()"><code class="function">nm_secret_agent_old_register()</code></a> or
+<a class="link" href="NMSecretAgentOld.html#nm-secret-agent-old-register-async" title="nm_secret_agent_old_register_async ()"><code class="function">nm_secret_agent_old_register_async()</code></a> must be called to register it.</p>
+<p>Calling <a class="link" href="NMSecretAgentOld.html#nm-secret-agent-old-unregister" title="nm_secret_agent_old_unregister ()"><code class="function">nm_secret_agent_old_unregister()</code></a> will suppress auto-registration
+until <a class="link" href="NMSecretAgentOld.html#nm-secret-agent-old-register" title="nm_secret_agent_old_register ()"><code class="function">nm_secret_agent_old_register()</code></a> is called, which re-enables
+auto-registration. This ensures that the agent remains un-registered when
+you expect it to be unregistered.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
@@ -920,14 +918,20 @@ nm_secret_agent_old_delete_secrets (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSecretAgentOld--capabilities"></a><h3>The <code class="literal">“capabilities”</code> property</h3>
 <pre class="programlisting">  “capabilities”             <a class="link" href="libnm-nm-dbus-interface.html#NMSecretAgentCapabilities" title="enum NMSecretAgentCapabilities"><span class="type">NMSecretAgentCapabilities</span></a></pre>
-<p></p>
+<p>A bitfield of <a class="link" href="libnm-nm-dbus-interface.html#NMSecretAgentCapabilities" title="enum NMSecretAgentCapabilities"><code class="literal">NMSecretAgentCapabilities</code></a>.</p>
 <p>Flags: Read / Write / Construct</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSecretAgentOld--identifier"></a><h3>The <code class="literal">“identifier”</code> property</h3>
 <pre class="programlisting">  “identifier”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Identifies this agent; only one agent in each user session may use the
+same identifier.  Identifier formatting follows the same rules as
+D-Bus bus names with the exception that the ':' character is not
+allowed.  The valid set of characters is "A-Z[0-9]_-." and the
+identifier is limited in length to 255 characters with a minimum
+of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
+(without quotes).</p>
 <p>Flags: Read / Write / Construct Only</p>
 <p>Default value: NULL</p>
 </div>
@@ -935,14 +939,13 @@ nm_secret_agent_old_delete_secrets (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSecretAgentOld--registered"></a><h3>The <code class="literal">“registered”</code> property</h3>
 <pre class="programlisting">  “registered”               <span class="type">gboolean</span></pre>
-<p></p>
+<p><code class="literal">TRUE</code> if the agent is registered with NetworkManager, <code class="literal">FALSE</code> if not.</p>
 <p>Flags: Read</p>
 <p>Default value: FALSE</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html
index 5e5d535b..43757b42 100644
--- a/docs/libnm/html/NMSetting.html
+++ b/docs/libnm/html/NMSetting.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSetting</title>
+<title>NMSetting: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSimpleConnection.html" title="NMSimpleConnection">
 <link rel="next" href="NMSettingConnection.html" title="NMSettingConnection">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -256,24 +256,18 @@ of properties and allowed values.</p>
 <a name="NM-SETTING-PARAM-REQUIRED:CAPS"></a><h3>NM_SETTING_PARAM_REQUIRED</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_REQUIRED     (1 &lt;&lt; (1 + G_PARAM_USER_SHIFT))
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PARAM-SECRET:CAPS"></a><h3>NM_SETTING_PARAM_SECRET</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_SECRET       (1 &lt;&lt; (2 + G_PARAM_USER_SHIFT))
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PARAM-FUZZY-IGNORE:CAPS"></a><h3>NM_SETTING_PARAM_FUZZY_IGNORE</h3>
 <pre class="programlisting">#define NM_SETTING_PARAM_FUZZY_IGNORE (1 &lt;&lt; (3 + G_PARAM_USER_SHIFT))
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -318,7 +312,6 @@ of properties and allowed values.</p>
 <div class="refsect3">
 <a name="id-1.4.4.8.5.5"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> to clear the secret, <code class="literal">FALSE</code> to not clear the secret</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -395,7 +388,6 @@ nm_setting_lookup_type (<em class="parameter"><code>const <span class="type">cha
 <p> the <span class="type">GType</span> of the setting's class, or <code class="literal">G_TYPE_INVALID</code> if
 <em class="parameter"><code>name</code></em>
 is not recognized.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -451,7 +443,6 @@ nm_setting_get_name (<em class="parameter"><code><a class="link" href="NMSetting
 <a name="id-1.4.4.8.9.6"></a><h4>Returns</h4>
 <p> a string containing the type name of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object,
 like 'ppp' or 'wireless' or 'wired'.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -499,7 +490,6 @@ is being verified in isolation. </p></td>
 <div class="refsect3">
 <a name="id-1.4.4.8.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the setting is valid, <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -542,7 +532,6 @@ for a description of each flag's behavior.</p>
 <div class="refsect3">
 <a name="id-1.4.4.8.11.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the comparison succeeds, <code class="literal">FALSE</code> if it does not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -605,7 +594,6 @@ in and the settings differ, a new one is created and returned. </p></td>
 <div class="refsect3">
 <a name="id-1.4.4.8.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the settings contain the same values, <code class="literal">FALSE</code> if they do not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -674,7 +662,6 @@ output format is not guaranteed to be stable and may change at any time.</p>
 <p> an allocated string containing a textual representation of the
 setting's properties and values (including secrets!), which the caller should
 free with <code class="function">g_free()</code></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -723,7 +710,6 @@ handle that secret.</p>
 <a name="id-1.4.4.8.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success (if the given secret name was a valid property of
 this setting, and if that property is secret), <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -772,7 +758,6 @@ handle that secret.</p>
 <a name="id-1.4.4.8.16.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success (if the given secret name was a valid property of
 this setting, and if that property is secret), <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -812,7 +797,6 @@ to get the type of</p></td>
 <p> the D-Bus marshalling type of <em class="parameter"><code>property</code></em>
 on <em class="parameter"><code>setting</code></em>
 .</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -822,8 +806,6 @@ on <em class="parameter"><code>setting</code></em>
 <a name="NM-SETTING-NAME:CAPS"></a><h3>NM_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_NAME "name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1064,7 +1046,6 @@ example "ppp" or "wireless" or "wired".</p>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html
index ba6aa73f..f9e3ae1b 100644
--- a/docs/libnm/html/NMSetting8021x.html
+++ b/docs/libnm/html/NMSetting8021x.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSetting8021x</title>
+<title>NMSetting8021x: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingConnection.html" title="NMSettingConnection">
 <link rel="next" href="NMSettingAdsl.html" title="NMSettingAdsl">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -767,6 +767,10 @@
 </colgroup>
 <tbody>
 <tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CERT-SCHEME-PREFIX-PATH:CAPS" title="NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH">NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH</a></td>
+</tr>
+<tr>
 <td class="datatype_keyword">enum</td>
 <td class="function_name"><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat">NMSetting8021xCKFormat</a></td>
 </tr>
@@ -950,7 +954,6 @@ nm_setting_802_1x_new (<em class="parameter"><code><span class="type">void</span
 <div class="refsect3">
 <a name="id-1.4.6.8.2.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -981,7 +984,6 @@ allowed EAP methods.</p>
 <div class="refsect3">
 <a name="id-1.4.6.8.3.6"></a><h4>Returns</h4>
 <p> the number of allowed EAP methods</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1018,7 +1020,6 @@ nm_setting_802_1x_get_eap_method (<em class="parameter"><code><a class="link" hr
 <a name="id-1.4.6.8.4.6"></a><h4>Returns</h4>
 <p> the name of the allowed EAP method at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1056,7 +1057,6 @@ allowed EAP methods.</p>
 <a name="id-1.4.6.8.5.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the EAP method was successfully added, <code class="literal">FALSE</code> if it was
 not a valid method or if it was already allowed.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1123,7 +1123,6 @@ nm_setting_802_1x_remove_eap_method_by_value
 <div class="refsect3">
 <a name="id-1.4.6.8.7.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the EAP method was founs and removed, <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1173,7 +1172,6 @@ authenticate the user.  Often this is a username or login name.</p>
 <div class="refsect3">
 <a name="id-1.4.6.8.9.6"></a><h4>Returns</h4>
 <p> the user identifier</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1204,7 +1202,6 @@ a secure form, if applicable for that EAP method.</p>
 <div class="refsect3">
 <a name="id-1.4.6.8.10.6"></a><h4>Returns</h4>
 <p> the anonymous identifier</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1231,7 +1228,6 @@ nm_setting_802_1x_get_pac_file (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.4.6.8.11.6"></a><h4>Returns</h4>
 <p> the PAC file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1263,7 +1259,6 @@ of these properties.</p>
 <div class="refsect3">
 <a name="id-1.4.6.8.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if a system CA certificate path should be used, <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1294,7 +1289,6 @@ certificates for verifying the network to client.</p>
 <div class="refsect3">
 <a name="id-1.4.6.8.13.6"></a><h4>Returns</h4>
 <p> the CA certificate directory path</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1325,7 +1319,6 @@ to add more CA certificates for verifying the network to client.</p>
 <div class="refsect3">
 <a name="id-1.4.6.8.14.6"></a><h4>Returns</h4>
 <p> the "phase 2" CA certificate directory path</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1354,7 +1347,6 @@ if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CA
 <div class="refsect3">
 <a name="id-1.4.6.8.15.6"></a><h4>Returns</h4>
 <p> scheme used to store the CA certificate (blob or path)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1418,7 +1410,6 @@ of the network cannot be confirmed by the client.</p>
 <div class="refsect3">
 <a name="id-1.4.6.8.17.6"></a><h4>Returns</h4>
 <p> path to the CA certificate file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1479,7 +1470,6 @@ clears the CA certificate.</p></td>
 <div class="refsect3">
 <a name="id-1.4.6.8.18.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the operation succeeded, <code class="literal">FALSE</code> if it was unsuccessful</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1508,7 +1498,6 @@ nm_setting_802_1x_get_subject_match (<em class="parameter"><code><a class="link"
 substring to be matched against the subject of the authentication
 server certificate, or <code class="literal">NULL</code> no subject verification is to be
 performed.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1537,7 +1526,6 @@ nm_setting_802_1x_get_num_altsubject_matches
 <div class="refsect3">
 <a name="id-1.4.6.8.20.6"></a><h4>Returns</h4>
 <p> the number of altsubject-matches entries.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1575,7 +1563,6 @@ nm_setting_802_1x_get_altsubject_match
 <a name="id-1.4.6.8.21.6"></a><h4>Returns</h4>
 <p> the altSubjectName match at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1614,7 +1601,6 @@ server is not verified.</p>
 <a name="id-1.4.6.8.22.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the alternative subject name match was
 successfully added, <code class="literal">FALSE</code> if it was already allowed.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1683,7 +1669,6 @@ nm_setting_802_1x_remove_altsubject_match_by_value
 <a name="id-1.4.6.8.24.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the alternative subject name match was found and removed,
 <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1736,7 +1721,6 @@ if <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CA
 <div class="refsect3">
 <a name="id-1.4.6.8.26.6"></a><h4>Returns</h4>
 <p> scheme used to store the client certificate (blob or path)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1796,7 +1780,6 @@ authentication method.</p>
 <div class="refsect3">
 <a name="id-1.4.6.8.28.6"></a><h4>Returns</h4>
 <p> path to the client certificate file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1861,7 +1844,6 @@ clears the client certificate.</p></td>
 <div class="refsect3">
 <a name="id-1.4.6.8.29.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the operation succeeded, <code class="literal">FALSE</code> if it was unsuccessful</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1889,7 +1871,6 @@ nm_setting_802_1x_get_phase1_peapver (<em class="parameter"><code><a class="link
 <p> the "phase 1" PEAP version to be used when authenticating with
 EAP-PEAP as contained in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peapver" title="The “phase1-peapver” property"><span class="type">“phase1-peapver”</span></a> property.  Valid
 values are <code class="literal">NULL</code> (unset), "0" (PEAP version 0), and "1" (PEAP version 1).</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1920,7 +1901,6 @@ used when authenticating with EAP-PEAP, as contained in the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-peaplabel" title="The “phase1-peaplabel” property"><span class="type">“phase1-peaplabel”</span></a> property.  Valid values are <code class="literal">NULL</code> (unset),
 "0" (use old-style label), and "1" (use new-style label).  See the
 wpa_supplicant documentation for more details.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1949,7 +1929,6 @@ nm_setting_802_1x_get_phase1_fast_provisioning
 <p> whether "phase 1" PEAP fast provisioning should be used, as specified
 by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase1-fast-provisioning" title="The “phase1-fast-provisioning” property"><span class="type">“phase1-fast-provisioning”</span></a> property.  See the
 wpa_supplicant documentation for more details.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1976,7 +1955,6 @@ nm_setting_802_1x_get_phase2_auth (<em class="parameter"><code><a class="link" h
 <a name="id-1.4.6.8.33.5"></a><h4>Returns</h4>
 <p> the "phase 2" non-EAP (ex MD5) allowed authentication method as
 specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title="The “phase2-auth” property"><span class="type">“phase2-auth”</span></a> property.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2003,7 +1981,6 @@ nm_setting_802_1x_get_phase2_autheap (<em class="parameter"><code><a class="link
 <a name="id-1.4.6.8.34.5"></a><h4>Returns</h4>
 <p> the "phase 2" EAP-based (ex TLS) allowed authentication method as
 specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title="The “phase2-autheap” property"><span class="type">“phase2-autheap”</span></a> property.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2034,7 +2011,6 @@ use <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-ca-cert-path
 <div class="refsect3">
 <a name="id-1.4.6.8.35.6"></a><h4>Returns</h4>
 <p> scheme used to store the "phase 2" CA certificate (blob or path)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2100,7 +2076,6 @@ of the network cannot be confirmed by the client.</p>
 <div class="refsect3">
 <a name="id-1.4.6.8.37.6"></a><h4>Returns</h4>
 <p> path to the "phase 2" CA certificate file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2161,7 +2136,6 @@ clears the "phase2" CA certificate.</p></td>
 <div class="refsect3">
 <a name="id-1.4.6.8.38.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the operation succeeded, <code class="literal">FALSE</code> if it was unsuccessful</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2191,7 +2165,6 @@ nm_setting_802_1x_get_phase2_subject_match
 the substring to be matched against the subject of the "phase 2"
 authentication server certificate, or <code class="literal">NULL</code> no subject verification
 is to be performed.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2220,7 +2193,6 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches
 <div class="refsect3">
 <a name="id-1.4.6.8.40.6"></a><h4>Returns</h4>
 <p> the number of phase2-altsubject-matches entries.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2258,7 +2230,6 @@ nm_setting_802_1x_get_phase2_altsubject_match
 <a name="id-1.4.6.8.41.6"></a><h4>Returns</h4>
 <p> the "phase 2" altSubjectName match at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2298,7 +2269,6 @@ connection</p></td>
 <a name="id-1.4.6.8.42.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the "phase 2" alternative subject name match was
 successfully added, <code class="literal">FALSE</code> if it was already allowed.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2367,7 +2337,6 @@ nm_setting_802_1x_remove_phase2_altsubject_match_by_value
 <a name="id-1.4.6.8.44.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the alternative subject name match for "phase 2" was found and removed,
 <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2422,7 +2391,6 @@ returned scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-C
 <div class="refsect3">
 <a name="id-1.4.6.8.46.6"></a><h4>Returns</h4>
 <p> scheme used to store the "phase 2" client certificate (blob or path)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2482,7 +2450,6 @@ authentication method.</p>
 <div class="refsect3">
 <a name="id-1.4.6.8.48.6"></a><h4>Returns</h4>
 <p> path to the "phase 2" client certificate file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2548,7 +2515,6 @@ clears the "phase2" client certificate.</p></td>
 <div class="refsect3">
 <a name="id-1.4.6.8.49.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the operation succeeded, <code class="literal">FALSE</code> if it was unsuccessful</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2575,7 +2541,6 @@ nm_setting_802_1x_get_password (<em class="parameter"><code><a class="link" href
 <a name="id-1.4.6.8.50.5"></a><h4>Returns</h4>
 <p> the password used by the authentication method, if any, as specified
 by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a> property</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2601,7 +2566,6 @@ nm_setting_802_1x_get_password_flags (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.4.6.8.51.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2657,7 +2621,6 @@ nm_setting_802_1x_get_password_raw_flags
 <a name="id-1.4.6.8.53.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--password-raw" title="The “password-raw” property"><span class="type">“password-raw”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2684,7 +2647,6 @@ nm_setting_802_1x_get_pin (<em class="parameter"><code><a class="link" href="NMS
 <a name="id-1.4.6.8.54.5"></a><h4>Returns</h4>
 <p> the PIN used by the authentication method, if any, as specified
 by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--pin" title="The “pin” property"><span class="type">“pin”</span></a> property</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2711,7 +2673,6 @@ nm_setting_802_1x_get_pin_flags (<em class="parameter"><code><a class="link" hre
 <a name="id-1.4.6.8.55.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--pin" title="The “pin” property"><span class="type">“pin”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2743,7 +2704,6 @@ nm_setting_802_1x_get_private_key_scheme
 <div class="refsect3">
 <a name="id-1.4.6.8.56.6"></a><h4>Returns</h4>
 <p> scheme used to store the private key (blob or path)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2806,7 +2766,6 @@ authentication method.</p>
 <div class="refsect3">
 <a name="id-1.4.6.8.58.6"></a><h4>Returns</h4>
 <p> path to the private key file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2894,7 +2853,6 @@ an error is returned.</p></td>
 <div class="refsect3">
 <a name="id-1.4.6.8.59.9"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the operation succeeded, <code class="literal">FALSE</code> if it was unsuccessful</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2923,7 +2881,6 @@ nm_setting_802_1x_get_private_key_password
 <p> the private key password used to decrypt the private key if
 previously set with <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a>, or the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title="The “private-key-password” property"><span class="type">“private-key-password”</span></a> property.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2951,7 +2908,6 @@ nm_setting_802_1x_get_private_key_password_flags
 <a name="id-1.4.6.8.61.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title="The “private-key-password” property"><span class="type">“private-key-password”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2979,7 +2935,6 @@ nm_setting_802_1x_get_private_key_format
 <a name="id-1.4.6.8.62.5"></a><h4>Returns</h4>
 <p> the data format of the private key data stored in the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title="The “private-key” property"><span class="type">“private-key”</span></a> property</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3011,7 +2966,6 @@ scheme is <a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-
 <div class="refsect3">
 <a name="id-1.4.6.8.63.6"></a><h4>Returns</h4>
 <p> scheme used to store the "phase 2" private key (blob or path)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3074,7 +3028,6 @@ authentication method.</p>
 <div class="refsect3">
 <a name="id-1.4.6.8.65.6"></a><h4>Returns</h4>
 <p> path to the "phase 2" private key file</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3164,7 +3117,6 @@ an error is returned.</p></td>
 <div class="refsect3">
 <a name="id-1.4.6.8.66.9"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the operation succeeded, <code class="literal">FALSE</code> if it was unsuccessful</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3193,7 +3145,6 @@ nm_setting_802_1x_get_phase2_private_key_password
 <p> the private key password used to decrypt the private key if
 previously set with <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()"><code class="function">nm_setting_802_1x_set_phase2_private_key()</code></a> or the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title="The “phase2-private-key-password” property"><span class="type">“phase2-private-key-password”</span></a> property.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3221,7 +3172,6 @@ nm_setting_802_1x_get_phase2_private_key_password_flags
 <a name="id-1.4.6.8.68.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title="The “phase2-private-key-password” property"><span class="type">“phase2-private-key-password”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3249,18 +3199,23 @@ nm_setting_802_1x_get_phase2_private_key_format
 <a name="id-1.4.6.8.69.5"></a><h4>Returns</h4>
 <p> the data format of the "phase 2" private key data stored in the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title="The “phase2-private-key” property"><span class="type">“phase2-private-key”</span></a> property</p>
-<p></p>
 </div>
 </div>
 </div>
 <div class="refsect1">
 <a name="NMSetting8021x.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
+<a name="NM-SETTING-802-1X-CERT-SCHEME-PREFIX-PATH:CAPS"></a><h3>NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH</h3>
+<pre class="programlisting">#define NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH "file://"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSetting8021xCKFormat"></a><h3>enum NMSetting8021xCKFormat</h3>
 <p><a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat"><span class="type">NMSetting8021xCKFormat</span></a> values indicate the general type of a certificate
 or private key</p>
 <div class="refsect3">
-<a name="id-1.4.6.9.2.4"></a><h4>Members</h4>
+<a name="id-1.4.6.9.3.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -3309,7 +3264,7 @@ and private key</p>
 stored in the setting properties, either as a blob of the item's data, or as
 a path to a certificate or private key file on the filesystem</p>
 <div class="refsect3">
-<a name="id-1.4.6.9.3.4"></a><h4>Members</h4>
+<a name="id-1.4.6.9.4.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -3350,264 +3305,198 @@ to a file containing the certificate or key data</p>
 <a name="NM-SETTING-802-1X-SETTING-NAME:CAPS"></a><h3>NM_SETTING_802_1X_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-EAP:CAPS"></a><h3>NM_SETTING_802_1X_EAP</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_EAP "eap"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-IDENTITY:CAPS"></a><h3>NM_SETTING_802_1X_IDENTITY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_IDENTITY "identity"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-ANONYMOUS-IDENTITY:CAPS"></a><h3>NM_SETTING_802_1X_ANONYMOUS_IDENTITY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PAC-FILE:CAPS"></a><h3>NM_SETTING_802_1X_PAC_FILE</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PAC_FILE "pac-file"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-CA-CERT:CAPS"></a><h3>NM_SETTING_802_1X_CA_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_CA_CERT "ca-cert"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-CA-PATH:CAPS"></a><h3>NM_SETTING_802_1X_CA_PATH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_CA_PATH "ca-path"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-SUBJECT-MATCH:CAPS"></a><h3>NM_SETTING_802_1X_SUBJECT_MATCH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-ALTSUBJECT-MATCHES:CAPS"></a><h3>NM_SETTING_802_1X_ALTSUBJECT_MATCHES</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-CLIENT-CERT:CAPS"></a><h3>NM_SETTING_802_1X_CLIENT_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE1-PEAPVER:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_PEAPVER</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE1-PEAPLABEL:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_PEAPLABEL</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE1-FAST-PROVISIONING:CAPS"></a><h3>NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-AUTH:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_AUTH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-AUTHEAP:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_AUTHEAP</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-CA-CERT:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CA_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-CA-PATH:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CA_PATH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-SUBJECT-MATCH:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-ALTSUBJECT-MATCHES:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-CLIENT-CERT:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_CLIENT_CERT</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD "password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PASSWORD-RAW:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD_RAW</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD_RAW "password-raw"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PASSWORD-RAW-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PASSWORD_RAW_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PASSWORD_RAW_FLAGS "password-raw-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PRIVATE-KEY:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PHASE2-PRIVATE-KEY-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PIN:CAPS"></a><h3>NM_SETTING_802_1X_PIN</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PIN "pin"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-PIN-FLAGS:CAPS"></a><h3>NM_SETTING_802_1X_PIN_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS"></a><h3>NM_SETTING_802_1X_SYSTEM_CA_CERTS</h3>
 <pre class="programlisting">#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -3615,14 +3504,18 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--altsubject-matches"></a><h3>The <code class="literal">“altsubject-matches”</code> property</h3>
 <pre class="programlisting">  “altsubject-matches”       <span class="type">GStrv</span></pre>
-<p></p>
+<p>List of strings to be matched against the altSubjectName of the
+certificate presented by the authentication server. If the list is empty,
+no verification of the server certificate's altSubjectName is performed.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--anonymous-identity"></a><h3>The <code class="literal">“anonymous-identity”</code> property</h3>
 <pre class="programlisting">  “anonymous-identity”       <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Anonymous identity string for EAP authentication methods.  Used as the
+unencrypted identity with EAP types that support different tunneled
+identity like EAP-TTLS.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3630,14 +3523,27 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--ca-cert"></a><h3>The <code class="literal">“ca-cert”</code> property</h3>
 <pre class="programlisting">  “ca-cert”                  <span class="type">GBytes</span> *</pre>
-<p></p>
+<p>Contains the CA certificate if used by the EAP method specified in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.</p>
+<p>Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte. This
+property can be unset even if the EAP method supports CA certificates,
+but this allows man-in-the-middle attacks and is NOT recommended.</p>
+<p>Setting this property directly is discouraged; use the
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-ca-cert" title="nm_setting_802_1x_set_ca_cert ()"><code class="function">nm_setting_802_1x_set_ca_cert()</code></a> function instead.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--ca-path"></a><h3>The <code class="literal">“ca-path”</code> property</h3>
 <pre class="programlisting">  “ca-path”                  <span class="type">gchar</span> *</pre>
-<p></p>
+<p>UTF-8 encoded path to a directory containing PEM or DER formatted
+certificates to be added to the verification chain in addition to the
+certificate specified in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--ca-cert" title="The “ca-cert” property"><span class="type">“ca-cert”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3645,21 +3551,35 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--client-cert"></a><h3>The <code class="literal">“client-cert”</code> property</h3>
 <pre class="programlisting">  “client-cert”              <span class="type">GBytes</span> *</pre>
-<p></p>
+<p>Contains the client certificate if used by the EAP method specified in
+the <a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.</p>
+<p>Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte.</p>
+<p>Setting this property directly is discouraged; use the
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-client-cert" title="nm_setting_802_1x_set_client_cert ()"><code class="function">nm_setting_802_1x_set_client_cert()</code></a> function instead.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--eap"></a><h3>The <code class="literal">“eap”</code> property</h3>
 <pre class="programlisting">  “eap”                      <span class="type">GStrv</span></pre>
-<p></p>
+<p>The allowed EAP method to be used when authenticating to the network with
+802.1x.  Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd",
+and "fast".  Each method requires different configuration using the
+properties of this setting; refer to wpa_supplicant documentation for the
+allowed combinations.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--identity"></a><h3>The <code class="literal">“identity”</code> property</h3>
 <pre class="programlisting">  “identity”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Identity string for EAP authentication methods.  Often the user's user or
+login name.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3667,7 +3587,7 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--pac-file"></a><h3>The <code class="literal">“pac-file”</code> property</h3>
 <pre class="programlisting">  “pac-file”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>UTF-8 encoded file path containing PAC for EAP-FAST.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3675,7 +3595,9 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--password"></a><h3>The <code class="literal">“password”</code> property</h3>
 <pre class="programlisting">  “password”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>UTF-8 encoded password used for EAP authentication methods. If both the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a> property and the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password-raw" title="The “password-raw” property"><span class="type">“password-raw”</span></a>
+property are specified, <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a> is preferred.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3683,28 +3605,36 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--password-flags"></a><h3>The <code class="literal">“password-flags”</code> property</h3>
 <pre class="programlisting">  “password-flags”           <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--password-raw"></a><h3>The <code class="literal">“password-raw”</code> property</h3>
 <pre class="programlisting">  “password-raw”             <span class="type">GBytes</span> *</pre>
-<p></p>
+<p>Password used for EAP authentication methods, given as a byte array to
+allow passwords in other encodings than UTF-8 to be used. If both the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a> property and the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password-raw" title="The “password-raw” property"><span class="type">“password-raw”</span></a>
+property are specified, <a class="link" href="NMSetting8021x.html#NMSetting8021x--password" title="The “password” property"><span class="type">“password”</span></a> is preferred.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--password-raw-flags"></a><h3>The <code class="literal">“password-raw-flags”</code> property</h3>
 <pre class="programlisting">  “password-raw-flags”       <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSetting8021x.html#NMSetting8021x--password-raw" title="The “password-raw” property"><span class="type">“password-raw”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--phase1-fast-provisioning"></a><h3>The <code class="literal">“phase1-fast-provisioning”</code> property</h3>
 <pre class="programlisting">  “phase1-fast-provisioning” <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Enables or disables in-line provisioning of EAP-FAST credentials when
+FAST is specified as the EAP method in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.
+Recognized values are "0" (disabled), "1" (allow unauthenticated
+provisioning), "2" (allow authenticated provisioning), and "3" (allow
+both authenticated and unauthenticated provisioning).  See the
+wpa_supplicant documentation for more details.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3712,7 +3642,10 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase1-peaplabel"></a><h3>The <code class="literal">“phase1-peaplabel”</code> property</h3>
 <pre class="programlisting">  “phase1-peaplabel”         <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Forces use of the new PEAP label during key derivation.  Some RADIUS
+servers may require forcing the new PEAP label to interoperate with
+PEAPv1.  Set to "1" to force use of the new PEAP label.  See the
+wpa_supplicant documentation for more details.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3720,7 +3653,12 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase1-peapver"></a><h3>The <code class="literal">“phase1-peapver”</code> property</h3>
 <pre class="programlisting">  “phase1-peapver”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Forces which PEAP version is used when PEAP is set as the EAP method in
+the <a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.  When unset, the version reported by
+the server will be used.  Sometimes when using older RADIUS servers, it
+is necessary to force the client to use a particular PEAP version.  To do
+so, this property may be set to "0" or "1" to force that specific PEAP
+version.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3728,14 +3666,22 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-altsubject-matches"></a><h3>The <code class="literal">“phase2-altsubject-matches”</code> property</h3>
 <pre class="programlisting">  “phase2-altsubject-matches” <span class="type">GStrv</span></pre>
-<p></p>
+<p>List of strings to be matched against the altSubjectName of the
+certificate presented by the authentication server during the inner
+"phase 2" authentication. If the list is empty, no verification of the
+server certificate's altSubjectName is performed.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-auth"></a><h3>The <code class="literal">“phase2-auth”</code> property</h3>
 <pre class="programlisting">  “phase2-auth”              <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Specifies the allowed "phase 2" inner non-EAP authentication methods when
+an EAP method that uses an inner TLS tunnel is specified in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.  Recognized non-EAP "phase 2" methods are
+"pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls".
+Each "phase 2" inner method requires specific parameters for successful
+authentication; see the wpa_supplicant documentation for more details.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3743,7 +3689,12 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-autheap"></a><h3>The <code class="literal">“phase2-autheap”</code> property</h3>
 <pre class="programlisting">  “phase2-autheap”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Specifies the allowed "phase 2" inner EAP-based authentication methods
+when an EAP method that uses an inner TLS tunnel is specified in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.  Recognized EAP-based "phase 2" methods are
+"md5", "mschapv2", "otp", "gtc", and "tls". Each "phase 2" inner method
+requires specific parameters for successful authentication; see the
+wpa_supplicant documentation for more details.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3751,14 +3702,28 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-ca-cert"></a><h3>The <code class="literal">“phase2-ca-cert”</code> property</h3>
 <pre class="programlisting">  “phase2-ca-cert”           <span class="type">GBytes</span> *</pre>
-<p></p>
+<p>Contains the "phase 2" CA certificate if used by the EAP method specified
+in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title="The “phase2-auth” property"><span class="type">“phase2-auth”</span></a> or <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title="The “phase2-autheap” property"><span class="type">“phase2-autheap”</span></a>
+properties.</p>
+<p>Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte. This
+property can be unset even if the EAP method supports CA certificates,
+but this allows man-in-the-middle attacks and is NOT recommended.</p>
+<p>Setting this property directly is discouraged; use the
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-ca-cert" title="nm_setting_802_1x_set_phase2_ca_cert ()"><code class="function">nm_setting_802_1x_set_phase2_ca_cert()</code></a> function instead.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-ca-path"></a><h3>The <code class="literal">“phase2-ca-path”</code> property</h3>
 <pre class="programlisting">  “phase2-ca-path”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>UTF-8 encoded path to a directory containing PEM or DER formatted
+certificates to be added to the verification chain in addition to the
+certificate specified in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-ca-cert" title="The “phase2-ca-cert” property"><span class="type">“phase2-ca-cert”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3766,21 +3731,58 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-client-cert"></a><h3>The <code class="literal">“phase2-client-cert”</code> property</h3>
 <pre class="programlisting">  “phase2-client-cert”       <span class="type">GBytes</span> *</pre>
-<p></p>
+<p>Contains the "phase 2" client certificate if used by the EAP method
+specified in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title="The “phase2-auth” property"><span class="type">“phase2-auth”</span></a> or
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title="The “phase2-autheap” property"><span class="type">“phase2-autheap”</span></a> properties.</p>
+<p>Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte. This
+property can be unset even if the EAP method supports CA certificates,
+but this allows man-in-the-middle attacks and is NOT recommended.</p>
+<p>Setting this property directly is discouraged; use the
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-client-cert" title="nm_setting_802_1x_set_phase2_client_cert ()"><code class="function">nm_setting_802_1x_set_phase2_client_cert()</code></a> function instead.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-private-key"></a><h3>The <code class="literal">“phase2-private-key”</code> property</h3>
 <pre class="programlisting">  “phase2-private-key”       <span class="type">GBytes</span> *</pre>
-<p></p>
+<p>Contains the "phase 2" inner private key when the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-auth" title="The “phase2-auth” property"><span class="type">“phase2-auth”</span></a> or <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-autheap" title="The “phase2-autheap” property"><span class="type">“phase2-autheap”</span></a> property is
+set to "tls".</p>
+<p>Key data is specified using a "scheme"; two are currently supported: blob
+and path. When using the blob scheme and private keys, this property
+should be set to the key's encrypted PEM encoded data. When using private
+keys with the path scheme, this property should be set to the full UTF-8
+encoded path of the key, prefixed with the string "file://" and ending
+with a terminating NUL byte. When using PKCS#12 format private
+keys and the blob scheme, this property should be set to the
+PKCS#12 data and the <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title="The “phase2-private-key-password” property"><span class="type">“phase2-private-key-password”</span></a>
+property must be set to password used to decrypt the PKCS#12
+certificate and key. When using PKCS#12 files and the path
+scheme, this property should be set to the full UTF-8 encoded path of the
+key, prefixed with the string "file://" and and ending with a terminating
+NUL byte, and as with the blob scheme the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title="The “phase2-private-key-password” property"><span class="type">“phase2-private-key-password”</span></a> property must be set to the
+password used to decode the PKCS#12 private key and certificate.</p>
+<p>Setting this property directly is discouraged; use the
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()"><code class="function">nm_setting_802_1x_set_phase2_private_key()</code></a> function instead.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-private-key-password"></a><h3>The <code class="literal">“phase2-private-key-password”</code> property</h3>
 <pre class="programlisting">  “phase2-private-key-password” <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The password used to decrypt the "phase 2" private key specified in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key" title="The “phase2-private-key” property"><span class="type">“phase2-private-key”</span></a> property when the private key either
+uses the path scheme, or is a PKCS#12 format key.  Setting this
+property directly is not generally necessary except when returning
+secrets to NetworkManager; it is generally set automatically when setting
+the private key by the <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-phase2-private-key" title="nm_setting_802_1x_set_phase2_private_key ()"><code class="function">nm_setting_802_1x_set_phase2_private_key()</code></a>
+function.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3788,14 +3790,18 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-private-key-password-flags"></a><h3>The <code class="literal">“phase2-private-key-password-flags”</code> property</h3>
 <pre class="programlisting">  “phase2-private-key-password-flags” <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a></pre>
-<p></p>
+<p>Flags indicating how to handle the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-private-key-password" title="The “phase2-private-key-password” property"><span class="type">“phase2-private-key-password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-subject-match"></a><h3>The <code class="literal">“phase2-subject-match”</code> property</h3>
 <pre class="programlisting">  “phase2-subject-match”     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Substring to be matched against the subject of the certificate presented
+by the authentication server during the inner "phase 2"
+authentication. When unset, no verification of the authentication server
+certificate's subject is performed.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3803,7 +3809,7 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--pin"></a><h3>The <code class="literal">“pin”</code> property</h3>
 <pre class="programlisting">  “pin”                      <span class="type">gchar</span> *</pre>
-<p></p>
+<p>PIN used for EAP authentication methods.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3811,21 +3817,49 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--pin-flags"></a><h3>The <code class="literal">“pin-flags”</code> property</h3>
 <pre class="programlisting">  “pin-flags”                <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSetting8021x.html#NMSetting8021x--pin" title="The “pin” property"><span class="type">“pin”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--private-key"></a><h3>The <code class="literal">“private-key”</code> property</h3>
 <pre class="programlisting">  “private-key”              <span class="type">GBytes</span> *</pre>
-<p></p>
+<p>Contains the private key when the <a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property is set to
+"tls".</p>
+<p>Key data is specified using a "scheme"; two are currently supported: blob
+and path. When using the blob scheme and private keys, this property
+should be set to the key's encrypted PEM encoded data. When using private
+keys with the path scheme, this property should be set to the full UTF-8
+encoded path of the key, prefixed with the string "file://" and ending
+with a terminating NUL byte. When using PKCS#12 format private
+keys and the blob scheme, this property should be set to the
+PKCS#12 data and the <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title="The “private-key-password” property"><span class="type">“private-key-password”</span></a>
+property must be set to password used to decrypt the PKCS#12
+certificate and key. When using PKCS#12 files and the path
+scheme, this property should be set to the full UTF-8 encoded path of the
+key, prefixed with the string "file://" and and ending with a terminating
+NUL byte, and as with the blob scheme the "private-key-password" property
+must be set to the password used to decode the PKCS#12 private
+key and certificate.</p>
+<p>Setting this property directly is discouraged; use the
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a> function instead.</p>
+<p>WARNING: <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title="The “private-key” property"><span class="type">“private-key”</span></a> is not a "secret" property, and thus
+unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a
+private key password to prevent unauthorized access to unencrypted
+private key data.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--private-key-password"></a><h3>The <code class="literal">“private-key-password”</code> property</h3>
 <pre class="programlisting">  “private-key-password”     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The password used to decrypt the private key specified in the
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key" title="The “private-key” property"><span class="type">“private-key”</span></a> property when the private key either uses the
+path scheme, or if the private key is a PKCS#12 format key.  Setting this
+property directly is not generally necessary except when returning
+secrets to NetworkManager; it is generally set automatically when setting
+the private key by the <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-set-private-key" title="nm_setting_802_1x_set_private_key ()"><code class="function">nm_setting_802_1x_set_private_key()</code></a> function.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3833,14 +3867,17 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--private-key-password-flags"></a><h3>The <code class="literal">“private-key-password-flags”</code> property</h3>
 <pre class="programlisting">  “private-key-password-flags” <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSetting8021x.html#NMSetting8021x--private-key-password" title="The “private-key-password” property"><span class="type">“private-key-password”</span></a>
+property.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSetting8021x--subject-match"></a><h3>The <code class="literal">“subject-match”</code> property</h3>
 <pre class="programlisting">  “subject-match”            <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Substring to be matched against the subject of the certificate presented
+by the authentication server. When unset, no verification of the
+authentication server certificate's subject is performed.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3848,14 +3885,21 @@ to a file containing the certificate or key data</p>
 <div class="refsect2">
 <a name="NMSetting8021x--system-ca-certs"></a><h3>The <code class="literal">“system-ca-certs”</code> property</h3>
 <pre class="programlisting">  “system-ca-certs”          <span class="type">gboolean</span></pre>
-<p></p>
+<p>When <code class="literal">TRUE</code>, overrides the <a class="link" href="NMSetting8021x.html#NMSetting8021x--ca-path" title="The “ca-path” property"><span class="type">“ca-path”</span></a> and
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-ca-path" title="The “phase2-ca-path” property"><span class="type">“phase2-ca-path”</span></a> properties using the system CA directory
+specified at configure time with the --system-ca-path switch.  The
+certificates in this directory are added to the verification chain in
+addition to any certificates specified by the <a class="link" href="NMSetting8021x.html#NMSetting8021x--ca-cert" title="The “ca-cert” property"><span class="type">“ca-cert”</span></a> and
+<a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-ca-cert" title="The “phase2-ca-cert” property"><span class="type">“phase2-ca-cert”</span></a> properties. If the path provided with
+--system-ca-path is rather a file name (bundle of trusted CA certificates),
+it overrides <a class="link" href="NMSetting8021x.html#NMSetting8021x--ca-cert" title="The “ca-cert” property"><span class="type">“ca-cert”</span></a> and <a class="link" href="NMSetting8021x.html#NMSetting8021x--phase2-ca-cert" title="The “phase2-ca-cert” property"><span class="type">“phase2-ca-cert”</span></a>
+properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingAdsl.html b/docs/libnm/html/NMSettingAdsl.html
index f96005af..3b890722 100644
--- a/docs/libnm/html/NMSettingAdsl.html
+++ b/docs/libnm/html/NMSettingAdsl.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingAdsl</title>
+<title>NMSettingAdsl: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSetting8021x.html" title="NMSetting8021x">
 <link rel="next" href="NMSettingBluetooth.html" title="NMSettingBluetooth">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -240,7 +240,6 @@ nm_setting_adsl_new (<em class="parameter"><code><span class="type">void</span><
 <div class="refsect3">
 <a name="id-1.4.7.8.2.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -266,7 +265,6 @@ nm_setting_adsl_get_username (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.7.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--username" title="The “username” property"><span class="type">“username”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -292,7 +290,6 @@ nm_setting_adsl_get_password (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.7.8.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--password" title="The “password” property"><span class="type">“password”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -318,7 +315,6 @@ nm_setting_adsl_get_protocol (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.7.8.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--protocol" title="The “protocol” property"><span class="type">“protocol”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -344,7 +340,6 @@ nm_setting_adsl_get_encapsulation (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.4.7.8.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--encapsulation" title="The “encapsulation” property"><span class="type">“encapsulation”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -370,7 +365,6 @@ nm_setting_adsl_get_vpi (<em class="parameter"><code><a class="link" href="NMSet
 <div class="refsect3">
 <a name="id-1.4.7.8.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--vpi" title="The “vpi” property"><span class="type">“vpi”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -396,7 +390,6 @@ nm_setting_adsl_get_vci (<em class="parameter"><code><a class="link" href="NMSet
 <div class="refsect3">
 <a name="id-1.4.7.8.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--vci" title="The “vci” property"><span class="type">“vci”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -422,7 +415,6 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.7.8.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--password" title="The “password” property"><span class="type">“password”</span></a></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -432,104 +424,78 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 <a name="NM-SETTING-ADSL-SETTING-NAME:CAPS"></a><h3>NM_SETTING_ADSL_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_SETTING_NAME "adsl"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-USERNAME:CAPS"></a><h3>NM_SETTING_ADSL_USERNAME</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_USERNAME            "username"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-PASSWORD:CAPS"></a><h3>NM_SETTING_ADSL_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_PASSWORD            "password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_ADSL_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_PASSWORD_FLAGS      "password-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-PROTOCOL:CAPS"></a><h3>NM_SETTING_ADSL_PROTOCOL</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_PROTOCOL            "protocol"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-ENCAPSULATION:CAPS"></a><h3>NM_SETTING_ADSL_ENCAPSULATION</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_ENCAPSULATION       "encapsulation"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-VPI:CAPS"></a><h3>NM_SETTING_ADSL_VPI</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_VPI                 "vpi"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-VCI:CAPS"></a><h3>NM_SETTING_ADSL_VCI</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_VCI                 "vci"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-PROTOCOL-PPPOA:CAPS"></a><h3>NM_SETTING_ADSL_PROTOCOL_PPPOA</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_PROTOCOL_PPPOA      "pppoa"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-PROTOCOL-PPPOE:CAPS"></a><h3>NM_SETTING_ADSL_PROTOCOL_PPPOE</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_PROTOCOL_PPPOE      "pppoe"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-PROTOCOL-IPOATM:CAPS"></a><h3>NM_SETTING_ADSL_PROTOCOL_IPOATM</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_PROTOCOL_IPOATM     "ipoatm"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-ENCAPSULATION-VCMUX:CAPS"></a><h3>NM_SETTING_ADSL_ENCAPSULATION_VCMUX</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-ADSL-ENCAPSULATION-LLC:CAPS"></a><h3>NM_SETTING_ADSL_ENCAPSULATION_LLC</h3>
 <pre class="programlisting">#define NM_SETTING_ADSL_ENCAPSULATION_LLC   "llc"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -537,7 +503,7 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSettingAdsl--encapsulation"></a><h3>The <code class="literal">“encapsulation”</code> property</h3>
 <pre class="programlisting">  “encapsulation”            <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Encapsulation of ADSL connection.  Can be "vcmux" or "llc".</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -545,7 +511,7 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSettingAdsl--password"></a><h3>The <code class="literal">“password”</code> property</h3>
 <pre class="programlisting">  “password”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Password used to authenticate with the ADSL service.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -553,14 +519,14 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSettingAdsl--password-flags"></a><h3>The <code class="literal">“password-flags”</code> property</h3>
 <pre class="programlisting">  “password-flags”           <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--password" title="The “password” property"><span class="type">“password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingAdsl--protocol"></a><h3>The <code class="literal">“protocol”</code> property</h3>
 <pre class="programlisting">  “protocol”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>ADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -568,7 +534,7 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSettingAdsl--username"></a><h3>The <code class="literal">“username”</code> property</h3>
 <pre class="programlisting">  “username”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Username used to authenticate with the ADSL service.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -576,7 +542,7 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSettingAdsl--vci"></a><h3>The <code class="literal">“vci”</code> property</h3>
 <pre class="programlisting">  “vci”                      <span class="type">guint</span></pre>
-<p></p>
+<p>VCI of ADSL connection</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 65536</p>
 <p>Default value: 0</p>
@@ -585,7 +551,7 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSettingAdsl--vpi"></a><h3>The <code class="literal">“vpi”</code> property</h3>
 <pre class="programlisting">  “vpi”                      <span class="type">guint</span></pre>
-<p></p>
+<p>VPI of ADSL connection</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &lt;= 65536</p>
 <p>Default value: 0</p>
@@ -593,7 +559,6 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBluetooth.html b/docs/libnm/html/NMSettingBluetooth.html
index 89118318..dc9095c9 100644
--- a/docs/libnm/html/NMSettingBluetooth.html
+++ b/docs/libnm/html/NMSettingBluetooth.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingBluetooth</title>
+<title>NMSettingBluetooth: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingAdsl.html" title="NMSettingAdsl">
 <link rel="next" href="NMSettingBond.html" title="NMSettingBond">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -173,7 +173,6 @@ describes a connection to.</p>
 <div class="refsect3">
 <a name="id-1.4.8.8.3.6"></a><h4>Returns</h4>
 <p> the Bluetooth address</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -203,7 +202,6 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).</p>
 <a name="id-1.4.8.8.4.6"></a><h4>Returns</h4>
 <p> the type, either <a class="link" href="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-TYPE-PANU:CAPS" title="NM_SETTING_BLUETOOTH_TYPE_PANU"><code class="literal">NM_SETTING_BLUETOOTH_TYPE_PANU</code></a> or
 <a class="link" href="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-TYPE-DUN:CAPS" title="NM_SETTING_BLUETOOTH_TYPE_DUN"><code class="literal">NM_SETTING_BLUETOOTH_TYPE_DUN</code></a></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -213,24 +211,18 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).</p>
 <a name="NM-SETTING-BLUETOOTH-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BLUETOOTH_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-BDADDR:CAPS"></a><h3>NM_SETTING_BLUETOOTH_BDADDR</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BLUETOOTH-TYPE:CAPS"></a><h3>NM_SETTING_BLUETOOTH_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_BLUETOOTH_TYPE      "type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -254,7 +246,7 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.</p>
 <div class="refsect2">
 <a name="NMSettingBluetooth--bdaddr"></a><h3>The <code class="literal">“bdaddr”</code> property</h3>
 <pre class="programlisting">  “bdaddr”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The Bluetooth address of the device.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -262,14 +254,14 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.</p>
 <div class="refsect2">
 <a name="NMSettingBluetooth--type"></a><h3>The <code class="literal">“type”</code> property</h3>
 <pre class="programlisting">  “type”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Either "dun" for Dial-Up Networking connections or "panu" for Personal
+Area Networking connections to devices supporting the NAP profile.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html
index 3df3d490..edf00c34 100644
--- a/docs/libnm/html/NMSettingBond.html
+++ b/docs/libnm/html/NMSettingBond.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingBond</title>
+<title>NMSettingBond: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingBluetooth.html" title="NMSettingBluetooth">
 <link rel="next" href="NMSettingBridge.html" title="NMSettingBridge">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -259,7 +259,6 @@ using <a class="link" href="NMSettingBond.html#nm-setting-bond-get-option" title
 <div class="refsect3">
 <a name="id-1.4.9.8.3.6"></a><h4>Returns</h4>
 <p> the number of bonding options</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -316,7 +315,6 @@ modified. </p></td>
 <p> <code class="literal">TRUE</code> on success if the index was valid and an option was found,
 <code class="literal">FALSE</code> if the index was invalid (ie, greater than the number of options
 currently held by the setting)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -354,7 +352,6 @@ nm_setting_bond_get_option_by_name (<em class="parameter"><code><a class="link"
 <a name="id-1.4.9.8.5.6"></a><h4>Returns</h4>
 <p> the value, or <code class="literal">NULL</code> if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -401,7 +398,6 @@ that conflict with each other.</p>
 <a name="id-1.4.9.8.6.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the option was valid and was added to the internal option
 list, <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -439,7 +435,6 @@ list.</p>
 <a name="id-1.4.9.8.7.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the option was found and removed from the internal option
 list, <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -482,7 +477,6 @@ the <em class="parameter"><code>name</code></em>
 is valid for the given name.
 If the <em class="parameter"><code>name</code></em>
 is not a valid option, <code class="literal">FALSE</code> will be returned.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -544,7 +538,6 @@ nm_setting_bond_get_option_default (<em class="parameter"><code><a class="link"
 <a name="id-1.4.9.8.10.5"></a><h4>Returns</h4>
 <p> the value of the bond option if not overridden by an entry in
 the <a class="link" href="NMSettingBond.html#NMSettingBond--options" title="The “options” property"><span class="type">“options”</span></a> property.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -554,136 +547,102 @@ the <a class="link" href="NMSettingBond.html#NMSettingBond--options" title="The
 <a name="NM-SETTING-BOND-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BOND_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_SETTING_NAME "bond"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTIONS:CAPS"></a><h3>NM_SETTING_BOND_OPTIONS</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTIONS "options"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-MODE:CAPS"></a><h3>NM_SETTING_BOND_OPTION_MODE</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_MODE             "mode"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-MIIMON:CAPS"></a><h3>NM_SETTING_BOND_OPTION_MIIMON</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_MIIMON           "miimon"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-DOWNDELAY:CAPS"></a><h3>NM_SETTING_BOND_OPTION_DOWNDELAY</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_DOWNDELAY        "downdelay"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-UPDELAY:CAPS"></a><h3>NM_SETTING_BOND_OPTION_UPDELAY</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_UPDELAY          "updelay"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-ARP-INTERVAL:CAPS"></a><h3>NM_SETTING_BOND_OPTION_ARP_INTERVAL</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_ARP_INTERVAL     "arp_interval"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-ARP-IP-TARGET:CAPS"></a><h3>NM_SETTING_BOND_OPTION_ARP_IP_TARGET</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET    "arp_ip_target"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-ARP-VALIDATE:CAPS"></a><h3>NM_SETTING_BOND_OPTION_ARP_VALIDATE</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_ARP_VALIDATE     "arp_validate"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-PRIMARY:CAPS"></a><h3>NM_SETTING_BOND_OPTION_PRIMARY</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_PRIMARY          "primary"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-PRIMARY-RESELECT:CAPS"></a><h3>NM_SETTING_BOND_OPTION_PRIMARY_RESELECT</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_PRIMARY_RESELECT "primary_reselect"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-FAIL-OVER-MAC:CAPS"></a><h3>NM_SETTING_BOND_OPTION_FAIL_OVER_MAC</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_FAIL_OVER_MAC    "fail_over_mac"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-USE-CARRIER:CAPS"></a><h3>NM_SETTING_BOND_OPTION_USE_CARRIER</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_USE_CARRIER      "use_carrier"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-AD-SELECT:CAPS"></a><h3>NM_SETTING_BOND_OPTION_AD_SELECT</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_AD_SELECT        "ad_select"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-XMIT-HASH-POLICY:CAPS"></a><h3>NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY "xmit_hash_policy"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-RESEND-IGMP:CAPS"></a><h3>NM_SETTING_BOND_OPTION_RESEND_IGMP</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_RESEND_IGMP      "resend_igmp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BOND-OPTION-LACP-RATE:CAPS"></a><h3>NM_SETTING_BOND_OPTION_LACP_RATE</h3>
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_LACP_RATE        "lacp_rate"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -691,13 +650,15 @@ 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”                  <span class="type">GHashTable</span> *</pre>
-<p></p>
+<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>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html
index addccbb4..05bbe151 100644
--- a/docs/libnm/html/NMSettingBridge.html
+++ b/docs/libnm/html/NMSettingBridge.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingBridge</title>
+<title>NMSettingBridge: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingBond.html" title="NMSettingBond">
 <link rel="next" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -246,7 +246,6 @@ nm_setting_bridge_get_mac_address (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.4.10.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -272,7 +271,6 @@ nm_setting_bridge_get_stp (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="id-1.4.10.8.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--stp" title="The “stp” property"><span class="type">“stp”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -298,7 +296,6 @@ nm_setting_bridge_get_priority (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.4.10.8.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--priority" title="The “priority” property"><span class="type">“priority”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -324,7 +321,6 @@ nm_setting_bridge_get_forward_delay (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.10.8.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--forward-delay" title="The “forward-delay” property"><span class="type">“forward-delay”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -350,7 +346,6 @@ nm_setting_bridge_get_hello_time (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.4.10.8.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--hello-time" title="The “hello-time” property"><span class="type">“hello-time”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -376,7 +371,6 @@ nm_setting_bridge_get_max_age (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.4.10.8.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--max-age" title="The “max-age” property"><span class="type">“max-age”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -402,7 +396,6 @@ nm_setting_bridge_get_ageing_time (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.4.10.8.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--ageing-time" title="The “ageing-time” property"><span class="type">“ageing-time”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -412,64 +405,48 @@ nm_setting_bridge_get_ageing_time (<em class="parameter"><code><a class="link" h
 <a name="NM-SETTING-BRIDGE-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BRIDGE_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_BRIDGE_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_MAC_ADDRESS    "mac-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-STP:CAPS"></a><h3>NM_SETTING_BRIDGE_STP</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_STP            "stp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-PRIORITY:CAPS"></a><h3>NM_SETTING_BRIDGE_PRIORITY</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_PRIORITY       "priority"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-FORWARD-DELAY:CAPS"></a><h3>NM_SETTING_BRIDGE_FORWARD_DELAY</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-HELLO-TIME:CAPS"></a><h3>NM_SETTING_BRIDGE_HELLO_TIME</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-MAX-AGE:CAPS"></a><h3>NM_SETTING_BRIDGE_MAX_AGE</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_MAX_AGE        "max-age"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-AGEING-TIME:CAPS"></a><h3>NM_SETTING_BRIDGE_AGEING_TIME</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -477,7 +454,7 @@ nm_setting_bridge_get_ageing_time (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingBridge--ageing-time"></a><h3>The <code class="literal">“ageing-time”</code> property</h3>
 <pre class="programlisting">  “ageing-time”              <span class="type">guint</span></pre>
-<p></p>
+<p>The Ethernet MAC address aging time, in seconds.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 1000000</p>
 <p>Default value: 300</p>
@@ -486,7 +463,7 @@ nm_setting_bridge_get_ageing_time (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingBridge--forward-delay"></a><h3>The <code class="literal">“forward-delay”</code> property</h3>
 <pre class="programlisting">  “forward-delay”            <span class="type">guint</span></pre>
-<p></p>
+<p>The Spanning Tree Protocol (STP) forwarding delay, in seconds.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 30</p>
 <p>Default value: 15</p>
@@ -495,7 +472,7 @@ nm_setting_bridge_get_ageing_time (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingBridge--hello-time"></a><h3>The <code class="literal">“hello-time”</code> property</h3>
 <pre class="programlisting">  “hello-time”               <span class="type">guint</span></pre>
-<p></p>
+<p>The Spanning Tree Protocol (STP) hello time, in seconds.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 10</p>
 <p>Default value: 2</p>
@@ -504,7 +481,9 @@ nm_setting_bridge_get_ageing_time (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingBridge--mac-address"></a><h3>The <code class="literal">“mac-address”</code> property</h3>
 <pre class="programlisting">  “mac-address”              <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If specified, the MAC address of bridge. When creating a new bridge, this
+MAC address will be set. When matching an existing (outside
+NetworkManager created) bridge, this MAC address must match.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -512,7 +491,7 @@ nm_setting_bridge_get_ageing_time (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingBridge--max-age"></a><h3>The <code class="literal">“max-age”</code> property</h3>
 <pre class="programlisting">  “max-age”                  <span class="type">guint</span></pre>
-<p></p>
+<p>The Spanning Tree Protocol (STP) maximum message age, in seconds.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 40</p>
 <p>Default value: 20</p>
@@ -521,7 +500,9 @@ nm_setting_bridge_get_ageing_time (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingBridge--priority"></a><h3>The <code class="literal">“priority”</code> property</h3>
 <pre class="programlisting">  “priority”                 <span class="type">guint</span></pre>
-<p></p>
+<p>Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower
+values are "better"; the lowest priority bridge will be elected the root
+bridge.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 65535</p>
 <p>Default value: 32768</p>
@@ -530,14 +511,13 @@ nm_setting_bridge_get_ageing_time (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingBridge--stp"></a><h3>The <code class="literal">“stp”</code> property</h3>
 <pre class="programlisting">  “stp”                      <span class="type">gboolean</span></pre>
-<p></p>
+<p>Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html
index c2c4f18b..b6aee68e 100644
--- a/docs/libnm/html/NMSettingBridgePort.html
+++ b/docs/libnm/html/NMSettingBridgePort.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingBridgePort</title>
+<title>NMSettingBridgePort: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingBridge.html" title="NMSettingBridge">
 <link rel="next" href="NMSettingCdma.html" title="NMSettingCdma">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -178,7 +178,6 @@ nm_setting_bridge_port_get_priority (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.11.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--priority" title="The “priority” property"><span class="type">“priority”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -204,7 +203,6 @@ nm_setting_bridge_port_get_path_cost (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.4.11.8.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--path-cost" title="The “path-cost” property"><span class="type">“path-cost”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -231,7 +229,6 @@ nm_setting_bridge_port_get_hairpin_mode
 <div class="refsect3">
 <a name="id-1.4.11.8.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode" title="The “hairpin-mode” property"><span class="type">“hairpin-mode”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -241,32 +238,24 @@ nm_setting_bridge_port_get_hairpin_mode
 <a name="NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_SETTING_NAME "bridge-port"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_PRIORITY</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_PRIORITY     "priority"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_PATH_COST</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_PATH_COST    "path-cost"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE</h3>
 <pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -274,7 +263,8 @@ nm_setting_bridge_port_get_hairpin_mode
 <div class="refsect2">
 <a name="NMSettingBridgePort--hairpin-mode"></a><h3>The <code class="literal">“hairpin-mode”</code> property</h3>
 <pre class="programlisting">  “hairpin-mode”             <span class="type">gboolean</span></pre>
-<p></p>
+<p>Enables or disabled "hairpin mode" for the port, which allows frames to
+be sent back out through the port the frame was received on.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
 </div>
@@ -282,7 +272,8 @@ nm_setting_bridge_port_get_hairpin_mode
 <div class="refsect2">
 <a name="NMSettingBridgePort--path-cost"></a><h3>The <code class="literal">“path-cost”</code> property</h3>
 <pre class="programlisting">  “path-cost”                <span class="type">guint</span></pre>
-<p></p>
+<p>The Spanning Tree Protocol (STP) port cost for destinations via this
+port.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 65535</p>
 <p>Default value: 100</p>
@@ -291,7 +282,7 @@ nm_setting_bridge_port_get_hairpin_mode
 <div class="refsect2">
 <a name="NMSettingBridgePort--priority"></a><h3>The <code class="literal">“priority”</code> property</h3>
 <pre class="programlisting">  “priority”                 <span class="type">guint</span></pre>
-<p></p>
+<p>The Spanning Tree Protocol (STP) priority of this bridge port.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 63</p>
 <p>Default value: 32</p>
@@ -299,7 +290,6 @@ nm_setting_bridge_port_get_hairpin_mode
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingCdma.html b/docs/libnm/html/NMSettingCdma.html
index 23dd4122..18180f06 100644
--- a/docs/libnm/html/NMSettingCdma.html
+++ b/docs/libnm/html/NMSettingCdma.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingCdma</title>
+<title>NMSettingCdma: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
 <link rel="next" href="NMSettingDcb.html" title="NMSettingDcb">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -170,7 +170,6 @@ nm_setting_cdma_new (<em class="parameter"><code><span class="type">void</span><
 <div class="refsect3">
 <a name="id-1.4.12.8.2.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -196,7 +195,6 @@ nm_setting_cdma_get_number (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.4.12.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingCdma.html#NMSettingCdma--number" title="The “number” property"><span class="type">“number”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -222,7 +220,6 @@ nm_setting_cdma_get_username (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.12.8.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingCdma.html#NMSettingCdma--username" title="The “username” property"><span class="type">“username”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -248,7 +245,6 @@ nm_setting_cdma_get_password (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.12.8.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title="The “password” property"><span class="type">“password”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -274,7 +270,6 @@ nm_setting_cdma_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.12.8.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title="The “password” property"><span class="type">“password”</span></a></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -284,40 +279,30 @@ nm_setting_cdma_get_password_flags (<em class="parameter"><code><a class="link"
 <a name="NM-SETTING-CDMA-SETTING-NAME:CAPS"></a><h3>NM_SETTING_CDMA_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_SETTING_NAME "cdma"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CDMA-NUMBER:CAPS"></a><h3>NM_SETTING_CDMA_NUMBER</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_NUMBER         "number"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CDMA-USERNAME:CAPS"></a><h3>NM_SETTING_CDMA_USERNAME</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_USERNAME       "username"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CDMA-PASSWORD:CAPS"></a><h3>NM_SETTING_CDMA_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_PASSWORD       "password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_CDMA_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -325,7 +310,9 @@ nm_setting_cdma_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSettingCdma--number"></a><h3>The <code class="literal">“number”</code> property</h3>
 <pre class="programlisting">  “number”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The number to dial to establish the connection to the CDMA-based mobile
+broadband network, if any.  If not specified, the default number (<span class="type">777</span>)
+is used when required.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -333,7 +320,9 @@ nm_setting_cdma_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSettingCdma--password"></a><h3>The <code class="literal">“password”</code> property</h3>
 <pre class="programlisting">  “password”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The password used to authenticate with the network, if required.  Many
+providers do not require a password, or accept any password.  But if a
+password is required, it is specified here.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -341,21 +330,22 @@ nm_setting_cdma_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSettingCdma--password-flags"></a><h3>The <code class="literal">“password-flags”</code> property</h3>
 <pre class="programlisting">  “password-flags”           <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingCdma.html#NMSettingCdma--password" title="The “password” property"><span class="type">“password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingCdma--username"></a><h3>The <code class="literal">“username”</code> property</h3>
 <pre class="programlisting">  “username”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The username used to authenticate with the network, if required.  Many
+providers do not require a username, or accept any username.  But if a
+username is required, it is specified here.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index ebb16ae9..f33e2b88 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingConnection</title>
+<title>NMSettingConnection: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSetting.html" title="NMSetting">
 <link rel="next" href="NMSetting8021x.html" title="NMSetting8021x">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -188,6 +188,14 @@
 </tr>
 <tr>
 <td class="function_type">
+<a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves"><span class="returnvalue">NMSettingConnectionAutoconnectSlaves</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-autoconnect-slaves" title="nm_setting_connection_get_autoconnect_slaves ()">nm_setting_connection_get_autoconnect_slaves</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <span class="returnvalue">guint32</span>
 </td>
 <td class="function_name">
@@ -256,6 +264,11 @@
 <td class="property_flags">Read / Write / Construct</td>
 </tr>
 <tr>
+<td class="property_type"><a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves"><span class="type">NMSettingConnectionAutoconnectSlaves</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingConnection.html#NMSettingConnection--autoconnect-slaves" title="The “autoconnect-slaves” property">autoconnect-slaves</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
 <td class="property_type"><span class="type">guint</span></td>
 <td class="property_name"><a class="link" href="NMSettingConnection.html#NMSettingConnection--gateway-ping-timeout" title="The “gateway-ping-timeout” property">gateway-ping-timeout</a></td>
 <td class="property_flags">Read / Write / Construct</td>
@@ -399,6 +412,10 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES:CAPS" title="NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES">NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-SECONDARIES:CAPS" title="NM_SETTING_CONNECTION_SECONDARIES">NM_SETTING_CONNECTION_SECONDARIES</a></td>
 </tr>
 <tr>
@@ -406,6 +423,10 @@
 <td class="function_name"><a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-GATEWAY-PING-TIMEOUT:CAPS" title="NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT">NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT</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>
+<tr>
 <td class="datatype_keyword">struct</td>
 <td class="function_name"><a class="link" href="NMSettingConnection.html#NMSettingConnection-struct" title="struct NMSettingConnection">NMSettingConnection</a></td>
 </tr>
@@ -414,7 +435,9 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    GObject
+<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+    <span class="lineart">╰──</span> NMSettingConnectionAutoconnectSlaves
+    GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
         <span class="lineart">╰──</span> NMSettingConnection
 </pre>
@@ -436,7 +459,6 @@ nm_setting_connection_new (<em class="parameter"><code><span class="type">void</
 <div class="refsect3">
 <a name="id-1.4.5.8.2.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -463,7 +485,6 @@ nm_setting_connection_get_id (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.5.8.3.6"></a><h4>Returns</h4>
 <p> the connection ID</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -490,7 +511,6 @@ nm_setting_connection_get_uuid (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.4.5.8.4.6"></a><h4>Returns</h4>
 <p> the connection UUID</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -518,7 +538,6 @@ nm_setting_connection_get_interface_name
 <div class="refsect3">
 <a name="id-1.4.5.8.5.6"></a><h4>Returns</h4>
 <p> the connection's interface name</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -546,7 +565,6 @@ nm_setting_connection_get_connection_type
 <div class="refsect3">
 <a name="id-1.4.5.8.6.6"></a><h4>Returns</h4>
 <p> the connection type</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -573,7 +591,6 @@ nm_setting_connection_get_autoconnect (<em class="parameter"><code><a class="lin
 <div class="refsect3">
 <a name="id-1.4.5.8.7.6"></a><h4>Returns</h4>
 <p> the connection's autoconnect behavior</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -602,7 +619,6 @@ The higher number, the higher priority.</p>
 <div class="refsect3">
 <a name="id-1.4.5.8.8.6"></a><h4>Returns</h4>
 <p> the connection's autoconnect priority</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -629,7 +645,6 @@ nm_setting_connection_get_timestamp (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.5.8.9.6"></a><h4>Returns</h4>
 <p> the connection's timestamp</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -656,7 +671,6 @@ nm_setting_connection_get_read_only (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.5.8.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection is read-only, <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -685,7 +699,6 @@ property of this setting.</p>
 <div class="refsect3">
 <a name="id-1.4.5.8.11.6"></a><h4>Returns</h4>
 <p> the number of permissions entires</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -742,7 +755,6 @@ of this setting.</p>
 <a name="id-1.4.5.8.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if a permission was returned, <code class="literal">FALSE</code> if <em class="parameter"><code>idx</code></em>
 was invalid</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -769,7 +781,6 @@ nm_setting_connection_get_zone (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.4.5.8.13.6"></a><h4>Returns</h4>
 <p> the trust level of a connection</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -806,7 +817,6 @@ nm_setting_connection_permissions_user_allowed
 <a name="id-1.4.5.8.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the requested user is allowed to view this connection,
 <code class="literal">FALSE</code> if the given user is not allowed to view this connection</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -861,7 +871,6 @@ list, <code class="literal">FALSE</code> if <em class="parameter"><code>ptype</c
 or <em class="parameter"><code>pitem</code></em>
 was invalid or it the permission was already
 present in the list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -945,7 +954,6 @@ be a username. See <a class="link" href="NMSettingConnection.html#NMSettingConne
 <div class="refsect3">
 <a name="id-1.4.5.8.17.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the permission was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -973,7 +981,6 @@ nm_setting_connection_get_master (<em class="parameter"><code><a class="link" hr
 <a name="id-1.4.5.8.18.6"></a><h4>Returns</h4>
 <p> interface name of the master device or UUID of the master
 connection.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1010,7 +1017,6 @@ against <em class="parameter"><code>setting</code></em>
 <a name="id-1.4.5.8.19.5"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if connection is of the given slave <em class="parameter"><code>type</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1037,17 +1043,45 @@ nm_setting_connection_get_slave_type (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.4.5.8.20.6"></a><h4>Returns</h4>
 <p> the type of slave this connection is, if any</p>
-<p></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-setting-connection-get-autoconnect-slaves"></a><h3>nm_setting_connection_get_autoconnect_slaves ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves"><span class="returnvalue">NMSettingConnectionAutoconnectSlaves</span></a>
+nm_setting_connection_get_autoconnect_slaves
+                               (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
+<p>Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--autoconnect-slaves" title="The “autoconnect-slaves” property"><span class="type">“autoconnect-slaves”</span></a> property of the connection.</p>
+<div class="refsect3">
+<a name="id-1.4.5.8.21.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table 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="id-1.4.5.8.21.6"></a><h4>Returns</h4>
+<p> whether slaves of the connection should be activated together
+with the connection.</p>
+</div>
+<p class="since">Since: 1.0.4</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-setting-connection-get-num-secondaries"></a><h3>nm_setting_connection_get_num_secondaries ()</h3>
 <pre class="programlisting"><span class="returnvalue">guint32</span>
 nm_setting_connection_get_num_secondaries
                                (<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="id-1.4.5.8.21.4"></a><h4>Parameters</h4>
+<a name="id-1.4.5.8.22.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1062,9 +1096,8 @@ nm_setting_connection_get_num_secondaries
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.4.5.8.21.5"></a><h4>Returns</h4>
+<a name="id-1.4.5.8.22.5"></a><h4>Returns</h4>
 <p> the number of configured secondary connection UUIDs</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1074,7 +1107,7 @@ nm_setting_connection_get_num_secondaries
 nm_setting_connection_get_secondary (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
                                      <em class="parameter"><code><span class="type">guint32</span> idx</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.4.5.8.22.4"></a><h4>Parameters</h4>
+<a name="id-1.4.5.8.23.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1096,10 +1129,9 @@ nm_setting_connection_get_secondary (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.4.5.8.22.5"></a><h4>Returns</h4>
+<a name="id-1.4.5.8.23.5"></a><h4>Returns</h4>
 <p> the secondary connection UUID at index <em class="parameter"><code>idx</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1110,7 +1142,7 @@ nm_setting_connection_add_secondary (<em class="parameter"><code><a class="link"
                                      <em class="parameter"><code>const <span class="type">char</span> *sec_uuid</code></em>);</pre>
 <p>Adds a new secondary connetion UUID to the setting.</p>
 <div class="refsect3">
-<a name="id-1.4.5.8.23.5"></a><h4>Parameters</h4>
+<a name="id-1.4.5.8.24.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1132,10 +1164,9 @@ nm_setting_connection_add_secondary (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.4.5.8.23.6"></a><h4>Returns</h4>
+<a name="id-1.4.5.8.24.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the secondary connection UUID was added; <code class="literal">FALSE</code> if the UUID
 was already present</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1148,7 +1179,7 @@ nm_setting_connection_remove_secondary
 <p>Removes the secondary coonnection UUID at index <em class="parameter"><code>idx</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.4.5.8.24.5"></a><h4>Parameters</h4>
+<a name="id-1.4.5.8.25.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1180,7 +1211,7 @@ nm_setting_connection_remove_secondary_by_value
 <p>Removes the secondary coonnection UUID <em class="parameter"><code>sec_uuid</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.4.5.8.25.5"></a><h4>Parameters</h4>
+<a name="id-1.4.5.8.26.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1202,9 +1233,8 @@ nm_setting_connection_remove_secondary_by_value
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.4.5.8.25.6"></a><h4>Returns</h4>
+<a name="id-1.4.5.8.26.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the secondary connection UUID was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1214,7 +1244,7 @@ nm_setting_connection_remove_secondary_by_value
 nm_setting_connection_get_gateway_ping_timeout
                                (<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="id-1.4.5.8.26.4"></a><h4>Parameters</h4>
+<a name="id-1.4.5.8.27.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1229,10 +1259,9 @@ nm_setting_connection_get_gateway_ping_timeout
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.4.5.8.26.5"></a><h4>Returns</h4>
+<a name="id-1.4.5.8.27.5"></a><h4>Returns</h4>
 <p> the value contained in the <a class="link" href="NMSettingConnection.html#NMSettingConnection--gateway-ping-timeout" title="The “gateway-ping-timeout” property"><span class="type">“gateway-ping-timeout”</span></a>
 property.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -1242,144 +1271,155 @@ property.</p>
 <a name="NM-SETTING-CONNECTION-SETTING-NAME:CAPS"></a><h3>NM_SETTING_CONNECTION_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-AUTOCONNECT-PRIORITY-MIN:CAPS"></a><h3>NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MIN</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MIN -999
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-AUTOCONNECT-PRIORITY-MAX:CAPS"></a><h3>NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MAX</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MAX 999
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-AUTOCONNECT-PRIORITY-DEFAULT:CAPS"></a><h3>NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_DEFAULT</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_DEFAULT 0
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-ID:CAPS"></a><h3>NM_SETTING_CONNECTION_ID</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_ID             "id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-UUID:CAPS"></a><h3>NM_SETTING_CONNECTION_UUID</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_UUID           "uuid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-INTERFACE-NAME:CAPS"></a><h3>NM_SETTING_CONNECTION_INTERFACE_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_INTERFACE_NAME "interface-name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-TYPE:CAPS"></a><h3>NM_SETTING_CONNECTION_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_TYPE           "type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-AUTOCONNECT:CAPS"></a><h3>NM_SETTING_CONNECTION_AUTOCONNECT</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_AUTOCONNECT    "autoconnect"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-AUTOCONNECT-PRIORITY:CAPS"></a><h3>NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY "autoconnect-priority"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-TIMESTAMP:CAPS"></a><h3>NM_SETTING_CONNECTION_TIMESTAMP</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_TIMESTAMP      "timestamp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-READ-ONLY:CAPS"></a><h3>NM_SETTING_CONNECTION_READ_ONLY</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_READ_ONLY      "read-only"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-PERMISSIONS:CAPS"></a><h3>NM_SETTING_CONNECTION_PERMISSIONS</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_PERMISSIONS    "permissions"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-ZONE:CAPS"></a><h3>NM_SETTING_CONNECTION_ZONE</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_ZONE           "zone"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-MASTER:CAPS"></a><h3>NM_SETTING_CONNECTION_MASTER</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_MASTER         "master"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-SLAVE-TYPE:CAPS"></a><h3>NM_SETTING_CONNECTION_SLAVE_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_SLAVE_TYPE     "slave-type"
 </pre>
-<p>
-</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES:CAPS"></a><h3>NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES</h3>
+<pre class="programlisting">#define NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES "autoconnect-slaves"
+</pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-SECONDARIES:CAPS"></a><h3>NM_SETTING_CONNECTION_SECONDARIES</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_SECONDARIES    "secondaries"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-CONNECTION-GATEWAY-PING-TIMEOUT:CAPS"></a><h3>NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT</h3>
 <pre class="programlisting">#define NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT "gateway-ping-timeout"
 </pre>
-<p>
-</p>
+</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>
+<div class="refsect3">
+<a name="id-1.4.5.9.21.4"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-DEFAULT:CAPS"></a>NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_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-AUTOCONNECT-SLAVES-NO:CAPS"></a>NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO</p></td>
+<td class="enum_member_description">
+<p>slaves are not brought up when
+  master is activated</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-YES:CAPS"></a>NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES</p></td>
+<td class="enum_member_description">
+<p>slaves are brought up when
+  master is activated</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -1414,12 +1454,27 @@ The higher number means higher priority.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMSettingConnection--autoconnect-slaves"></a><h3>The <code class="literal">“autoconnect-slaves”</code> property</h3>
+<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 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
+determine the real value. If it is default as well, this fallbacks to 0.</p>
+<p>Flags: Read / Write / Construct</p>
+<p>Default value: NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT</p>
+<p class="since">Since: 1.0.4</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingConnection--gateway-ping-timeout"></a><h3>The <code class="literal">“gateway-ping-timeout”</code> property</h3>
 <pre class="programlisting">  “gateway-ping-timeout”     <span class="type">guint</span></pre>
 <p>If greater than zero, delay success of IP addressing until either the
 timeout is reached, or an IP gateway replies to a ping.</p>
 <p>Flags: Read / Write / Construct</p>
-<p>Allowed values: &lt;= 30</p>
+<p>Allowed values: &lt;= 600</p>
 <p>Default value: 0</p>
 </div>
 <hr>
@@ -1557,7 +1612,6 @@ firewall.</p>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html
index ebfedd69..a662d108 100644
--- a/docs/libnm/html/NMSettingDcb.html
+++ b/docs/libnm/html/NMSettingDcb.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingDcb</title>
+<title>NMSettingDcb: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingCdma.html" title="NMSettingCdma">
 <link rel="next" href="NMSettingGeneric.html" title="NMSettingGeneric">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -453,7 +453,6 @@ nm_setting_dcb_get_app_fcoe_flags (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.4.13.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fcoe-flags" title="The “app-fcoe-flags” property"><span class="type">“app-fcoe-flags”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -479,7 +478,6 @@ nm_setting_dcb_get_app_fcoe_priority (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.4.13.8.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fcoe-priority" title="The “app-fcoe-priority” property"><span class="type">“app-fcoe-priority”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -505,7 +503,6 @@ nm_setting_dcb_get_app_fcoe_mode (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.4.13.8.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fcoe-mode" title="The “app-fcoe-mode” property"><span class="type">“app-fcoe-mode”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -531,7 +528,6 @@ nm_setting_dcb_get_app_iscsi_flags (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.13.8.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-iscsi-flags" title="The “app-iscsi-flags” property"><span class="type">“app-iscsi-flags”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -557,7 +553,6 @@ nm_setting_dcb_get_app_iscsi_priority (<em class="parameter"><code><a class="lin
 <div class="refsect3">
 <a name="id-1.4.13.8.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-iscsi-priority" title="The “app-iscsi-priority” property"><span class="type">“app-iscsi-priority”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -583,7 +578,6 @@ nm_setting_dcb_get_app_fip_flags (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.4.13.8.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fip-flags" title="The “app-fip-flags” property"><span class="type">“app-fip-flags”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -609,7 +603,6 @@ nm_setting_dcb_get_app_fip_priority (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.13.8.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fip-priority" title="The “app-fip-priority” property"><span class="type">“app-fip-priority”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -636,7 +629,6 @@ nm_setting_dcb_get_priority_flow_control_flags
 <div class="refsect3">
 <a name="id-1.4.13.8.10.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-flow-control-flags" title="The “priority-flow-control-flags” property"><span class="type">“priority-flow-control-flags”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -673,7 +665,6 @@ nm_setting_dcb_get_priority_flow_control
 <p> <code class="literal">TRUE</code> if flow control is enabled for the given <em class="parameter"><code>user_priority</code></em>
 ,
 <code class="literal">FALSE</code> if not enabled</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -738,7 +729,6 @@ nm_setting_dcb_get_priority_group_flags
 <div class="refsect3">
 <a name="id-1.4.13.8.13.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-group-flags" title="The “priority-group-flags” property"><span class="type">“priority-group-flags”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -775,7 +765,6 @@ nm_setting_dcb_get_priority_group_id (<em class="parameter"><code><a class="link
 is assigned to.  These values are
 only valid when <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-group-flags" title="The “priority-group-flags” property"><span class="type">“priority-group-flags”</span></a> includes the
 <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -852,7 +841,6 @@ nm_setting_dcb_get_priority_group_bandwidth
 .  These values are
 only valid when <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-group-flags" title="The “priority-group-flags” property"><span class="type">“priority-group-flags”</span></a> includes the
 <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -928,7 +916,6 @@ nm_setting_dcb_get_priority_bandwidth (<em class="parameter"><code><a class="lin
 in its priority group.
 These values are only valid when <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-group-flags" title="The “priority-group-flags” property"><span class="type">“priority-group-flags”</span></a> includes the
 <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1005,7 +992,6 @@ nm_setting_dcb_get_priority_strict_bandwidth
 may use all of the bandwidth allocated to its
 assigned group, or <code class="literal">FALSE</code> if not. These values are only valid when
 <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-group-flags" title="The “priority-group-flags” property"><span class="type">“priority-group-flags”</span></a> includes the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1083,7 +1069,6 @@ nm_setting_dcb_get_priority_traffic_class
 . These values are only
 valid when <a class="link" href="NMSettingDcb.html#NMSettingDcb--priority-group-flags" title="The “priority-group-flags” property"><span class="type">“priority-group-flags”</span></a> includes the
 <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1094,8 +1079,6 @@ nm_setting_dcb_set_priority_traffic_class
                                (<em class="parameter"><code><a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="type">NMSettingDcb</span></a> *setting</code></em>,
                                 <em class="parameter"><code><span class="type">guint</span> user_priority</code></em>,
                                 <em class="parameter"><code><span class="type">guint</span> traffic_class</code></em>);</pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1104,8 +1087,6 @@ nm_setting_dcb_set_priority_traffic_class
 <a name="NM-SETTING-DCB-SETTING-NAME:CAPS"></a><h3>NM_SETTING_DCB_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_SETTING_NAME "dcb"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1172,120 +1153,90 @@ peer configuration advertisements</p>
 <a name="NM-SETTING-DCB-APP-FCOE-FLAGS:CAPS"></a><h3>NM_SETTING_DCB_APP_FCOE_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_FCOE_FLAGS         "app-fcoe-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-APP-FCOE-PRIORITY:CAPS"></a><h3>NM_SETTING_DCB_APP_FCOE_PRIORITY</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_FCOE_PRIORITY      "app-fcoe-priority"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-APP-FCOE-MODE:CAPS"></a><h3>NM_SETTING_DCB_APP_FCOE_MODE</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_FCOE_MODE          "app-fcoe-mode"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-APP-ISCSI-FLAGS:CAPS"></a><h3>NM_SETTING_DCB_APP_ISCSI_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_ISCSI_FLAGS        "app-iscsi-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-APP-ISCSI-PRIORITY:CAPS"></a><h3>NM_SETTING_DCB_APP_ISCSI_PRIORITY</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_ISCSI_PRIORITY     "app-iscsi-priority"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-APP-FIP-FLAGS:CAPS"></a><h3>NM_SETTING_DCB_APP_FIP_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_FIP_FLAGS          "app-fip-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-APP-FIP-PRIORITY:CAPS"></a><h3>NM_SETTING_DCB_APP_FIP_PRIORITY</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_APP_FIP_PRIORITY       "app-fip-priority"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-FLOW-CONTROL-FLAGS:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS  "priority-flow-control-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-FLOW-CONTROL:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_FLOW_CONTROL</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_FLOW_CONTROL        "priority-flow-control"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-GROUP-FLAGS:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_GROUP_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_GROUP_FLAGS      "priority-group-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-GROUP-ID:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_GROUP_ID</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_GROUP_ID         "priority-group-id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-GROUP-BANDWIDTH:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH  "priority-group-bandwidth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-BANDWIDTH:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_BANDWIDTH</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_BANDWIDTH        "priority-bandwidth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-STRICT-BANDWIDTH:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH "priority-strict-bandwidth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-DCB-PRIORITY-TRAFFIC-CLASS:CAPS"></a><h3>NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS</h3>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS    "priority-traffic-class"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1293,14 +1244,17 @@ peer configuration advertisements</p>
 <div class="refsect2">
 <a name="NMSettingDcb--app-fcoe-flags"></a><h3>The <code class="literal">“app-fcoe-flags”</code> property</h3>
 <pre class="programlisting">  “app-fcoe-flags”           <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a></pre>
-<p></p>
+<p>Specifies the <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a> for the DCB FCoE application.  Flags may
+be any combination of <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a>,
+<a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ADVERTISE</code></a>, and <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_WILLING</code></a>.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--app-fcoe-mode"></a><h3>The <code class="literal">“app-fcoe-mode”</code> property</h3>
 <pre class="programlisting">  “app-fcoe-mode”            <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The FCoE controller mode; either <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FCOE-MODE-FABRIC:CAPS" title="NM_SETTING_DCB_FCOE_MODE_FABRIC"><code class="literal">NM_SETTING_DCB_FCOE_MODE_FABRIC</code></a>
+(default) or <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FCOE-MODE-VN2VN:CAPS" title="NM_SETTING_DCB_FCOE_MODE_VN2VN"><code class="literal">NM_SETTING_DCB_FCOE_MODE_VN2VN</code></a>.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: "fabric"</p>
 </div>
@@ -1308,7 +1262,9 @@ peer configuration advertisements</p>
 <div class="refsect2">
 <a name="NMSettingDcb--app-fcoe-priority"></a><h3>The <code class="literal">“app-fcoe-priority”</code> property</h3>
 <pre class="programlisting">  “app-fcoe-priority”        <span class="type">gint</span></pre>
-<p></p>
+<p>The highest User Priority (0 - 7) which FCoE frames should use, or -1 for
+default priority.  Only used when the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fcoe-flags" title="The “app-fcoe-flags” property"><span class="type">“app-fcoe-flags”</span></a>
+property includes the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [-1,7]</p>
 <p>Default value: -1</p>
@@ -1317,14 +1273,18 @@ peer configuration advertisements</p>
 <div class="refsect2">
 <a name="NMSettingDcb--app-fip-flags"></a><h3>The <code class="literal">“app-fip-flags”</code> property</h3>
 <pre class="programlisting">  “app-fip-flags”            <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a></pre>
-<p></p>
+<p>Specifies the <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a> for the DCB FIP application.  Flags may
+be any combination of <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a>,
+<a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ADVERTISE</code></a>, and <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_WILLING</code></a>.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--app-fip-priority"></a><h3>The <code class="literal">“app-fip-priority”</code> property</h3>
 <pre class="programlisting">  “app-fip-priority”         <span class="type">gint</span></pre>
-<p></p>
+<p>The highest User Priority (0 - 7) which FIP frames should use, or -1 for
+default priority.  Only used when the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fip-flags" title="The “app-fip-flags” property"><span class="type">“app-fip-flags”</span></a>
+property includes the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [-1,7]</p>
 <p>Default value: -1</p>
@@ -1333,14 +1293,18 @@ peer configuration advertisements</p>
 <div class="refsect2">
 <a name="NMSettingDcb--app-iscsi-flags"></a><h3>The <code class="literal">“app-iscsi-flags”</code> property</h3>
 <pre class="programlisting">  “app-iscsi-flags”          <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a></pre>
-<p></p>
+<p>Specifies the <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a> for the DCB iSCSI application.  Flags
+may be any combination of <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a>,
+<a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ADVERTISE</code></a>, and <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_WILLING</code></a>.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--app-iscsi-priority"></a><h3>The <code class="literal">“app-iscsi-priority”</code> property</h3>
 <pre class="programlisting">  “app-iscsi-priority”       <span class="type">gint</span></pre>
-<p></p>
+<p>The highest User Priority (0 - 7) which iSCSI frames should use, or -1
+for default priority. Only used when the <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-iscsi-flags" title="The “app-iscsi-flags” property"><span class="type">“app-iscsi-flags”</span></a>
+property includes the <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a> flag.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [-1,7]</p>
 <p>Default value: -1</p>
@@ -1349,62 +1313,86 @@ peer configuration advertisements</p>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-bandwidth"></a><h3>The <code class="literal">“priority-bandwidth”</code> property</h3>
 <pre class="programlisting">  “priority-bandwidth”       <span class="type">GArray</span> *</pre>
-<p></p>
+<p>An array of 8 uint values, where the array index corresponds to the User
+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
+percent.</p>
+<p>Element-type: guint</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-flow-control"></a><h3>The <code class="literal">“priority-flow-control”</code> property</h3>
 <pre class="programlisting">  “priority-flow-control”    <span class="type">GArray</span> *</pre>
-<p></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>Element-type: gboolean</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-flow-control-flags"></a><h3>The <code class="literal">“priority-flow-control-flags”</code> property</h3>
 <pre class="programlisting">  “priority-flow-control-flags” <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a></pre>
-<p></p>
+<p>Specifies the <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a> for DCB Priority Flow Control (PFC).
+Flags may be any combination of <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a>,
+<a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ADVERTISE</code></a>, and <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_WILLING</code></a>.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-group-bandwidth"></a><h3>The <code class="literal">“priority-group-bandwidth”</code> property</h3>
 <pre class="programlisting">  “priority-group-bandwidth” <span class="type">GArray</span> *</pre>
-<p></p>
+<p>An array of 8 uint values, where the array index corresponds to the
+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 percent.</p>
+<p>Element-type: guint</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-group-flags"></a><h3>The <code class="literal">“priority-group-flags”</code> property</h3>
 <pre class="programlisting">  “priority-group-flags”     <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a></pre>
-<p></p>
+<p>Specifies the <a class="link" href="NMSettingDcb.html#NMSettingDcbFlags" title="enum NMSettingDcbFlags"><span class="type">NMSettingDcbFlags</span></a> for DCB Priority Groups.  Flags may be
+any combination of <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ENABLE</code></a>,
+<a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_ADVERTISE</code></a>, and <a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS"><code class="literal">NM_SETTING_DCB_FLAG_WILLING</code></a>.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-group-id"></a><h3>The <code class="literal">“priority-group-id”</code> property</h3>
 <pre class="programlisting">  “priority-group-id”        <span class="type">GArray</span> *</pre>
-<p></p>
+<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>Element-type: guint</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-strict-bandwidth"></a><h3>The <code class="literal">“priority-strict-bandwidth”</code> property</h3>
 <pre class="programlisting">  “priority-strict-bandwidth” <span class="type">GArray</span> *</pre>
-<p></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>Element-type: gboolean</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingDcb--priority-traffic-class"></a><h3>The <code class="literal">“priority-traffic-class”</code> property</h3>
 <pre class="programlisting">  “priority-traffic-class”   <span class="type">GArray</span> *</pre>
-<p></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>Element-type: guint</p>
 <p>Flags: Read / Write</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html
index 13bf6b87..f1975597 100644
--- a/docs/libnm/html/NMSettingGeneric.html
+++ b/docs/libnm/html/NMSettingGeneric.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingGeneric</title>
+<title>NMSettingGeneric: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingDcb.html" title="NMSettingDcb">
 <link rel="next" href="NMSettingGsm.html" title="NMSettingGsm">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -97,13 +97,10 @@ nm_setting_generic_new (<em class="parameter"><code><span class="type">void</spa
 <a name="NM-SETTING-GENERIC-SETTING-NAME:CAPS"></a><h3>NM_SETTING_GENERIC_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_GENERIC_SETTING_NAME "generic"
 </pre>
-<p>
-</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html
index 2da1fa2e..bee69df6 100644
--- a/docs/libnm/html/NMSettingGsm.html
+++ b/docs/libnm/html/NMSettingGsm.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingGsm</title>
+<title>NMSettingGsm: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingGeneric.html" title="NMSettingGeneric">
 <link rel="next" href="NMSettingInfiniband.html" title="NMSettingInfiniband">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -255,7 +255,6 @@ nm_setting_gsm_new (<em class="parameter"><code><span class="type">void</span></
 <div class="refsect3">
 <a name="id-1.4.15.8.2.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -281,7 +280,6 @@ nm_setting_gsm_get_number (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="id-1.4.15.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--number" title="The “number” property"><span class="type">“number”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -307,7 +305,6 @@ nm_setting_gsm_get_username (<em class="parameter"><code><a class="link" href="N
 <div class="refsect3">
 <a name="id-1.4.15.8.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--username" title="The “username” property"><span class="type">“username”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -333,7 +330,6 @@ nm_setting_gsm_get_password (<em class="parameter"><code><a class="link" href="N
 <div class="refsect3">
 <a name="id-1.4.15.8.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--password" title="The “password” property"><span class="type">“password”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -359,7 +355,6 @@ nm_setting_gsm_get_apn (<em class="parameter"><code><a class="link" href="NMSett
 <div class="refsect3">
 <a name="id-1.4.15.8.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--apn" title="The “apn” property"><span class="type">“apn”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -385,7 +380,6 @@ nm_setting_gsm_get_network_id (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.4.15.8.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--network-id" title="The “network-id” property"><span class="type">“network-id”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -411,7 +405,6 @@ nm_setting_gsm_get_pin (<em class="parameter"><code><a class="link" href="NMSett
 <div class="refsect3">
 <a name="id-1.4.15.8.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title="The “pin” property"><span class="type">“pin”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -437,7 +430,6 @@ nm_setting_gsm_get_home_only (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.15.8.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--home-only" title="The “home-only” property"><span class="type">“home-only”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -463,7 +455,6 @@ nm_setting_gsm_get_pin_flags (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.15.8.10.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title="The “pin” property"><span class="type">“pin”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -489,7 +480,6 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.4.15.8.11.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingGsm.html#NMSettingGsm--password" title="The “password” property"><span class="type">“password”</span></a></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -499,80 +489,60 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 <a name="NM-SETTING-GSM-SETTING-NAME:CAPS"></a><h3>NM_SETTING_GSM_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_SETTING_NAME "gsm"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-NUMBER:CAPS"></a><h3>NM_SETTING_GSM_NUMBER</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_NUMBER         "number"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-USERNAME:CAPS"></a><h3>NM_SETTING_GSM_USERNAME</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_USERNAME       "username"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-PASSWORD:CAPS"></a><h3>NM_SETTING_GSM_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_PASSWORD       "password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_GSM_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-APN:CAPS"></a><h3>NM_SETTING_GSM_APN</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_APN            "apn"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-NETWORK-ID:CAPS"></a><h3>NM_SETTING_GSM_NETWORK_ID</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_NETWORK_ID     "network-id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-PIN:CAPS"></a><h3>NM_SETTING_GSM_PIN</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_PIN            "pin"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-PIN-FLAGS:CAPS"></a><h3>NM_SETTING_GSM_PIN_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-HOME-ONLY:CAPS"></a><h3>NM_SETTING_GSM_HOME_ONLY</h3>
 <pre class="programlisting">#define NM_SETTING_GSM_HOME_ONLY      "home-only"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -580,7 +550,13 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingGsm--apn"></a><h3>The <code class="literal">“apn”</code> property</h3>
 <pre class="programlisting">  “apn”                      <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The GPRS Access Point Name specifying the APN used when establishing a
+data session with the GSM-based network.  The APN often determines how
+the user will be billed for their network usage and whether the user has
+access to the Internet or just a provider-specific walled-garden, so it
+is important to use the correct APN for the user's mobile broadband plan.
+The APN may only be composed of the characters a-z, 0-9, ., and - per GSM
+03.60 Section 14.9.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -588,7 +564,8 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingGsm--home-only"></a><h3>The <code class="literal">“home-only”</code> property</h3>
 <pre class="programlisting">  “home-only”                <span class="type">gboolean</span></pre>
-<p></p>
+<p>When <code class="literal">TRUE</code>, only connections to the home network will be allowed.
+Connections to roaming networks will not be made.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
 </div>
@@ -596,7 +573,11 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingGsm--network-id"></a><h3>The <code class="literal">“network-id”</code> property</h3>
 <pre class="programlisting">  “network-id”               <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The Network ID (GSM LAI format, ie MCC-MNC) to force specific network
+registration.  If the Network ID is specified, NetworkManager will
+attempt to force the device to register only on the specified network.
+This can be used to ensure that the device does not roam when direct
+roaming control of the device is not otherwise possible.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -604,7 +585,10 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingGsm--number"></a><h3>The <code class="literal">“number”</code> property</h3>
 <pre class="programlisting">  “number”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Number to dial when establishing a PPP data session with the GSM-based
+mobile broadband network.  Many modems do not require PPP for connections
+to the mobile network and thus this property should be left blank, which
+allows NetworkManager to select the appropriate settings automatically.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -612,7 +596,9 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingGsm--password"></a><h3>The <code class="literal">“password”</code> property</h3>
 <pre class="programlisting">  “password”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The password used to authenticate with the network, if required.  Many
+providers do not require a password, or accept any password.  But if a
+password is required, it is specified here.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -620,14 +606,16 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingGsm--password-flags"></a><h3>The <code class="literal">“password-flags”</code> property</h3>
 <pre class="programlisting">  “password-flags”           <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingGsm.html#NMSettingGsm--password" title="The “password” property"><span class="type">“password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingGsm--pin"></a><h3>The <code class="literal">“pin”</code> property</h3>
 <pre class="programlisting">  “pin”                      <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If the SIM is locked with a PIN it must be unlocked before any other
+operations are requested.  Specify the PIN here to allow operation of the
+device.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -635,21 +623,22 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 <div class="refsect2">
 <a name="NMSettingGsm--pin-flags"></a><h3>The <code class="literal">“pin-flags”</code> property</h3>
 <pre class="programlisting">  “pin-flags”                <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title="The “pin” property"><span class="type">“pin”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingGsm--username"></a><h3>The <code class="literal">“username”</code> property</h3>
 <pre class="programlisting">  “username”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The username used to authenticate with the network, if required.  Many
+providers do not require a username, or accept any username.  But if a
+username is required, it is specified here.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html
index 95b3dc6d..9a40fd47 100644
--- a/docs/libnm/html/NMSettingIP4Config.html
+++ b/docs/libnm/html/NMSettingIP4Config.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingIP4Config</title>
+<title>NMSettingIP4Config: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingIPConfig.html" title="NMSettingIPConfig">
 <link rel="next" href="NMSettingIP6Config.html" title="NMSettingIP6Config">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -181,7 +181,6 @@ property.</p>
 <a name="id-1.4.18.8.3.6"></a><h4>Returns</h4>
 <p> the configured Client ID to send to the DHCP server when requesting
 addresses via DHCP.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -191,16 +190,12 @@ addresses via DHCP.</p>
 <a name="NM-SETTING-IP4-CONFIG-SETTING-NAME:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-DHCP-CLIENT-ID:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -252,14 +247,14 @@ through that interface to the default network.</p>
 <div class="refsect2">
 <a name="NMSettingIP4Config--dhcp-client-id"></a><h3>The <code class="literal">“dhcp-client-id”</code> property</h3>
 <pre class="programlisting">  “dhcp-client-id”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>A string sent to the DHCP server to identify the local machine which the
+DHCP server may use to customize the DHCP lease and options.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html
index 75c33f7f..7d4408c7 100644
--- a/docs/libnm/html/NMSettingIP6Config.html
+++ b/docs/libnm/html/NMSettingIP6Config.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingIP6Config</title>
+<title>NMSettingIP6Config: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingIP4Config.html" title="NMSettingIP4Config">
 <link rel="next" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -187,7 +187,6 @@ property.</p>
 <div class="refsect3">
 <a name="id-1.4.19.8.3.6"></a><h4>Returns</h4>
 <p> IPv6 Privacy Extensions configuration value (<a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigPrivacy" title="enum NMSettingIP6ConfigPrivacy"><span class="type">NMSettingIP6ConfigPrivacy</span></a>).</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -197,16 +196,12 @@ property.</p>
 <a name="NM-SETTING-IP6-CONFIG-SETTING-NAME:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-IP6-PRIVACY:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_IP6_PRIVACY</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_IP6_PRIVACY "ip6-privacy"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -316,14 +311,23 @@ are enabled and temporary addresses are preferred over public addresses</p>
 <div class="refsect2">
 <a name="NMSettingIP6Config--ip6-privacy"></a><h3>The <code class="literal">“ip6-privacy”</code> property</h3>
 <pre class="programlisting">  “ip6-privacy”              <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigPrivacy" title="enum NMSettingIP6ConfigPrivacy"><span class="type">NMSettingIP6ConfigPrivacy</span></a></pre>
-<p></p>
+<p>Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If
+enabled, it makes the kernel generate a temporary IPv6 address in
+addition to the public one generated from MAC address via modified
+EUI-64.  This enhances privacy, but could cause problems in some
+applications, on the other hand.  The permitted values are: -1: unknown,
+0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary
+addresses).</p>
+<p>Having a per-connection setting set to "-1" (unknown) means fallback to
+global configuration "ipv6.ip6-privacy".</p>
+<p>If also global configuration is unspecified or set to "-1", fallback to read
+"/proc/sys/net/ipv6/conf/default/use_tempaddr".</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index ae386b27..9ec05095 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingIPConfig</title>
+<title>NMSettingIPConfig: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingInfiniband.html" title="NMSettingInfiniband">
 <link rel="next" href="NMSettingIP4Config.html" title="NMSettingIP4Config">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -952,7 +952,6 @@ to.</p></td>
 <div class="refsect3">
 <a name="id-1.4.17.11.6.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the objects contain the same values, <code class="literal">FALSE</code> if they do not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1009,7 +1008,6 @@ object.</p>
 <div class="refsect3">
 <a name="id-1.4.17.11.8.6"></a><h4>Returns</h4>
 <p> the IP address family</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1036,7 +1034,6 @@ nm_ip_address_get_address (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="id-1.4.17.11.9.6"></a><h4>Returns</h4>
 <p> the IP address</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1083,8 +1080,9 @@ nm_ip_address_get_address_binary (<em class="parameter"><code><a class="link" hr
 <p><em class="parameter"><code>addr</code></em>
  must point to a buffer that is the correct size for <em class="parameter"><code>address</code></em>
 's family.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.4.17.11.11.6"></a><h4>Parameters</h4>
+<a name="id-1.4.17.11.11.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1116,8 +1114,9 @@ nm_ip_address_set_address_binary (<em class="parameter"><code><a class="link" hr
 <p><em class="parameter"><code>addr</code></em>
  must point to a buffer that is the correct size for <em class="parameter"><code>address</code></em>
 's family.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.4.17.11.12.6"></a><h4>Parameters</h4>
+<a name="id-1.4.17.11.12.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1164,7 +1163,6 @@ object.</p>
 <div class="refsect3">
 <a name="id-1.4.17.11.13.6"></a><h4>Returns</h4>
 <p> the IP address prefix</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1506,7 +1504,6 @@ to.</p></td>
 <div class="refsect3">
 <a name="id-1.4.17.11.22.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the objects contain the same values, <code class="literal">FALSE</code> if they do not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1563,7 +1560,6 @@ object.</p>
 <div class="refsect3">
 <a name="id-1.4.17.11.24.6"></a><h4>Returns</h4>
 <p> the IP address family</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1590,7 +1586,6 @@ nm_ip_route_get_dest (<em class="parameter"><code><a class="link" href="NMSettin
 <div class="refsect3">
 <a name="id-1.4.17.11.25.6"></a><h4>Returns</h4>
 <p> the IP address of the route's destination</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1637,8 +1632,9 @@ nm_ip_route_get_dest_binary (<em class="parameter"><code><a class="link" href="N
 <p><em class="parameter"><code>dest</code></em>
  must point to a buffer that is the correct size for <em class="parameter"><code>route</code></em>
 's family.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.4.17.11.27.6"></a><h4>Parameters</h4>
+<a name="id-1.4.17.11.27.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1670,8 +1666,9 @@ nm_ip_route_set_dest_binary (<em class="parameter"><code><a class="link" href="N
 <p><em class="parameter"><code>dest</code></em>
  must point to a buffer that is the correct size for <em class="parameter"><code>route</code></em>
 's family.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.4.17.11.28.6"></a><h4>Parameters</h4>
+<a name="id-1.4.17.11.28.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1717,7 +1714,6 @@ nm_ip_route_get_prefix (<em class="parameter"><code><a class="link" href="NMSett
 <div class="refsect3">
 <a name="id-1.4.17.11.29.6"></a><h4>Returns</h4>
 <p> the IP prefix</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1775,7 +1771,6 @@ route has no next hop.</p>
 <div class="refsect3">
 <a name="id-1.4.17.11.31.6"></a><h4>Returns</h4>
 <p> the IP address of the next hop, or <code class="literal">NULL</code> if this is a device route.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1823,8 +1818,9 @@ nm_ip_route_get_next_hop_binary (<em class="parameter"><code><a class="link" hre
 <p><em class="parameter"><code>next_hop</code></em>
  must point to a buffer that is the correct size for <em class="parameter"><code>route</code></em>
 's family.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.4.17.11.33.6"></a><h4>Parameters</h4>
+<a name="id-1.4.17.11.33.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1846,12 +1842,11 @@ nm_ip_route_get_next_hop_binary (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.4.17.11.33.7"></a><h4>Returns</h4>
+<a name="id-1.4.17.11.33.8"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>route</code></em>
 has a next hop, <code class="literal">FALSE</code> if not (in which case
 <em class="parameter"><code>next_hop</code></em>
 will be zeroed out)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1865,8 +1860,9 @@ nm_ip_route_set_next_hop_binary (<em class="parameter"><code><a class="link" hre
  (if non-<code class="literal">NULL</code>) must point to a buffer that is the correct size for
 <em class="parameter"><code>route</code></em>
 's family.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.4.17.11.34.6"></a><h4>Parameters</h4>
+<a name="id-1.4.17.11.34.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1914,7 +1910,6 @@ indicate "better" or more preferred routes; -1 indicates "default"
 <div class="refsect3">
 <a name="id-1.4.17.11.35.6"></a><h4>Returns</h4>
 <p> the route metric</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2078,7 +2073,6 @@ nm_setting_ip_config_get_method (<em class="parameter"><code><a class="link" hre
 <p> the <a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--method" title="The “method” property"><span class="type">“method”</span></a> property of the setting; see
 <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> and <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> for details of the
 methods available with each type.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2104,7 +2098,6 @@ nm_setting_ip_config_get_num_dns (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.4.17.11.41.5"></a><h4>Returns</h4>
 <p> the number of configured DNS servers</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2139,7 +2132,6 @@ nm_setting_ip_config_get_dns (<em class="parameter"><code><a class="link" href="
 <a name="id-1.4.17.11.42.5"></a><h4>Returns</h4>
 <p> the IP address of the DNS server at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2175,7 +2167,6 @@ nm_setting_ip_config_add_dns (<em class="parameter"><code><a class="link" href="
 <a name="id-1.4.17.11.43.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the DNS server was added; <code class="literal">FALSE</code> if the server was already
 known</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2243,7 +2234,6 @@ nm_setting_ip_config_remove_dns_by_value
 <div class="refsect3">
 <a name="id-1.4.17.11.45.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the DNS server was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2292,7 +2282,6 @@ nm_setting_ip_config_get_num_dns_searches
 <div class="refsect3">
 <a name="id-1.4.17.11.47.5"></a><h4>Returns</h4>
 <p> the number of configured DNS search domains</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2327,7 +2316,6 @@ nm_setting_ip_config_get_dns_search (<em class="parameter"><code><a class="link"
 <a name="id-1.4.17.11.48.5"></a><h4>Returns</h4>
 <p> the DNS search domain at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2363,7 +2351,6 @@ nm_setting_ip_config_add_dns_search (<em class="parameter"><code><a class="link"
 <a name="id-1.4.17.11.49.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the DNS search domain was added; <code class="literal">FALSE</code> if the search
 domain was already known</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2433,7 +2420,6 @@ nm_setting_ip_config_remove_dns_search_by_value
 <a name="id-1.4.17.11.51.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the DNS search domain was found and removed; <code class="literal">FALSE</code> if it was not.</p>
 <p>Since 0.9.10</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2483,7 +2469,6 @@ nm_setting_ip_config_get_num_addresses
 <div class="refsect3">
 <a name="id-1.4.17.11.53.5"></a><h4>Returns</h4>
 <p> the number of configured addresses</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2518,7 +2503,6 @@ nm_setting_ip_config_get_address (<em class="parameter"><code><a class="link" hr
 <a name="id-1.4.17.11.54.5"></a><h4>Returns</h4>
 <p> the address at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2555,7 +2539,6 @@ given address is duplicated internally and is not changed by this function.</p>
 <a name="id-1.4.17.11.55.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the address was added; <code class="literal">FALSE</code> if the address was already
 known.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2623,7 +2606,6 @@ nm_setting_ip_config_remove_address_by_value
 <div class="refsect3">
 <a name="id-1.4.17.11.57.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the address was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2672,7 +2654,6 @@ nm_setting_ip_config_get_gateway (<em class="parameter"><code><a class="link" hr
 <a name="id-1.4.17.11.59.5"></a><h4>Returns</h4>
 <p> the IP address of the gateway associated with this configuration, or
 <code class="literal">NULL</code>.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2698,7 +2679,6 @@ nm_setting_ip_config_get_num_routes (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.17.11.60.5"></a><h4>Returns</h4>
 <p> the number of configured routes</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2733,7 +2713,6 @@ nm_setting_ip_config_get_route (<em class="parameter"><code><a class="link" href
 <a name="id-1.4.17.11.61.5"></a><h4>Returns</h4>
 <p> the route at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2769,7 +2748,6 @@ given route is duplicated internally and is not changed by this function.</p>
 <div class="refsect3">
 <a name="id-1.4.17.11.62.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the route was added; <code class="literal">FALSE</code> if the route was already known.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2837,7 +2815,6 @@ nm_setting_ip_config_remove_route_by_value
 <div class="refsect3">
 <a name="id-1.4.17.11.64.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the route was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2888,7 +2865,6 @@ property.</p>
 <a name="id-1.4.17.11.66.6"></a><h4>Returns</h4>
 <p> the route metric that is used for routes that don't explicitly
 specify a metric. See <a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--route-metric" title="The “route-metric” property"><span class="type">“route-metric”</span></a> for more details.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2918,7 +2894,6 @@ property.</p>
 <a name="id-1.4.17.11.67.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if automatically configured (ie via DHCP) routes should be
 ignored.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2948,7 +2923,6 @@ property.</p>
 <a name="id-1.4.17.11.68.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if automatically configured (ie via DHCP) DNS information
 should be ignored.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2977,7 +2951,6 @@ property.</p>
 <div class="refsect3">
 <a name="id-1.4.17.11.69.6"></a><h4>Returns</h4>
 <p> the configured hostname to send to the DHCP server</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3008,7 +2981,6 @@ property.</p>
 <p> <code class="literal">TRUE</code> if NetworkManager should send the machine hostname to the
 DHCP server when requesting addresses to allow the server to automatically
 update DNS information for this machine.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3038,7 +3010,6 @@ property.</p>
 <a name="id-1.4.17.11.71.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if this connection should never be the default
 connection</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -3067,7 +3038,6 @@ property.</p>
 <a name="id-1.4.17.11.72.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if this connection doesn't require this type of IP
 addressing to complete for the connection to succeed.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -3077,104 +3047,78 @@ addressing to complete for the connection to succeed.</p>
 <a name="NM-SETTING-IP-CONFIG-METHOD:CAPS"></a><h3>NM_SETTING_IP_CONFIG_METHOD</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_METHOD             "method"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP-CONFIG-DNS:CAPS"></a><h3>NM_SETTING_IP_CONFIG_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_DNS                "dns"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP-CONFIG-DNS-SEARCH:CAPS"></a><h3>NM_SETTING_IP_CONFIG_DNS_SEARCH</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_DNS_SEARCH         "dns-search"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP-CONFIG-ADDRESSES:CAPS"></a><h3>NM_SETTING_IP_CONFIG_ADDRESSES</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_ADDRESSES          "addresses"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP-CONFIG-GATEWAY:CAPS"></a><h3>NM_SETTING_IP_CONFIG_GATEWAY</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_GATEWAY            "gateway"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP-CONFIG-ROUTES:CAPS"></a><h3>NM_SETTING_IP_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_ROUTES             "routes"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP-CONFIG-ROUTE-METRIC:CAPS"></a><h3>NM_SETTING_IP_CONFIG_ROUTE_METRIC</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_ROUTE_METRIC       "route-metric"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP-CONFIG-IGNORE-AUTO-ROUTES:CAPS"></a><h3>NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP-CONFIG-IGNORE-AUTO-DNS:CAPS"></a><h3>NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP-CONFIG-DHCP-HOSTNAME:CAPS"></a><h3>NM_SETTING_IP_CONFIG_DHCP_HOSTNAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP-CONFIG-DHCP-SEND-HOSTNAME:CAPS"></a><h3>NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_SETTING_IP_CONFIG_NEVER_DEFAULT</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_NEVER_DEFAULT      "never-default"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-IP-CONFIG-MAY-FAIL:CAPS"></a><h3>NM_SETTING_IP_CONFIG_MAY_FAIL</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_MAY_FAIL           "may-fail"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -3182,14 +3126,16 @@ addressing to complete for the connection to succeed.</p>
 <div class="refsect2">
 <a name="NMSettingIPConfig--addresses"></a><h3>The <code class="literal">“addresses”</code> property</h3>
 <pre class="programlisting">  “addresses”                <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<p>Array of IP addresses.</p>
+<p>Element-Type: NMIPAddress</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingIPConfig--dhcp-hostname"></a><h3>The <code class="literal">“dhcp-hostname”</code> property</h3>
 <pre class="programlisting">  “dhcp-hostname”            <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If the <a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dhcp-send-hostname" title="The “dhcp-send-hostname” property"><span class="type">“dhcp-send-hostname”</span></a> property is <code class="literal">TRUE</code>, then the
+specified name will be sent to the DHCP server when acquiring a lease.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3197,7 +3143,11 @@ addressing to complete for the connection to succeed.</p>
 <div class="refsect2">
 <a name="NMSettingIPConfig--dhcp-send-hostname"></a><h3>The <code class="literal">“dhcp-send-hostname”</code> property</h3>
 <pre class="programlisting">  “dhcp-send-hostname”       <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, a hostname is sent to the DHCP server when acquiring a lease.
+Some DHCP servers use this hostname to update DNS databases, essentially
+providing a static hostname for the computer.  If the
+<a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dhcp-hostname" title="The “dhcp-hostname” property"><span class="type">“dhcp-hostname”</span></a> property is <code class="literal">NULL</code> and this property is
+<code class="literal">TRUE</code>, the current persistent hostname of the computer is sent.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
@@ -3205,21 +3155,22 @@ addressing to complete for the connection to succeed.</p>
 <div class="refsect2">
 <a name="NMSettingIPConfig--dns"></a><h3>The <code class="literal">“dns”</code> property</h3>
 <pre class="programlisting">  “dns”                      <span class="type">GStrv</span></pre>
-<p></p>
+<p>Array of IP addresses of DNS servers.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingIPConfig--dns-search"></a><h3>The <code class="literal">“dns-search”</code> property</h3>
 <pre class="programlisting">  “dns-search”               <span class="type">GStrv</span></pre>
-<p></p>
+<p>Array of DNS search domains.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingIPConfig--gateway"></a><h3>The <code class="literal">“gateway”</code> property</h3>
 <pre class="programlisting">  “gateway”                  <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The gateway associated with this configuration. This is only meaningful
+if <a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--addresses" title="The “addresses” property"><span class="type">“addresses”</span></a> is also set.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3227,7 +3178,11 @@ addressing to complete for the connection to succeed.</p>
 <div class="refsect2">
 <a name="NMSettingIPConfig--ignore-auto-dns"></a><h3>The <code class="literal">“ignore-auto-dns”</code> property</h3>
 <pre class="programlisting">  “ignore-auto-dns”          <span class="type">gboolean</span></pre>
-<p></p>
+<p>When <a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--method" title="The “method” property"><span class="type">“method”</span></a> is set to "auto" and this property to
+<code class="literal">TRUE</code>, automatically configured nameservers and search domains are
+ignored and only nameservers and search domains specified in the
+<a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dns" title="The “dns” property"><span class="type">“dns”</span></a> and <a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dns-search" title="The “dns-search” property"><span class="type">“dns-search”</span></a> properties, if
+any, are used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -3235,7 +3190,9 @@ addressing to complete for the connection to succeed.</p>
 <div class="refsect2">
 <a name="NMSettingIPConfig--ignore-auto-routes"></a><h3>The <code class="literal">“ignore-auto-routes”</code> property</h3>
 <pre class="programlisting">  “ignore-auto-routes”       <span class="type">gboolean</span></pre>
-<p></p>
+<p>When <a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--method" title="The “method” property"><span class="type">“method”</span></a> is set to "auto" and this property to
+<code class="literal">TRUE</code>, automatically configured routes are ignored and only routes
+specified in the <a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--routes" title="The “routes” property"><span class="type">“routes”</span></a> property, if any, are used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -3243,7 +3200,13 @@ addressing to complete for the connection to succeed.</p>
 <div class="refsect2">
 <a name="NMSettingIPConfig--may-fail"></a><h3>The <code class="literal">“may-fail”</code> property</h3>
 <pre class="programlisting">  “may-fail”                 <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, allow overall network configuration to proceed even if the
+configuration specified by this property times out.  Note that at least
+one IP configuration must succeed or overall network configuration will
+still fail.  For example, in IPv6-only networks, setting this property to
+<code class="literal">TRUE</code> on the <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> allows the overall network configuration
+to succeed if IPv4 configuration fails but IPv6 configuration completes
+successfully.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
@@ -3251,7 +3214,17 @@ addressing to complete for the connection to succeed.</p>
 <div class="refsect2">
 <a name="NMSettingIPConfig--method"></a><h3>The <code class="literal">“method”</code> property</h3>
 <pre class="programlisting">  “method”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>IP configuration method.</p>
+<p><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> and <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> both support "auto",
+"manual", and "link-local". See the subclass-specific documentation for
+other values.</p>
+<p>In general, for the "auto" method, properties such as
+<a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dns" title="The “dns” property"><span class="type">“dns”</span></a> and <a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--routes" title="The “routes” property"><span class="type">“routes”</span></a> specify information
+that is added on to the information returned from automatic
+configuration.  The <a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--ignore-auto-routes" title="The “ignore-auto-routes” property"><span class="type">“ignore-auto-routes”</span></a> and
+<a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--ignore-auto-dns" title="The “ignore-auto-dns” property"><span class="type">“ignore-auto-dns”</span></a> properties modify this behavior.</p>
+<p>For methods that imply no upstream network, such as "shared" or
+"link-local", these properties must be empty.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -3259,7 +3232,9 @@ addressing to complete for the connection to succeed.</p>
 <div class="refsect2">
 <a name="NMSettingIPConfig--never-default"></a><h3>The <code class="literal">“never-default”</code> property</h3>
 <pre class="programlisting">  “never-default”            <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, this connection will never be the default connection for this
+IP type, meaning it will never be assigned the default route by
+NetworkManager.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -3267,7 +3242,16 @@ addressing to complete for the connection to succeed.</p>
 <div class="refsect2">
 <a name="NMSettingIPConfig--route-metric"></a><h3>The <code class="literal">“route-metric”</code> property</h3>
 <pre class="programlisting">  “route-metric”             <span class="type">gint64</span></pre>
-<p></p>
+<p>The default metric for routes that don't explicitly specify a metric.
+The default value -1 means that the metric is choosen automatically
+based on the device type.
+The metric applies to dynamic routes, manual (static) routes that
+don't have an explicit metric setting, address prefix routes, and
+the default route.
+Note that for IPv6, the kernel accepts zero (0) but coerces it to
+1024 (user default). Hence, setting this property to zero effectively
+mean setting it to 1024.
+For IPv4, zero is a regular value for the metric.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [-1,4294967295]</p>
 <p>Default value: -1</p>
@@ -3276,7 +3260,8 @@ addressing to complete for the connection to succeed.</p>
 <div class="refsect2">
 <a name="NMSettingIPConfig--routes"></a><h3>The <code class="literal">“routes”</code> property</h3>
 <pre class="programlisting">  “routes”                   <span class="type">GPtrArray</span> *</pre>
-<p></p>
+<p>Array of IP routes.</p>
+<p>Element-Type: NMIPRoute</p>
 <p>Flags: Read / Write</p>
 </div>
 </div>
@@ -3286,7 +3271,6 @@ addressing to complete for the connection to succeed.</p>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingInfiniband.html b/docs/libnm/html/NMSettingInfiniband.html
index d68c9929..4ab10c02 100644
--- a/docs/libnm/html/NMSettingInfiniband.html
+++ b/docs/libnm/html/NMSettingInfiniband.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingInfiniband</title>
+<title>NMSettingInfiniband: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingGsm.html" title="NMSettingGsm">
 <link rel="next" href="NMSettingIPConfig.html" title="NMSettingIPConfig">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -219,7 +219,6 @@ nm_setting_infiniband_get_mac_address (<em class="parameter"><code><a class="lin
 <div class="refsect3">
 <a name="id-1.4.16.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -245,7 +244,6 @@ nm_setting_infiniband_get_mtu (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.4.16.8.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband--mtu" title="The “mtu” property"><span class="type">“mtu”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -274,7 +272,6 @@ nm_setting_infiniband_get_transport_mode
 <div class="refsect3">
 <a name="id-1.4.16.8.5.6"></a><h4>Returns</h4>
 <p> the IPoIB transport mode</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -303,7 +300,6 @@ a 16-bit unsigned integer.</p>
 <div class="refsect3">
 <a name="id-1.4.16.8.6.6"></a><h4>Returns</h4>
 <p> the IPoIB P_Key</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -330,7 +326,6 @@ nm_setting_infiniband_get_parent (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.4.16.8.7.6"></a><h4>Returns</h4>
 <p> the parent interface name</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -360,7 +355,6 @@ return <code class="literal">NULL</code>.)</p>
 <div class="refsect3">
 <a name="id-1.4.16.8.8.6"></a><h4>Returns</h4>
 <p> the interface name, or <code class="literal">NULL</code></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -370,48 +364,36 @@ return <code class="literal">NULL</code>.)</p>
 <a name="NM-SETTING-INFINIBAND-SETTING-NAME:CAPS"></a><h3>NM_SETTING_INFINIBAND_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_SETTING_NAME "infiniband"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-INFINIBAND-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_INFINIBAND_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_MAC_ADDRESS    "mac-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-INFINIBAND-MTU:CAPS"></a><h3>NM_SETTING_INFINIBAND_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_MTU            "mtu"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-INFINIBAND-TRANSPORT-MODE:CAPS"></a><h3>NM_SETTING_INFINIBAND_TRANSPORT_MODE</h3>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_TRANSPORT_MODE "transport-mode"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-INFINIBAND-P-KEY:CAPS"></a><h3>NM_SETTING_INFINIBAND_P_KEY</h3>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_P_KEY          "p-key"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-INFINIBAND-PARENT:CAPS"></a><h3>NM_SETTING_INFINIBAND_PARENT</h3>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_PARENT         "parent"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -419,7 +401,9 @@ return <code class="literal">NULL</code>.)</p>
 <div class="refsect2">
 <a name="NMSettingInfiniband--mac-address"></a><h3>The <code class="literal">“mac-address”</code> property</h3>
 <pre class="programlisting">  “mac-address”              <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If specified, this connection will only apply to the IPoIB device whose
+permanent MAC address matches. This property does not change the MAC
+address of the device (i.e. MAC spoofing).</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -427,7 +411,8 @@ return <code class="literal">NULL</code>.)</p>
 <div class="refsect2">
 <a name="NMSettingInfiniband--mtu"></a><h3>The <code class="literal">“mtu”</code> property</h3>
 <pre class="programlisting">  “mtu”                      <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple frames.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -435,7 +420,10 @@ return <code class="literal">NULL</code>.)</p>
 <div class="refsect2">
 <a name="NMSettingInfiniband--p-key"></a><h3>The <code class="literal">“p-key”</code> property</h3>
 <pre class="programlisting">  “p-key”                    <span class="type">gint</span></pre>
-<p></p>
+<p>The InfiniBand P_Key to use for this device. A value of -1 means to use
+the default P_Key (aka "the P_Key at index 0").  Otherwise it is a 16-bit
+unsigned integer, whose high bit is set if it is a "full membership"
+P_Key.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [-1,65535]</p>
 <p>Default value: -1</p>
@@ -444,7 +432,10 @@ return <code class="literal">NULL</code>.)</p>
 <div class="refsect2">
 <a name="NMSettingInfiniband--parent"></a><h3>The <code class="literal">“parent”</code> property</h3>
 <pre class="programlisting">  “parent”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The interface name of the parent device of this device. Normally <code class="literal">NULL</code>,
+but if the <a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband--p-key" title="The “p-key” property"><span class="type">“p_key”</span></a> property is set, then you must
+specify the base device by setting either this property or
+<a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a>.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: NULL</p>
 </div>
@@ -452,14 +443,14 @@ return <code class="literal">NULL</code>.)</p>
 <div class="refsect2">
 <a name="NMSettingInfiniband--transport-mode"></a><h3>The <code class="literal">“transport-mode”</code> property</h3>
 <pre class="programlisting">  “transport-mode”           <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The IP-over-InfiniBand transport mode. Either "datagram" or
+"connected".</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingOlpcMesh.html b/docs/libnm/html/NMSettingOlpcMesh.html
index 8291a313..b8d90183 100644
--- a/docs/libnm/html/NMSettingOlpcMesh.html
+++ b/docs/libnm/html/NMSettingOlpcMesh.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingOlpcMesh</title>
+<title>NMSettingOlpcMesh: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingIP6Config.html" title="NMSettingIP6Config">
 <link rel="next" href="NMSettingPpp.html" title="NMSettingPpp">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -140,8 +140,6 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingOlpcMesh.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMSettingOlpcMesh.functions_details"></a><h2>Functions</h2>
@@ -153,7 +151,6 @@ nm_setting_olpc_mesh_new (<em class="parameter"><code><span class="type">void</s
 <div class="refsect3">
 <a name="id-1.4.20.8.2.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -172,12 +169,6 @@ nm_setting_olpc_mesh_get_ssid (<em class="parameter"><code><a class="link" href=
 <a name="nm-setting-olpc-mesh-get-channel"></a><h3>nm_setting_olpc_mesh_get_channel ()</h3>
 <pre class="programlisting"><span class="returnvalue">guint32</span>
 nm_setting_olpc_mesh_get_channel (<em class="parameter"><code><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> *setting</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.4.20.8.4.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -185,12 +176,6 @@ nm_setting_olpc_mesh_get_channel (<em class="parameter"><code><a class="link" hr
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_setting_olpc_mesh_get_dhcp_anycast_address
                                (<em class="parameter"><code><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> *setting</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.4.20.8.5.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 </div>
 <div class="refsect1">
@@ -199,32 +184,24 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 <a name="NM-SETTING-OLPC-MESH-SETTING-NAME:CAPS"></a><h3>NM_SETTING_OLPC_MESH_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-SSID:CAPS"></a><h3>NM_SETTING_OLPC_MESH_SSID</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-CHANNEL:CAPS"></a><h3>NM_SETTING_OLPC_MESH_CHANNEL</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-OLPC-MESH-DHCP-ANYCAST-ADDRESS:CAPS"></a><h3>NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -232,7 +209,7 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 <div class="refsect2">
 <a name="NMSettingOlpcMesh--channel"></a><h3>The <code class="literal">“channel”</code> property</h3>
 <pre class="programlisting">  “channel”                  <span class="type">guint</span></pre>
-<p></p>
+<p>Channel on which the mesh network to join is located.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -240,7 +217,9 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 <div class="refsect2">
 <a name="NMSettingOlpcMesh--dhcp-anycast-address"></a><h3>The <code class="literal">“dhcp-anycast-address”</code> property</h3>
 <pre class="programlisting">  “dhcp-anycast-address”     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Anycast DHCP MAC address used when requesting an IP address via DHCP.
+The specific anycast address used determines which DHCP server class
+answers the request.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -248,13 +227,12 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 <div class="refsect2">
 <a name="NMSettingOlpcMesh--ssid"></a><h3>The <code class="literal">“ssid”</code> property</h3>
 <pre class="programlisting">  “ssid”                     <span class="type">GBytes</span> *</pre>
-<p></p>
+<p>SSID of the mesh network to join.</p>
 <p>Flags: Read / Write</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingPpp.html b/docs/libnm/html/NMSettingPpp.html
index 832e3fcd..2ea94443 100644
--- a/docs/libnm/html/NMSettingPpp.html
+++ b/docs/libnm/html/NMSettingPpp.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingPpp</title>
+<title>NMSettingPpp: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
 <link rel="next" href="NMSettingPppoe.html" title="NMSettingPppoe">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -435,7 +435,6 @@ nm_setting_ppp_get_noauth (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="id-1.4.21.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--noauth" title="The “noauth” property"><span class="type">“noauth”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -461,7 +460,6 @@ nm_setting_ppp_get_refuse_eap (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.4.21.8.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--refuse-eap" title="The “refuse-eap” property"><span class="type">“refuse-eap”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -487,7 +485,6 @@ nm_setting_ppp_get_refuse_pap (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.4.21.8.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--refuse-pap" title="The “refuse-pap” property"><span class="type">“refuse-pap”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -513,7 +510,6 @@ nm_setting_ppp_get_refuse_chap (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.4.21.8.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--refuse-chap" title="The “refuse-chap” property"><span class="type">“refuse-chap”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -539,7 +535,6 @@ nm_setting_ppp_get_refuse_mschap (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.4.21.8.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--refuse-mschap" title="The “refuse-mschap” property"><span class="type">“refuse-mschap”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -565,7 +560,6 @@ nm_setting_ppp_get_refuse_mschapv2 (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.21.8.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--refuse-mschapv2" title="The “refuse-mschapv2” property"><span class="type">“refuse-mschapv2”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -591,7 +585,6 @@ nm_setting_ppp_get_nobsdcomp (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.21.8.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--nobsdcomp" title="The “nobsdcomp” property"><span class="type">“nobsdcomp”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -617,7 +610,6 @@ nm_setting_ppp_get_nodeflate (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.21.8.10.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--nodeflate" title="The “nodeflate” property"><span class="type">“nodeflate”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -643,7 +635,6 @@ nm_setting_ppp_get_no_vj_comp (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.4.21.8.11.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--no-vj-comp" title="The “no-vj-comp” property"><span class="type">“no-vj-comp”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -669,7 +660,6 @@ nm_setting_ppp_get_require_mppe (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.4.21.8.12.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--require-mppe" title="The “require-mppe” property"><span class="type">“require-mppe”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -695,7 +685,6 @@ nm_setting_ppp_get_require_mppe_128 (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.21.8.13.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--require-mppe-128" title="The “require-mppe-128” property"><span class="type">“require-mppe-128”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -721,7 +710,6 @@ nm_setting_ppp_get_mppe_stateful (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.4.21.8.14.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--mppe-stateful" title="The “mppe-stateful” property"><span class="type">“mppe-stateful”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -747,7 +735,6 @@ nm_setting_ppp_get_crtscts (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.4.21.8.15.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--crtscts" title="The “crtscts” property"><span class="type">“crtscts”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -773,7 +760,6 @@ nm_setting_ppp_get_baud (<em class="parameter"><code><a class="link" href="NMSet
 <div class="refsect3">
 <a name="id-1.4.21.8.16.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--baud" title="The “baud” property"><span class="type">“baud”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -799,7 +785,6 @@ nm_setting_ppp_get_mru (<em class="parameter"><code><a class="link" href="NMSett
 <div class="refsect3">
 <a name="id-1.4.21.8.17.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--mru" title="The “mru” property"><span class="type">“mru”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -825,7 +810,6 @@ nm_setting_ppp_get_mtu (<em class="parameter"><code><a class="link" href="NMSett
 <div class="refsect3">
 <a name="id-1.4.21.8.18.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--mtu" title="The “mtu” property"><span class="type">“mtu”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -851,7 +835,6 @@ nm_setting_ppp_get_lcp_echo_failure (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.21.8.19.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--lcp-echo-failure" title="The “lcp-echo-failure” property"><span class="type">“lcp-echo-failure”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -877,7 +860,6 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.4.21.8.20.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPpp.html#NMSettingPpp--lcp-echo-interval" title="The “lcp-echo-interval” property"><span class="type">“lcp-echo-interval”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -887,152 +869,114 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <a name="NM-SETTING-PPP-SETTING-NAME:CAPS"></a><h3>NM_SETTING_PPP_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_SETTING_NAME "ppp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-NOAUTH:CAPS"></a><h3>NM_SETTING_PPP_NOAUTH</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NOAUTH            "noauth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-EAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_EAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-PAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_PAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-CHAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_CHAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-MSCHAP:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_MSCHAP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REFUSE-MSCHAPV2:CAPS"></a><h3>NM_SETTING_PPP_REFUSE_MSCHAPV2</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-NOBSDCOMP:CAPS"></a><h3>NM_SETTING_PPP_NOBSDCOMP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-NODEFLATE:CAPS"></a><h3>NM_SETTING_PPP_NODEFLATE</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-NO-VJ-COMP:CAPS"></a><h3>NM_SETTING_PPP_NO_VJ_COMP</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REQUIRE-MPPE:CAPS"></a><h3>NM_SETTING_PPP_REQUIRE_MPPE</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-REQUIRE-MPPE-128:CAPS"></a><h3>NM_SETTING_PPP_REQUIRE_MPPE_128</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-MPPE-STATEFUL:CAPS"></a><h3>NM_SETTING_PPP_MPPE_STATEFUL</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-CRTSCTS:CAPS"></a><h3>NM_SETTING_PPP_CRTSCTS</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_CRTSCTS           "crtscts"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-BAUD:CAPS"></a><h3>NM_SETTING_PPP_BAUD</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_BAUD              "baud"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-MRU:CAPS"></a><h3>NM_SETTING_PPP_MRU</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_MRU               "mru"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-MTU:CAPS"></a><h3>NM_SETTING_PPP_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_MTU               "mtu"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-LCP-ECHO-FAILURE:CAPS"></a><h3>NM_SETTING_PPP_LCP_ECHO_FAILURE</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPP-LCP-ECHO-INTERVAL:CAPS"></a><h3>NM_SETTING_PPP_LCP_ECHO_INTERVAL</h3>
 <pre class="programlisting">#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1040,7 +984,9 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--baud"></a><h3>The <code class="literal">“baud”</code> property</h3>
 <pre class="programlisting">  “baud”                     <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, instruct pppd to set the serial port to the specified
+baudrate.  This value should normally be left as 0 to automatically
+choose the speed.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1048,7 +994,9 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--crtscts"></a><h3>The <code class="literal">“crtscts”</code> property</h3>
 <pre class="programlisting">  “crtscts”                  <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, specify that pppd should set the serial port to use hardware
+flow control with RTS and CTS signals.  This value should normally be set
+to <code class="literal">FALSE</code>.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1056,7 +1004,10 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--lcp-echo-failure"></a><h3>The <code class="literal">“lcp-echo-failure”</code> property</h3>
 <pre class="programlisting">  “lcp-echo-failure”         <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, instruct pppd to presume the connection to the peer has
+failed if the specified number of LCP echo-requests go unanswered by the
+peer.  The "lcp-echo-interval" property must also be set to a non-zero
+value if this property is used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1064,7 +1015,10 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--lcp-echo-interval"></a><h3>The <code class="literal">“lcp-echo-interval”</code> property</h3>
 <pre class="programlisting">  “lcp-echo-interval”        <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, instruct pppd to send an LCP echo-request frame to the peer
+every n seconds (where n is the specified value).  Note that some PPP
+peers will respond to echo requests and some will not, and it is not
+possible to autodetect this.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1072,7 +1026,8 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--mppe-stateful"></a><h3>The <code class="literal">“mppe-stateful”</code> property</h3>
 <pre class="programlisting">  “mppe-stateful”            <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, stateful MPPE is used.  See pppd documentation for more
+information on stateful MPPE.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1080,7 +1035,9 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--mru"></a><h3>The <code class="literal">“mru”</code> property</h3>
 <pre class="programlisting">  “mru”                      <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, instruct pppd to request that the peer send packets no
+larger than the specified size.  If non-zero, the MRU should be between
+128 and 16384.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 16384</p>
 <p>Default value: 0</p>
@@ -1089,7 +1046,8 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--mtu"></a><h3>The <code class="literal">“mtu”</code> property</h3>
 <pre class="programlisting">  “mtu”                      <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, instruct pppd to send packets no larger than the specified
+size.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1097,7 +1055,7 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--no-vj-comp"></a><h3>The <code class="literal">“no-vj-comp”</code> property</h3>
 <pre class="programlisting">  “no-vj-comp”               <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, Van Jacobsen TCP header compression will not be requested.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1105,7 +1063,9 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--noauth"></a><h3>The <code class="literal">“noauth”</code> property</h3>
 <pre class="programlisting">  “noauth”                   <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, do not require the other side (usually the PPP server) to
+authenticate itself to the client.  If <code class="literal">FALSE</code>, require authentication
+from the remote side.  In almost all cases, this should be <code class="literal">TRUE</code>.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
@@ -1113,7 +1073,7 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--nobsdcomp"></a><h3>The <code class="literal">“nobsdcomp”</code> property</h3>
 <pre class="programlisting">  “nobsdcomp”                <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, BSD compression will not be requested.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1121,7 +1081,7 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--nodeflate"></a><h3>The <code class="literal">“nodeflate”</code> property</h3>
 <pre class="programlisting">  “nodeflate”                <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, "deflate" compression will not be requested.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1129,7 +1089,7 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--refuse-chap"></a><h3>The <code class="literal">“refuse-chap”</code> property</h3>
 <pre class="programlisting">  “refuse-chap”              <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, the CHAP authentication method will not be used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1137,7 +1097,7 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--refuse-eap"></a><h3>The <code class="literal">“refuse-eap”</code> property</h3>
 <pre class="programlisting">  “refuse-eap”               <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, the EAP authentication method will not be used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1145,7 +1105,7 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--refuse-mschap"></a><h3>The <code class="literal">“refuse-mschap”</code> property</h3>
 <pre class="programlisting">  “refuse-mschap”            <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, the MSCHAP authentication method will not be used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1153,7 +1113,7 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--refuse-mschapv2"></a><h3>The <code class="literal">“refuse-mschapv2”</code> property</h3>
 <pre class="programlisting">  “refuse-mschapv2”          <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, the MSCHAPv2 authentication method will not be used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1161,7 +1121,7 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--refuse-pap"></a><h3>The <code class="literal">“refuse-pap”</code> property</h3>
 <pre class="programlisting">  “refuse-pap”               <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, the PAP authentication method will not be used.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1169,7 +1129,10 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--require-mppe"></a><h3>The <code class="literal">“require-mppe”</code> property</h3>
 <pre class="programlisting">  “require-mppe”             <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
+the PPP session.  If either 64-bit or 128-bit MPPE is not available the
+session will fail.  Note that MPPE is not used on mobile broadband
+connections.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1177,14 +1140,15 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <div class="refsect2">
 <a name="NMSettingPpp--require-mppe-128"></a><h3>The <code class="literal">“require-mppe-128”</code> property</h3>
 <pre class="programlisting">  “require-mppe-128”         <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
+required for the PPP session, and the "require-mppe" property must also
+be set to <code class="literal">TRUE</code>.  If 128-bit MPPE is not available the session will fail.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: FALSE</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingPppoe.html b/docs/libnm/html/NMSettingPppoe.html
index daa5f943..6155a548 100644
--- a/docs/libnm/html/NMSettingPppoe.html
+++ b/docs/libnm/html/NMSettingPppoe.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingPppoe</title>
+<title>NMSettingPppoe: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingPpp.html" title="NMSettingPpp">
 <link rel="next" href="NMSettingSerial.html" title="NMSettingSerial">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -196,7 +196,6 @@ nm_setting_pppoe_get_service (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.22.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPppoe.html#NMSettingPppoe--service" title="The “service” property"><span class="type">“service”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -222,7 +221,6 @@ nm_setting_pppoe_get_username (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.4.22.8.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPppoe.html#NMSettingPppoe--username" title="The “username” property"><span class="type">“username”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -248,7 +246,6 @@ nm_setting_pppoe_get_password (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.4.22.8.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingPppoe.html#NMSettingPppoe--password" title="The “password” property"><span class="type">“password”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -274,7 +271,6 @@ nm_setting_pppoe_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.22.8.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingPppoe.html#NMSettingPppoe--password" title="The “password” property"><span class="type">“password”</span></a></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -284,40 +280,30 @@ nm_setting_pppoe_get_password_flags (<em class="parameter"><code><a class="link"
 <a name="NM-SETTING-PPPOE-SETTING-NAME:CAPS"></a><h3>NM_SETTING_PPPOE_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPPOE-SERVICE:CAPS"></a><h3>NM_SETTING_PPPOE_SERVICE</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_SERVICE        "service"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPPOE-USERNAME:CAPS"></a><h3>NM_SETTING_PPPOE_USERNAME</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_USERNAME       "username"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPPOE-PASSWORD:CAPS"></a><h3>NM_SETTING_PPPOE_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_PASSWORD       "password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_PPPOE_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -325,7 +311,7 @@ nm_setting_pppoe_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSettingPppoe--password"></a><h3>The <code class="literal">“password”</code> property</h3>
 <pre class="programlisting">  “password”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Password used to authenticate with the PPPoE service.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -333,14 +319,17 @@ nm_setting_pppoe_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSettingPppoe--password-flags"></a><h3>The <code class="literal">“password-flags”</code> property</h3>
 <pre class="programlisting">  “password-flags”           <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingPppoe.html#NMSettingPppoe--password" title="The “password” property"><span class="type">“password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingPppoe--service"></a><h3>The <code class="literal">“service”</code> property</h3>
 <pre class="programlisting">  “service”                  <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If specified, instruct PPPoE to only initiate sessions with access
+concentrators that provide the specified service.  For most providers,
+this should be left blank.  It is only required if there are multiple
+access concentrators or a specific service is known to be required.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -348,14 +337,13 @@ nm_setting_pppoe_get_password_flags (<em class="parameter"><code><a class="link"
 <div class="refsect2">
 <a name="NMSettingPppoe--username"></a><h3>The <code class="literal">“username”</code> property</h3>
 <pre class="programlisting">  “username”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Username used to authenticate with the PPPoE service.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html
index f27e73ee..14ae299b 100644
--- a/docs/libnm/html/NMSettingSerial.html
+++ b/docs/libnm/html/NMSettingSerial.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingSerial</title>
+<title>NMSettingSerial: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingPppoe.html" title="NMSettingPppoe">
 <link rel="next" href="NMSettingTeam.html" title="NMSettingTeam">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -220,7 +220,6 @@ nm_setting_serial_get_baud (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.4.23.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingSerial.html#NMSettingSerial--baud" title="The “baud” property"><span class="type">“baud”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -246,7 +245,6 @@ nm_setting_serial_get_bits (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.4.23.8.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingSerial.html#NMSettingSerial--bits" title="The “bits” property"><span class="type">“bits”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -272,7 +270,6 @@ nm_setting_serial_get_parity (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.23.8.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingSerial.html#NMSettingSerial--parity" title="The “parity” property"><span class="type">“parity”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -298,7 +295,6 @@ nm_setting_serial_get_stopbits (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.4.23.8.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingSerial.html#NMSettingSerial--stopbits" title="The “stopbits” property"><span class="type">“stopbits”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -324,7 +320,6 @@ nm_setting_serial_get_send_delay (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.4.23.8.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingSerial.html#NMSettingSerial--send-delay" title="The “send-delay” property"><span class="type">“send-delay”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -334,8 +329,6 @@ nm_setting_serial_get_send_delay (<em class="parameter"><code><a class="link" hr
 <a name="NM-SETTING-SERIAL-SETTING-NAME:CAPS"></a><h3>NM_SETTING_SERIAL_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_SETTING_NAME "serial"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -380,40 +373,30 @@ nm_setting_serial_get_send_delay (<em class="parameter"><code><a class="link" hr
 <a name="NM-SETTING-SERIAL-BAUD:CAPS"></a><h3>NM_SETTING_SERIAL_BAUD</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_BAUD "baud"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-SERIAL-BITS:CAPS"></a><h3>NM_SETTING_SERIAL_BITS</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_BITS "bits"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-SERIAL-PARITY:CAPS"></a><h3>NM_SETTING_SERIAL_PARITY</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_PARITY "parity"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-SERIAL-STOPBITS:CAPS"></a><h3>NM_SETTING_SERIAL_STOPBITS</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_STOPBITS "stopbits"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-SERIAL-SEND-DELAY:CAPS"></a><h3>NM_SETTING_SERIAL_SEND_DELAY</h3>
 <pre class="programlisting">#define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -421,7 +404,9 @@ nm_setting_serial_get_send_delay (<em class="parameter"><code><a class="link" hr
 <div class="refsect2">
 <a name="NMSettingSerial--baud"></a><h3>The <code class="literal">“baud”</code> property</h3>
 <pre class="programlisting">  “baud”                     <span class="type">guint</span></pre>
-<p></p>
+<p>Speed to use for communication over the serial port.  Note that this
+value usually has no effect for mobile broadband modems as they generally
+ignore speed settings and use the highest available speed.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 57600</p>
 </div>
@@ -429,7 +414,7 @@ nm_setting_serial_get_send_delay (<em class="parameter"><code><a class="link" hr
 <div class="refsect2">
 <a name="NMSettingSerial--bits"></a><h3>The <code class="literal">“bits”</code> property</h3>
 <pre class="programlisting">  “bits”                     <span class="type">guint</span></pre>
-<p></p>
+<p>Byte-width of the serial communication. The 8 in "8n1" for example.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [5,8]</p>
 <p>Default value: 8</p>
@@ -438,7 +423,7 @@ nm_setting_serial_get_send_delay (<em class="parameter"><code><a class="link" hr
 <div class="refsect2">
 <a name="NMSettingSerial--parity"></a><h3>The <code class="literal">“parity”</code> property</h3>
 <pre class="programlisting">  “parity”                   <a class="link" href="NMSettingSerial.html#NMSettingSerialParity" title="enum NMSettingSerialParity"><span class="type">NMSettingSerialParity</span></a></pre>
-<p></p>
+<p>Parity setting of the serial port.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: NM_SETTING_SERIAL_PARITY_NONE</p>
 </div>
@@ -446,7 +431,7 @@ nm_setting_serial_get_send_delay (<em class="parameter"><code><a class="link" hr
 <div class="refsect2">
 <a name="NMSettingSerial--send-delay"></a><h3>The <code class="literal">“send-delay”</code> property</h3>
 <pre class="programlisting">  “send-delay”               <span class="type">guint64</span></pre>
-<p></p>
+<p>Time to delay between each byte sent to the modem, in microseconds.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -454,7 +439,8 @@ nm_setting_serial_get_send_delay (<em class="parameter"><code><a class="link" hr
 <div class="refsect2">
 <a name="NMSettingSerial--stopbits"></a><h3>The <code class="literal">“stopbits”</code> property</h3>
 <pre class="programlisting">  “stopbits”                 <span class="type">guint</span></pre>
-<p></p>
+<p>Number of stop bits for communication on the serial port.  Either 1 or 2.
+The 1 in "8n1" for example.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: [1,2]</p>
 <p>Default value: 1</p>
@@ -462,7 +448,6 @@ nm_setting_serial_get_send_delay (<em class="parameter"><code><a class="link" hr
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index 85f6eeea..bd678358 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingTeam</title>
+<title>NMSettingTeam: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingSerial.html" title="NMSettingSerial">
 <link rel="next" href="NMSettingTeamPort.html" title="NMSettingTeamPort">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -142,7 +142,6 @@ nm_setting_team_get_config (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.4.24.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingTeam.html#NMSettingTeam--config" title="The “config” property"><span class="type">“config”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -152,16 +151,12 @@ nm_setting_team_get_config (<em class="parameter"><code><a class="link" href="NM
 <a name="NM-SETTING-TEAM-SETTING-NAME:CAPS"></a><h3>NM_SETTING_TEAM_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_TEAM_SETTING_NAME "team"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-TEAM-CONFIG:CAPS"></a><h3>NM_SETTING_TEAM_CONFIG</h3>
 <pre class="programlisting">#define NM_SETTING_TEAM_CONFIG "config"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -169,14 +164,16 @@ nm_setting_team_get_config (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect2">
 <a name="NMSettingTeam--config"></a><h3>The <code class="literal">“config”</code> property</h3>
 <pre class="programlisting">  “config”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The JSON configuration for the team network interface.  The property
+should contain raw JSON configuration data suitable for teamd, because
+the value is passed directly to teamd. If not specified, the default
+configuration is used.  See man teamd.conf for the format details.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html
index e25e1e4e..fbe09ce0 100644
--- a/docs/libnm/html/NMSettingTeamPort.html
+++ b/docs/libnm/html/NMSettingTeamPort.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingTeamPort</title>
+<title>NMSettingTeamPort: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingTeam.html" title="NMSettingTeam">
 <link rel="next" href="NMSettingVlan.html" title="NMSettingVlan">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -142,7 +142,6 @@ nm_setting_team_port_get_config (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.4.25.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingTeamPort.html#NMSettingTeamPort--config" title="The “config” property"><span class="type">“config”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -152,16 +151,12 @@ nm_setting_team_port_get_config (<em class="parameter"><code><a class="link" hre
 <a name="NM-SETTING-TEAM-PORT-SETTING-NAME:CAPS"></a><h3>NM_SETTING_TEAM_PORT_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_TEAM_PORT_SETTING_NAME "team-port"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-TEAM-PORT-CONFIG:CAPS"></a><h3>NM_SETTING_TEAM_PORT_CONFIG</h3>
 <pre class="programlisting">#define NM_SETTING_TEAM_PORT_CONFIG     "config"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -169,14 +164,16 @@ nm_setting_team_port_get_config (<em class="parameter"><code><a class="link" hre
 <div class="refsect2">
 <a name="NMSettingTeamPort--config"></a><h3>The <code class="literal">“config”</code> property</h3>
 <pre class="programlisting">  “config”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The JSON configuration for the team port. The property should contain raw
+JSON configuration data suitable for teamd, because the value is passed
+directly to teamd. If not specified, the default configuration is
+used. See man teamd.conf for the format details.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index a82533dc..d205fd32 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingVlan</title>
+<title>NMSettingVlan: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingTeamPort.html" title="NMSettingTeamPort">
 <link rel="next" href="NMSettingVpn.html" title="NMSettingVpn">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -272,7 +272,6 @@ nm_setting_vlan_get_parent (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.4.26.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingVlan.html#NMSettingVlan--parent" title="The “parent” property"><span class="type">“parent”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -298,7 +297,6 @@ nm_setting_vlan_get_id (<em class="parameter"><code><a class="link" href="NMSett
 <div class="refsect3">
 <a name="id-1.4.26.8.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingVlan.html#NMSettingVlan--id" title="The “id” property"><span class="type">“id”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -324,7 +322,6 @@ nm_setting_vlan_get_flags (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="id-1.4.26.8.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingVlan.html#NMSettingVlan--flags" title="The “flags” property"><span class="type">“flags”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -361,7 +358,6 @@ properties of this setting.</p>
 <div class="refsect3">
 <a name="id-1.4.26.8.6.6"></a><h4>Returns</h4>
 <p> return the number of ingress/egress priority entries, -1 if error</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -415,7 +411,6 @@ or <a class="link" href="NMSettingVlan.html#NMSettingVlan--egress-priority-map"
 <div class="refsect3">
 <a name="id-1.4.26.8.7.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if a priority map was returned, <code class="literal">FALSE</code> if error</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -480,7 +475,6 @@ to</p></td>
 <a name="id-1.4.26.8.8.8"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the new priority mapping was successfully added to the
 list, <code class="literal">FALSE</code> if error</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -574,7 +568,6 @@ to</p></td>
 <div class="refsect3">
 <a name="id-1.4.26.8.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the priority mapping was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -620,7 +613,6 @@ properties.</p>
 <div class="refsect3">
 <a name="id-1.4.26.8.11.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the priority mapping was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -695,7 +687,6 @@ the Linux SKB priorities to 802.1p priorities.</p>
 <a name="id-1.4.26.8.13.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the entry was successfully added to the list, or it
 overwrote the old value, <code class="literal">FALSE</code> if error</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -705,48 +696,36 @@ overwrote the old value, <code class="literal">FALSE</code> if error</p>
 <a name="NM-SETTING-VLAN-SETTING-NAME:CAPS"></a><h3>NM_SETTING_VLAN_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_SETTING_NAME "vlan"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VLAN-PARENT:CAPS"></a><h3>NM_SETTING_VLAN_PARENT</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_PARENT               "parent"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VLAN-ID:CAPS"></a><h3>NM_SETTING_VLAN_ID</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_ID                   "id"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VLAN-FLAGS:CAPS"></a><h3>NM_SETTING_VLAN_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_FLAGS                "flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VLAN-INGRESS-PRIORITY-MAP:CAPS"></a><h3>NM_SETTING_VLAN_INGRESS_PRIORITY_MAP</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_INGRESS_PRIORITY_MAP "ingress-priority-map"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VLAN-EGRESS-PRIORITY-MAP:CAPS"></a><h3>NM_SETTING_VLAN_EGRESS_PRIORITY_MAP</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -828,21 +807,28 @@ to 802.1p priorities used in VLANs.</p>
 <div class="refsect2">
 <a name="NMSettingVlan--egress-priority-map"></a><h3>The <code class="literal">“egress-priority-map”</code> property</h3>
 <pre class="programlisting">  “egress-priority-map”      <span class="type">GStrv</span></pre>
-<p></p>
+<p>For outgoing packets, a list of mappings from Linux SKB priorities to
+802.1p priorities.  The mapping is given in the format "from:to" where
+both "from" and "to" are unsigned integers, ie "7:3".</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingVlan--flags"></a><h3>The <code class="literal">“flags”</code> property</h3>
 <pre class="programlisting">  “flags”                    <a class="link" href="NMSettingVlan.html#NMVlanFlags" title="enum NMVlanFlags"><span class="type">NMVlanFlags</span></a></pre>
-<p></p>
+<p>One or more flags which control the behavior and features of the VLAN
+interface.  Flags include <a class="link" href="NMSettingVlan.html#NM-VLAN-FLAG-REORDER-HEADERS:CAPS"><code class="literal">NM_VLAN_FLAG_REORDER_HEADERS</code></a> (reordering of
+output packet headers), <a class="link" href="NMSettingVlan.html#NM-VLAN-FLAG-GVRP:CAPS"><code class="literal">NM_VLAN_FLAG_GVRP</code></a> (use of the GVRP protocol),
+and <a class="link" href="NMSettingVlan.html#NM-VLAN-FLAG-LOOSE-BINDING:CAPS"><code class="literal">NM_VLAN_FLAG_LOOSE_BINDING</code></a> (loose binding of the interface to its
+master device's operating state).</p>
 <p>Flags: Read / Write / Construct</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingVlan--id"></a><h3>The <code class="literal">“id”</code> property</h3>
 <pre class="programlisting">  “id”                       <span class="type">guint</span></pre>
-<p></p>
+<p>The VLAN identifier that the interface created by this connection should
+be assigned.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 4095</p>
 <p>Default value: 0</p>
@@ -851,21 +837,25 @@ to 802.1p priorities used in VLANs.</p>
 <div class="refsect2">
 <a name="NMSettingVlan--ingress-priority-map"></a><h3>The <code class="literal">“ingress-priority-map”</code> property</h3>
 <pre class="programlisting">  “ingress-priority-map”     <span class="type">GStrv</span></pre>
-<p></p>
+<p>For incoming packets, a list of mappings from 802.1p priorities to Linux
+SKB priorities.  The mapping is given in the format "from:to" where both
+"from" and "to" are unsigned integers, ie "7:3".</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingVlan--parent"></a><h3>The <code class="literal">“parent”</code> property</h3>
 <pre class="programlisting">  “parent”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If given, specifies the parent interface name or parent connection UUID
+from which this VLAN interface should be created.  If this property is
+not specified, the connection must contain an <a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> setting
+with a <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a> property.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingVpn.html b/docs/libnm/html/NMSettingVpn.html
index a55a552a..ba0b0304 100644
--- a/docs/libnm/html/NMSettingVpn.html
+++ b/docs/libnm/html/NMSettingVpn.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingVpn</title>
+<title>NMSettingVpn: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingVlan.html" title="NMSettingVlan">
 <link rel="next" href="NMSettingWimax.html" title="NMSettingWimax">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -327,7 +327,6 @@ plugin that should be used to connect to this VPN.</p>
 <div class="refsect3">
 <a name="id-1.4.27.8.4.6"></a><h4>Returns</h4>
 <p> the VPN plugin's service name</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -353,7 +352,6 @@ nm_setting_vpn_get_user_name (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.27.8.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingVpn.html#NMSettingVpn--user-name" title="The “user-name” property"><span class="type">“user-name”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -379,7 +377,6 @@ nm_setting_vpn_get_persistent (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.4.27.8.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingVpn.html#NMSettingVpn--persistent" title="The “persistent” property"><span class="type">“persistent”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -406,7 +403,6 @@ nm_setting_vpn_get_num_data_items (<em class="parameter"><code><a class="link" h
 <div class="refsect3">
 <a name="id-1.4.27.8.7.6"></a><h4>Returns</h4>
 <p> the number of VPN plugin specific configuration data items</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -484,7 +480,6 @@ by <a class="link" href="NMSettingVpn.html#nm-setting-vpn-add-data-item" title="
 <div class="refsect3">
 <a name="id-1.4.27.8.9.6"></a><h4>Returns</h4>
 <p> the data item, if any</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -521,7 +516,6 @@ nm_setting_vpn_remove_data_item (<em class="parameter"><code><a class="link" hre
 <a name="id-1.4.27.8.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the data item was found and removed from the internal list,
 <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -588,7 +582,6 @@ nm_setting_vpn_get_num_secrets (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.4.27.8.12.6"></a><h4>Returns</h4>
 <p> the number of VPN plugin specific secrets</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -665,7 +658,6 @@ by <a class="link" href="NMSettingVpn.html#nm-setting-vpn-add-secret" title="nm_
 <div class="refsect3">
 <a name="id-1.4.27.8.14.6"></a><h4>Returns</h4>
 <p> the secret, if any</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -702,7 +694,6 @@ nm_setting_vpn_remove_secret (<em class="parameter"><code><a class="link" href="
 <a name="id-1.4.27.8.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the secret was found and removed from the internal list,
 <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -752,48 +743,36 @@ iteration will not be part of the iteration.</p>
 <a name="NM-SETTING-VPN-SETTING-NAME:CAPS"></a><h3>NM_SETTING_VPN_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_SETTING_NAME "vpn"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VPN-SERVICE-TYPE:CAPS"></a><h3>NM_SETTING_VPN_SERVICE_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VPN-USER-NAME:CAPS"></a><h3>NM_SETTING_VPN_USER_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_USER_NAME    "user-name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VPN-PERSISTENT:CAPS"></a><h3>NM_SETTING_VPN_PERSISTENT</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_PERSISTENT   "persistent"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VPN-DATA:CAPS"></a><h3>NM_SETTING_VPN_DATA</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_DATA         "data"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-VPN-SECRETS:CAPS"></a><h3>NM_SETTING_VPN_SECRETS</h3>
 <pre class="programlisting">#define NM_SETTING_VPN_SECRETS      "secrets"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -801,14 +780,18 @@ iteration will not be part of the iteration.</p>
 <div class="refsect2">
 <a name="NMSettingVpn--data"></a><h3>The <code class="literal">“data”</code> property</h3>
 <pre class="programlisting">  “data”                     <span class="type">GHashTable</span> *</pre>
-<p></p>
+<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>
 <div class="refsect2">
 <a name="NMSettingVpn--persistent"></a><h3>The <code class="literal">“persistent”</code> property</h3>
 <pre class="programlisting">  “persistent”               <span class="type">gboolean</span></pre>
-<p></p>
+<p>If the VPN service supports persistence, and this property is <code class="literal">TRUE</code>,
+the VPN will attempt to stay connected across link changes and outages,
+until explicitly disconnected.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
 </div>
@@ -816,14 +799,18 @@ iteration will not be part of the iteration.</p>
 <div class="refsect2">
 <a name="NMSettingVpn--secrets"></a><h3>The <code class="literal">“secrets”</code> property</h3>
 <pre class="programlisting">  “secrets”                  <span class="type">GHashTable</span> *</pre>
-<p></p>
+<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>
 <div class="refsect2">
 <a name="NMSettingVpn--service-type"></a><h3>The <code class="literal">“service-type”</code> property</h3>
 <pre class="programlisting">  “service-type”             <span class="type">gchar</span> *</pre>
-<p></p>
+<p>D-Bus service name of the VPN plugin that this setting uses to connect to
+its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc
+plugin.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -831,14 +818,18 @@ iteration will not be part of the iteration.</p>
 <div class="refsect2">
 <a name="NMSettingVpn--user-name"></a><h3>The <code class="literal">“user-name”</code> property</h3>
 <pre class="programlisting">  “user-name”                <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If the VPN connection requires a user name for authentication, that name
+should be provided here.  If the connection is available to more than one
+user, and the VPN requires each user to supply a different name, then
+leave this property empty.  If this property is empty, NetworkManager
+will automatically supply the username of the user which requested the
+VPN connection.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWimax.html b/docs/libnm/html/NMSettingWimax.html
index 99666051..b4843dd7 100644
--- a/docs/libnm/html/NMSettingWimax.html
+++ b/docs/libnm/html/NMSettingWimax.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingWimax</title>
+<title>NMSettingWimax: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingVpn.html" title="NMSettingVpn">
 <link rel="next" href="NMSettingWired.html" title="NMSettingWired">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -135,7 +135,6 @@ nm_setting_wimax_new (<em class="parameter"><code><span class="type">void</span>
 <div class="refsect3">
 <a name="id-1.4.28.8.2.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingWimax.html" title="NMSettingWimax"><span class="type">NMSettingWimax</span></a> object</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -163,7 +162,6 @@ specific WiMAX network this setting describes a connection to.</p>
 <div class="refsect3">
 <a name="id-1.4.28.8.3.6"></a><h4>Returns</h4>
 <p> the WiMAX NSP name</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -191,7 +189,6 @@ to.</p>
 <div class="refsect3">
 <a name="id-1.4.28.8.4.6"></a><h4>Returns</h4>
 <p> the MAC address</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -201,24 +198,18 @@ to.</p>
 <a name="NM-SETTING-WIMAX-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIMAX_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIMAX_SETTING_NAME "wimax"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIMAX-NETWORK-NAME:CAPS"></a><h3>NM_SETTING_WIMAX_NETWORK_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIMAX_NETWORK_NAME "network-name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIMAX-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIMAX_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -226,7 +217,9 @@ to.</p>
 <div class="refsect2">
 <a name="NMSettingWimax--mac-address"></a><h3>The <code class="literal">“mac-address”</code> property</h3>
 <pre class="programlisting">  “mac-address”              <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If specified, this connection will only apply to the WiMAX device whose
+MAC address matches. This property does not change the MAC address of the
+device (known as MAC spoofing).</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -234,14 +227,14 @@ to.</p>
 <div class="refsect2">
 <a name="NMSettingWimax--network-name"></a><h3>The <code class="literal">“network-name”</code> property</h3>
 <pre class="programlisting">  “network-name”             <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Network Service Provider (NSP) name of the WiMAX network this connection
+should use.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index a65d2e22..6255f6c8 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingWired</title>
+<title>NMSettingWired: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingWimax.html" title="NMSettingWimax">
 <link rel="next" href="NMSettingWireless.html" title="NMSettingWireless">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -398,7 +398,6 @@ nm_setting_wired_get_port (<em class="parameter"><code><a class="link" href="NMS
 <div class="refsect3">
 <a name="id-1.4.29.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--port" title="The “port” property"><span class="type">“port”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -424,7 +423,6 @@ nm_setting_wired_get_speed (<em class="parameter"><code><a class="link" href="NM
 <div class="refsect3">
 <a name="id-1.4.29.8.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--speed" title="The “speed” property"><span class="type">“speed”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -450,7 +448,6 @@ nm_setting_wired_get_duplex (<em class="parameter"><code><a class="link" href="N
 <div class="refsect3">
 <a name="id-1.4.29.8.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--duplex" title="The “duplex” property"><span class="type">“duplex”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -476,7 +473,6 @@ nm_setting_wired_get_auto_negotiate (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.29.8.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--auto-negotiate" title="The “auto-negotiate” property"><span class="type">“auto-negotiate”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -502,7 +498,6 @@ nm_setting_wired_get_mac_address (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.4.29.8.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -529,7 +524,6 @@ nm_setting_wired_get_cloned_mac_address
 <div class="refsect3">
 <a name="id-1.4.29.8.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--cloned-mac-address" title="The “cloned-mac-address” property"><span class="type">“cloned-mac-address”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -556,7 +550,6 @@ nm_setting_wired_get_mac_address_blacklist
 <div class="refsect3">
 <a name="id-1.4.29.8.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address-blacklist" title="The “mac-address-blacklist” property"><span class="type">“mac-address-blacklist”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -583,7 +576,6 @@ nm_setting_wired_get_num_mac_blacklist_items
 <div class="refsect3">
 <a name="id-1.4.29.8.10.5"></a><h4>Returns</h4>
 <p> the number of blacklisted MAC addresses</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -620,7 +612,6 @@ nm_setting_wired_get_mac_blacklist_item
 <p> the blacklisted MAC address string (hex-digits-and-colons notation)
 at index <em class="parameter"><code>idx</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -657,7 +648,6 @@ nm_setting_wired_add_mac_blacklist_item
 <a name="id-1.4.29.8.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the MAC address was added; <code class="literal">FALSE</code> if the MAC address
 is invalid or was already present</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -727,7 +717,6 @@ the blacklist</p></td>
 <div class="refsect3">
 <a name="id-1.4.29.8.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the MAC address was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -776,7 +765,6 @@ nm_setting_wired_get_mtu (<em class="parameter"><code><a class="link" href="NMSe
 <div class="refsect3">
 <a name="id-1.4.29.8.16.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWired.html#NMSettingWired--mtu" title="The “mtu” property"><span class="type">“mtu”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -834,7 +822,6 @@ of 'qeth', 'lcs', or 'ctc'.</p>
 <div class="refsect3">
 <a name="id-1.4.29.8.18.6"></a><h4>Returns</h4>
 <p> the s390 device type</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -863,7 +850,6 @@ option individually using <a class="link" href="NMSettingWired.html#nm-setting-w
 <div class="refsect3">
 <a name="id-1.4.29.8.19.6"></a><h4>Returns</h4>
 <p> the number of s390-specific device options</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -920,7 +906,6 @@ modified. </p></td>
 <p> <code class="literal">TRUE</code> on success if the index was valid and an option was found,
 <code class="literal">FALSE</code> if the index was invalid (ie, greater than the number of options
 currently held by the setting)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -959,7 +944,6 @@ nm_setting_wired_get_s390_option_by_key
 <a name="id-1.4.29.8.21.6"></a><h4>Returns</h4>
 <p> the value, or <code class="literal">NULL</code> if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1004,7 +988,6 @@ may already exist.</p>
 <a name="id-1.4.29.8.22.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the option was valid and was added to the internal option
 list, <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1042,7 +1025,6 @@ list.</p>
 <a name="id-1.4.29.8.23.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the option was found and removed from the internal option
 list, <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1080,96 +1062,72 @@ nm_setting_wired_get_valid_s390_options
 <a name="NM-SETTING-WIRED-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIRED_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-PORT:CAPS"></a><h3>NM_SETTING_WIRED_PORT</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_PORT "port"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-SPEED:CAPS"></a><h3>NM_SETTING_WIRED_SPEED</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_SPEED "speed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-DUPLEX:CAPS"></a><h3>NM_SETTING_WIRED_DUPLEX</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_DUPLEX "duplex"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-AUTO-NEGOTIATE:CAPS"></a><h3>NM_SETTING_WIRED_AUTO_NEGOTIATE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRED_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-CLONED-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRED_CLONED_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-MAC-ADDRESS-BLACKLIST:CAPS"></a><h3>NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-MTU:CAPS"></a><h3>NM_SETTING_WIRED_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_MTU "mtu"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-S390-SUBCHANNELS:CAPS"></a><h3>NM_SETTING_WIRED_S390_SUBCHANNELS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-S390-NETTYPE:CAPS"></a><h3>NM_SETTING_WIRED_S390_NETTYPE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRED-S390-OPTIONS:CAPS"></a><h3>NM_SETTING_WIRED_S390_OPTIONS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1177,7 +1135,9 @@ nm_setting_wired_get_valid_s390_options
 <div class="refsect2">
 <a name="NMSettingWired--auto-negotiate"></a><h3>The <code class="literal">“auto-negotiate”</code> property</h3>
 <pre class="programlisting">  “auto-negotiate”           <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, allow auto-negotiation of port speed and duplex mode.  If
+<code class="literal">FALSE</code>, do not allow auto-negotiation, in which case the "speed" and
+"duplex" properties should be set.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
@@ -1185,7 +1145,8 @@ nm_setting_wired_get_valid_s390_options
 <div class="refsect2">
 <a name="NMSettingWired--cloned-mac-address"></a><h3>The <code class="literal">“cloned-mac-address”</code> property</h3>
 <pre class="programlisting">  “cloned-mac-address”       <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If specified, request that the device use this MAC address instead of its
+permanent MAC address.  This is known as MAC cloning or spoofing.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1193,7 +1154,8 @@ nm_setting_wired_get_valid_s390_options
 <div class="refsect2">
 <a name="NMSettingWired--duplex"></a><h3>The <code class="literal">“duplex”</code> property</h3>
 <pre class="programlisting">  “duplex”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If specified, request that the device only use the specified duplex mode.
+Either "half" or "full".</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1201,7 +1163,9 @@ nm_setting_wired_get_valid_s390_options
 <div class="refsect2">
 <a name="NMSettingWired--mac-address"></a><h3>The <code class="literal">“mac-address”</code> property</h3>
 <pre class="programlisting">  “mac-address”              <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If specified, this connection will only apply to the Ethernet device
+whose permanent MAC address matches. This property does not change the
+MAC address of the device (i.e. MAC spoofing).</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1209,14 +1173,18 @@ nm_setting_wired_get_valid_s390_options
 <div class="refsect2">
 <a name="NMSettingWired--mac-address-blacklist"></a><h3>The <code class="literal">“mac-address-blacklist”</code> property</h3>
 <pre class="programlisting">  “mac-address-blacklist”    <span class="type">GStrv</span></pre>
-<p></p>
+<p>If specified, this connection will never apply to the Ethernet device
+whose permanent MAC address matches an address in the list.  Each MAC
+address is in the standard hex-digits-and-colons notation
+(00:11:22:33:44:55).</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWired--mtu"></a><h3>The <code class="literal">“mtu”</code> property</h3>
 <pre class="programlisting">  “mtu”                      <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple Ethernet frames.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1224,7 +1192,10 @@ nm_setting_wired_get_valid_s390_options
 <div class="refsect2">
 <a name="NMSettingWired--port"></a><h3>The <code class="literal">“port”</code> property</h3>
 <pre class="programlisting">  “port”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Specific port type to use if multiple the device supports multiple
+attachment methods.  One of "tp" (Twisted Pair), "aui" (Attachment Unit
+Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface.
+If the device supports only one port type, this setting is ignored.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1232,7 +1203,8 @@ nm_setting_wired_get_valid_s390_options
 <div class="refsect2">
 <a name="NMSettingWired--s390-nettype"></a><h3>The <code class="literal">“s390-nettype”</code> property</h3>
 <pre class="programlisting">  “s390-nettype”             <span class="type">gchar</span> *</pre>
-<p></p>
+<p>s390 network device type; one of "qeth", "lcs", or "ctc", representing
+the different types of virtual network devices available on s390 systems.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1240,28 +1212,38 @@ nm_setting_wired_get_valid_s390_options
 <div class="refsect2">
 <a name="NMSettingWired--s390-options"></a><h3>The <code class="literal">“s390-options”</code> property</h3>
 <pre class="programlisting">  “s390-options”             <span class="type">GHashTable</span> *</pre>
-<p></p>
+<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>
 <div class="refsect2">
 <a name="NMSettingWired--s390-subchannels"></a><h3>The <code class="literal">“s390-subchannels”</code> property</h3>
 <pre class="programlisting">  “s390-subchannels”         <span class="type">GStrv</span></pre>
-<p></p>
+<p>Identifies specific subchannels that this network device uses for
+communication with z/VM or s390 host.  Like the
+<a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a> property for non-z/VM devices, this property
+can be used to ensure this connection only applies to the network device
+that uses these subchannels.  The list should contain exactly 3 strings,
+and each string may only be composed of hexadecimal characters and the
+period (.) character.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWired--speed"></a><h3>The <code class="literal">“speed”</code> property</h3>
 <pre class="programlisting">  “speed”                    <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, request that the device use only the specified speed.  In
+Mbit/s, ie 100 == 100Mbit/s.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index 1c59261b..f4cd0050 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingWireless</title>
+<title>NMSettingWireless: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingWired.html" title="NMSettingWired">
 <link rel="next" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -456,7 +456,6 @@ nm_setting_wireless_get_mode (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.30.8.4.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--mode" title="The “mode” property"><span class="type">“mode”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -482,7 +481,6 @@ nm_setting_wireless_get_band (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.30.8.5.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--band" title="The “band” property"><span class="type">“band”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -508,7 +506,6 @@ nm_setting_wireless_get_channel (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.4.30.8.6.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--channel" title="The “channel” property"><span class="type">“channel”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -534,7 +531,6 @@ nm_setting_wireless_get_bssid (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.4.30.8.7.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--bssid" title="The “bssid” property"><span class="type">“bssid”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -560,7 +556,6 @@ nm_setting_wireless_get_rate (<em class="parameter"><code><a class="link" href="
 <div class="refsect3">
 <a name="id-1.4.30.8.8.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--rate" title="The “rate” property"><span class="type">“rate”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -586,7 +581,6 @@ nm_setting_wireless_get_tx_power (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="id-1.4.30.8.9.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--tx-power" title="The “tx-power” property"><span class="type">“tx-power”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -612,7 +606,6 @@ nm_setting_wireless_get_mac_address (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="id-1.4.30.8.10.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--mac-address" title="The “mac-address” property"><span class="type">“mac-address”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -639,7 +632,6 @@ nm_setting_wireless_get_cloned_mac_address
 <div class="refsect3">
 <a name="id-1.4.30.8.11.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--cloned-mac-address" title="The “cloned-mac-address” property"><span class="type">“cloned-mac-address”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -666,7 +658,6 @@ nm_setting_wireless_get_mac_address_blacklist
 <div class="refsect3">
 <a name="id-1.4.30.8.12.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--mac-address-blacklist" title="The “mac-address-blacklist” property"><span class="type">“mac-address-blacklist”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -693,7 +684,6 @@ nm_setting_wireless_get_num_mac_blacklist_items
 <div class="refsect3">
 <a name="id-1.4.30.8.13.5"></a><h4>Returns</h4>
 <p> the number of blacklisted MAC addresses</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -730,7 +720,6 @@ nm_setting_wireless_get_mac_blacklist_item
 <p> the blacklisted MAC address string (hex-digits-and-colons notation)
 at index <em class="parameter"><code>idx</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -767,7 +756,6 @@ nm_setting_wireless_add_mac_blacklist_item
 <a name="id-1.4.30.8.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the MAC address was added; <code class="literal">FALSE</code> if the MAC address
 is invalid or was already present</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -837,7 +825,6 @@ the blacklist</p></td>
 <div class="refsect3">
 <a name="id-1.4.30.8.17.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the MAC address was found and removed; <code class="literal">FALSE</code> if it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -886,7 +873,6 @@ nm_setting_wireless_get_mtu (<em class="parameter"><code><a class="link" href="N
 <div class="refsect3">
 <a name="id-1.4.30.8.19.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--mtu" title="The “mtu” property"><span class="type">“mtu”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -912,7 +898,6 @@ nm_setting_wireless_get_hidden (<em class="parameter"><code><a class="link" href
 <div class="refsect3">
 <a name="id-1.4.30.8.20.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWireless.html#NMSettingWireless--hidden" title="The “hidden” property"><span class="type">“hidden”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -951,7 +936,6 @@ not be preserved.</p>
 <a name="id-1.4.30.8.21.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>bssid</code></em>
 was already known, <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -978,7 +962,6 @@ nm_setting_wireless_get_num_seen_bssids
 <div class="refsect3">
 <a name="id-1.4.30.8.22.5"></a><h4>Returns</h4>
 <p> the number of BSSIDs in the previously seen BSSID list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1013,7 +996,6 @@ nm_setting_wireless_get_seen_bssid (<em class="parameter"><code><a class="link"
 <a name="id-1.4.30.8.23.5"></a><h4>Returns</h4>
 <p> the BSSID at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1081,7 +1063,6 @@ capabilities</p></td>
 <a name="id-1.4.30.8.24.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the given settings are compatible with the access point's
 security flags and mode, <code class="literal">FALSE</code> if they are not.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -1091,112 +1072,84 @@ security flags and mode, <code class="literal">FALSE</code> if they are not.</p>
 <a name="NM-SETTING-WIRELESS-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIRELESS_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SSID:CAPS"></a><h3>NM_SETTING_WIRELESS_SSID</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SSID        "ssid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MODE:CAPS"></a><h3>NM_SETTING_WIRELESS_MODE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MODE        "mode"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-BAND:CAPS"></a><h3>NM_SETTING_WIRELESS_BAND</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_BAND        "band"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-CHANNEL:CAPS"></a><h3>NM_SETTING_WIRELESS_CHANNEL</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_CHANNEL     "channel"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-BSSID:CAPS"></a><h3>NM_SETTING_WIRELESS_BSSID</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_BSSID       "bssid"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-RATE:CAPS"></a><h3>NM_SETTING_WIRELESS_RATE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_RATE        "rate"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-TX-POWER:CAPS"></a><h3>NM_SETTING_WIRELESS_TX_POWER</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRELESS_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-CLONED-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MAC-ADDRESS-BLACKLIST:CAPS"></a><h3>NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-MTU:CAPS"></a><h3>NM_SETTING_WIRELESS_MTU</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MTU         "mtu"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SEEN-BSSIDS:CAPS"></a><h3>NM_SETTING_WIRELESS_SEEN_BSSIDS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-HIDDEN:CAPS"></a><h3>NM_SETTING_WIRELESS_HIDDEN</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_HIDDEN      "hidden"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1227,7 +1180,12 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--band"></a><h3>The <code class="literal">“band”</code> property</h3>
 <pre class="programlisting">  “band”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or
+"bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network
+to the specific band, i.e. if "a" is specified, the device will not
+associate with the same network in the 2.4GHz band even if the network's
+settings are compatible.  This setting depends on specific driver
+capability and may not work with all drivers.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1235,7 +1193,10 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--bssid"></a><h3>The <code class="literal">“bssid”</code> property</h3>
 <pre class="programlisting">  “bssid”                    <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If specified, directs the device to only associate with the given access
+point.  This capability is highly driver dependent and not supported by
+all devices.  Note: this property does not control the BSSID used when
+creating an Ad-Hoc network and is unlikely to in the future.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1243,7 +1204,10 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--channel"></a><h3>The <code class="literal">“channel”</code> property</h3>
 <pre class="programlisting">  “channel”                  <span class="type">guint</span></pre>
-<p></p>
+<p>Wireless channel to use for the Wi-Fi connection.  The device will only
+join (or create for Ad-Hoc networks) a Wi-Fi network on the specified
+channel.  Because channel numbers overlap between bands, this property
+also requires the "band" property to be set.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1251,7 +1215,8 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--cloned-mac-address"></a><h3>The <code class="literal">“cloned-mac-address”</code> property</h3>
 <pre class="programlisting">  “cloned-mac-address”       <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If specified, request that the Wi-Fi device use this MAC address instead
+of its permanent MAC address.  This is known as MAC cloning or spoofing.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1259,7 +1224,11 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--hidden"></a><h3>The <code class="literal">“hidden”</code> property</h3>
 <pre class="programlisting">  “hidden”                   <span class="type">gboolean</span></pre>
-<p></p>
+<p>If <code class="literal">TRUE</code>, indicates this network is a non-broadcasting network that hides
+its SSID.  In this case various workarounds may take place, such as
+probe-scanning the SSID for more reliable network discovery.  However,
+these workarounds expose inherent insecurities with hidden SSID networks,
+and thus hidden SSID networks should be used with caution.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: FALSE</p>
 </div>
@@ -1267,7 +1236,9 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--mac-address"></a><h3>The <code class="literal">“mac-address”</code> property</h3>
 <pre class="programlisting">  “mac-address”              <span class="type">gchar</span> *</pre>
-<p></p>
+<p>If specified, this connection will only apply to the Wi-Fi device whose
+permanent MAC address matches. This property does not change the MAC
+address of the device (i.e. MAC spoofing).</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1275,14 +1246,17 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--mac-address-blacklist"></a><h3>The <code class="literal">“mac-address-blacklist”</code> property</h3>
 <pre class="programlisting">  “mac-address-blacklist”    <span class="type">GStrv</span></pre>
-<p></p>
+<p>A list of permanent MAC addresses of Wi-Fi devices to which this
+connection should never apply.  Each MAC address should be given in the
+standard hex-digits-and-colons notation (eg "00:11:22:33:44:55").</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWireless--mode"></a><h3>The <code class="literal">“mode”</code> property</h3>
 <pre class="programlisting">  “mode”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap".  If blank,
+infrastructure is assumed.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1290,7 +1264,8 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--mtu"></a><h3>The <code class="literal">“mtu”</code> property</h3>
 <pre class="programlisting">  “mtu”                      <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple Ethernet frames.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1298,7 +1273,10 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--rate"></a><h3>The <code class="literal">“rate”</code> property</h3>
 <pre class="programlisting">  “rate”                     <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, directs the device to only use the specified bitrate for
+communication with the access point.  Units are in Kb/s, ie 5500 = 5.5
+Mbit/s.  This property is highly driver dependent and not all devices
+support setting a static bitrate.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
@@ -1306,28 +1284,34 @@ for this connection.</p>
 <div class="refsect2">
 <a name="NMSettingWireless--seen-bssids"></a><h3>The <code class="literal">“seen-bssids”</code> property</h3>
 <pre class="programlisting">  “seen-bssids”              <span class="type">GStrv</span></pre>
-<p></p>
+<p>A list of BSSIDs (each BSSID formatted as a MAC address like
+"00:11:22:33:44:55") that have been detected as part of the Wi-Fi
+network.  NetworkManager internally tracks previously seen BSSIDs. The
+property is only meant for reading and reflects the BSSID list of
+NetworkManager. The changes you make to this property will not be
+preserved.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWireless--ssid"></a><h3>The <code class="literal">“ssid”</code> property</h3>
 <pre class="programlisting">  “ssid”                     <span class="type">GBytes</span> *</pre>
-<p></p>
+<p>SSID of the Wi-Fi network. Must be specified.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWireless--tx-power"></a><h3>The <code class="literal">“tx-power”</code> property</h3>
 <pre class="programlisting">  “tx-power”                 <span class="type">guint</span></pre>
-<p></p>
+<p>If non-zero, directs the device to use the specified transmit power.
+Units are dBm.  This property is highly driver dependent and not all
+devices support setting a static transmit power.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: 0</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index 4542c113..59829fac 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSettingWirelessSecurity</title>
+<title>NMSettingWirelessSecurity: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingWireless.html" title="NMSettingWireless">
 <link rel="next" href="ch04.html" title="Device and Runtime Configuration API Reference">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -538,7 +538,6 @@ nm_setting_wireless_security_get_key_mgmt
 <div class="refsect3">
 <a name="id-1.4.31.8.3.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt" title="The “key-mgmt” property"><span class="type">“key-mgmt”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -566,7 +565,6 @@ nm_setting_wireless_security_get_num_protos
 <a name="id-1.4.31.8.4.5"></a><h4>Returns</h4>
 <p> the number of security protocols this connection allows when
 connecting to secure Wi-Fi networks</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -602,7 +600,6 @@ nm_setting_wireless_security_get_proto
 <a name="id-1.4.31.8.5.5"></a><h4>Returns</h4>
 <p> the protocol at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -644,7 +641,6 @@ with the access point.</p>
 <a name="id-1.4.31.8.6.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the protocol was new and and was added to the allowed
 protocol list, or <code class="literal">FALSE</code> if it was already in the list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -711,7 +707,6 @@ nm_setting_wireless_security_remove_proto_by_value
 <div class="refsect3">
 <a name="id-1.4.31.8.8.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the protocol was found and removed; <code class="literal">FALSE</code> it it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -762,7 +757,6 @@ nm_setting_wireless_security_get_num_pairwise
 <div class="refsect3">
 <a name="id-1.4.31.8.10.5"></a><h4>Returns</h4>
 <p> the number of pairwise encryption algorithms in the allowed list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -800,7 +794,6 @@ list.</p>
 <a name="id-1.4.31.8.11.6"></a><h4>Returns</h4>
 <p> the pairwise encryption algorithm at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -840,7 +833,6 @@ compatible with this connection.</p>
 <a name="id-1.4.31.8.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the algorithm was added to the list, <code class="literal">FALSE</code> if it was
 already in the list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -909,7 +901,6 @@ algorithm list.</p>
 <div class="refsect3">
 <a name="id-1.4.31.8.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the encryption algorith was found and removed; <code class="literal">FALSE</code> it it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -960,7 +951,6 @@ nm_setting_wireless_security_get_num_groups
 <div class="refsect3">
 <a name="id-1.4.31.8.16.5"></a><h4>Returns</h4>
 <p> the number of groupwise encryption algorithms in the allowed list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -998,7 +988,6 @@ list.</p>
 <a name="id-1.4.31.8.17.6"></a><h4>Returns</h4>
 <p> the groupwise encryption algorithm at index <em class="parameter"><code>i</code></em>
 </p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1039,7 +1028,6 @@ compatible with this connection.</p>
 <a name="id-1.4.31.8.18.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the algorithm was added to the list, <code class="literal">FALSE</code> if it was
 already in the list</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1109,7 +1097,6 @@ algorithm list.</p>
 <div class="refsect3">
 <a name="id-1.4.31.8.20.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the algorithm was found and removed; <code class="literal">FALSE</code> it it was not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1159,7 +1146,6 @@ nm_setting_wireless_security_get_psk (<em class="parameter"><code><a class="link
 <div class="refsect3">
 <a name="id-1.4.31.8.22.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk" title="The “psk” property"><span class="type">“psk”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1187,7 +1173,6 @@ nm_setting_wireless_security_get_psk_flags
 <a name="id-1.4.31.8.23.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
 <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk" title="The “psk” property"><span class="type">“psk”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1214,7 +1199,6 @@ nm_setting_wireless_security_get_leap_username
 <div class="refsect3">
 <a name="id-1.4.31.8.24.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-username" title="The “leap-username” property"><span class="type">“leap-username”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1241,7 +1225,6 @@ nm_setting_wireless_security_get_leap_password
 <div class="refsect3">
 <a name="id-1.4.31.8.25.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password" title="The “leap-password” property"><span class="type">“leap-password”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1269,7 +1252,6 @@ nm_setting_wireless_security_get_leap_password_flags
 <a name="id-1.4.31.8.26.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the
 <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password" title="The “leap-password” property"><span class="type">“leap-password”</span></a></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1304,7 +1286,6 @@ nm_setting_wireless_security_get_wep_key
 <div class="refsect3">
 <a name="id-1.4.31.8.27.5"></a><h4>Returns</h4>
 <p> the WEP key at the given index</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1370,7 +1351,6 @@ nm_setting_wireless_security_get_wep_tx_keyidx
 <div class="refsect3">
 <a name="id-1.4.31.8.29.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-tx-keyidx" title="The “wep-tx-keyidx” property"><span class="type">“wep-tx-keyidx”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1397,7 +1377,6 @@ nm_setting_wireless_security_get_auth_alg
 <div class="refsect3">
 <a name="id-1.4.31.8.30.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg" title="The “auth-alg” property"><span class="type">“auth-alg”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1424,7 +1403,6 @@ nm_setting_wireless_security_get_wep_key_flags
 <div class="refsect3">
 <a name="id-1.4.31.8.31.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the all WEP keys</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1451,7 +1429,6 @@ nm_setting_wireless_security_get_wep_key_type
 <div class="refsect3">
 <a name="id-1.4.31.8.32.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key-type" title="The “wep-key-type” property"><span class="type">“wep-key-type”</span></a> property of the setting</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -1461,8 +1438,6 @@ nm_setting_wireless_security_get_wep_key_type
 <a name="NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_SETTING_NAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1528,136 +1503,102 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <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>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-TX-KEYIDX:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-AUTH-ALG:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_AUTH_ALG</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PROTO:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PROTO</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PAIRWISE:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PAIRWISE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-GROUP:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_GROUP</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-LEAP-USERNAME:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME "leap-username"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY0:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY0</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY1:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY1</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY2:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY2</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY3:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY3</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-FLAGS:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-WEP-KEY-TYPE:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PSK:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PSK</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS</h3>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1665,7 +1606,11 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--auth-alg"></a><h3>The <code class="literal">“auth-alg”</code> property</h3>
 <pre class="programlisting">  “auth-alg”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>When WEP is used (ie, key-mgmt = "none" or "ieee8021x") indicate the
+802.11 authentication algorithm required by the AP here.  One of "open"
+for Open System, "shared" for Shared Key, or "leap" for Cisco LEAP.  When
+using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the
+"leap-username" and "leap-password" properties must be specified.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1673,14 +1618,20 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--group"></a><h3>The <code class="literal">“group”</code> property</h3>
 <pre class="programlisting">  “group”                    <span class="type">GStrv</span></pre>
-<p></p>
+<p>A list of group/broadcast encryption algorithms which prevents
+connections to Wi-Fi networks that do not utilize one of the algorithms
+in the list.  For maximum compatibility leave this property empty.  Each
+list element may be one of "wep40", "wep104", "tkip", or "ccmp".</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--key-mgmt"></a><h3>The <code class="literal">“key-mgmt”</code> property</h3>
 <pre class="programlisting">  “key-mgmt”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Key management used for the connection.  One of "none" (WEP), "ieee8021x"
+(Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure
+WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for
+any Wi-Fi connection that uses security.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1688,7 +1639,8 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--leap-password"></a><h3>The <code class="literal">“leap-password”</code> property</h3>
 <pre class="programlisting">  “leap-password”            <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The login password for legacy LEAP connections (ie, key-mgmt =
+"ieee8021x" and auth-alg = "leap").</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1696,14 +1648,16 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--leap-password-flags"></a><h3>The <code class="literal">“leap-password-flags”</code> property</h3>
 <pre class="programlisting">  “leap-password-flags”      <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a></pre>
-<p></p>
+<p>Flags indicating how to handle the
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--leap-password" title="The “leap-password” property"><span class="type">“leap-password”</span></a> property.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--leap-username"></a><h3>The <code class="literal">“leap-username”</code> property</h3>
 <pre class="programlisting">  “leap-username”            <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The login username for legacy LEAP connections (ie, key-mgmt =
+"ieee8021x" and auth-alg = "leap").</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1711,21 +1665,31 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--pairwise"></a><h3>The <code class="literal">“pairwise”</code> property</h3>
 <pre class="programlisting">  “pairwise”                 <span class="type">GStrv</span></pre>
-<p></p>
+<p>A list of pairwise encryption algorithms which prevents connections to
+Wi-Fi networks that do not utilize one of the algorithms in the list.
+For maximum compatibility leave this property empty.  Each list element
+may be one of "tkip" or "ccmp".</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--proto"></a><h3>The <code class="literal">“proto”</code> property</h3>
 <pre class="programlisting">  “proto”                    <span class="type">GStrv</span></pre>
-<p></p>
+<p>List of strings specifying the allowed WPA protocol versions to use.
+Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN).  If
+not specified, both WPA and RSN connections are allowed.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--psk"></a><h3>The <code class="literal">“psk”</code> property</h3>
 <pre class="programlisting">  “psk”                      <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it
+must contain only hexadecimal characters and is interpreted as a
+hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII
+characters (as specified in the 802.11i standard) and is interpreted as a
+WPA passphrase, and is hashed to derive the actual WPA-PSK used when
+connecting to the Wi-Fi network.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1733,21 +1697,29 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--psk-flags"></a><h3>The <code class="literal">“psk-flags”</code> property</h3>
 <pre class="programlisting">  “psk-flags”                <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--psk" title="The “psk” property"><span class="type">“psk”</span></a>
+property.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key-flags"></a><h3>The <code class="literal">“wep-key-flags”</code> property</h3>
 <pre class="programlisting">  “wep-key-flags”            <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a></pre>
-<p></p>
+<p>Flags indicating how to handle the <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key0" title="The “wep-key0” property"><span class="type">“wep-key0”</span></a>,
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key1" title="The “wep-key1” property"><span class="type">“wep-key1”</span></a>, <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key2" title="The “wep-key2” property"><span class="type">“wep-key2”</span></a>,
+and <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--wep-key3" title="The “wep-key3” property"><span class="type">“wep-key3”</span></a> properties.</p>
 <p>Flags: Read / Write</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key-type"></a><h3>The <code class="literal">“wep-key-type”</code> property</h3>
 <pre class="programlisting">  “wep-key-type”             <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType"><span class="type">NMWepKeyType</span></a></pre>
-<p></p>
+<p>Controls the interpretation of WEP keys.  Allowed values are
+<a class="link" href="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-KEY:CAPS"><code class="literal">NM_WEP_KEY_TYPE_KEY</code></a>, in which case the key is either a 10- or
+26-character hexadecimal string, or a 5- or 13-character ASCII password;
+or <a class="link" href="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-PASSPHRASE:CAPS"><code class="literal">NM_WEP_KEY_TYPE_PASSPHRASE</code></a>, in which case the passphrase is provided
+as a string and will be hashed using the de-facto MD5 method to derive
+the actual WEP key.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: NM_WEP_KEY_TYPE_UNKNOWN</p>
 </div>
@@ -1755,7 +1727,8 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key0"></a><h3>The <code class="literal">“wep-key0”</code> property</h3>
 <pre class="programlisting">  “wep-key0”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Index 0 WEP key.  This is the WEP key used in most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1763,7 +1736,8 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key1"></a><h3>The <code class="literal">“wep-key1”</code> property</h3>
 <pre class="programlisting">  “wep-key1”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Index 1 WEP key.  This WEP index is not used by most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1771,7 +1745,8 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key2"></a><h3>The <code class="literal">“wep-key2”</code> property</h3>
 <pre class="programlisting">  “wep-key2”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Index 2 WEP key.  This WEP index is not used by most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1779,7 +1754,8 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-key3"></a><h3>The <code class="literal">“wep-key3”</code> property</h3>
 <pre class="programlisting">  “wep-key3”                 <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Index 3 WEP key.  This WEP index is not used by most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -1787,7 +1763,10 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <div class="refsect2">
 <a name="NMSettingWirelessSecurity--wep-tx-keyidx"></a><h3>The <code class="literal">“wep-tx-keyidx”</code> property</h3>
 <pre class="programlisting">  “wep-tx-keyidx”            <span class="type">guint</span></pre>
-<p></p>
+<p>When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key
+index is used by the AP, put that WEP key index here.  Valid values are 0
+(default key) through 3.  Note that some consumer access points (like the
+Linksys WRT54G) number the keys 1 - 4.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Allowed values: &lt;= 3</p>
 <p>Default value: 0</p>
@@ -1795,7 +1774,6 @@ the actual WEP key using the MD5 hash algorithm.</p>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html
index b1e77edb..5fa62ec0 100644
--- a/docs/libnm/html/NMSimpleConnection.html
+++ b/docs/libnm/html/NMSimpleConnection.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMSimpleConnection</title>
+<title>NMSimpleConnection: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="libnm-NMConnection.html" title="NMConnection">
 <link rel="next" href="NMSetting.html" title="NMSetting">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -75,8 +75,6 @@
 </div>
 <div class="refsect1">
 <a name="NMSimpleConnection.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMSimpleConnection.functions_details"></a><h2>Functions</h2>
@@ -166,7 +164,6 @@ and properties as the source <a href="https://developer.gnome.org/libnm-util/0.9
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html
index e1e8ab62..de3a08b4 100644
--- a/docs/libnm/html/NMVpnConnection.html
+++ b/docs/libnm/html/NMVpnConnection.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMVpnConnection</title>
+<title>NMVpnConnection: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMActiveConnection.html" title="NMActiveConnection">
 <link rel="next" href="NMRemoteConnection.html" title="NMRemoteConnection">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -127,8 +127,6 @@
 </div>
 <div class="refsect1">
 <a name="NMVpnConnection.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMVpnConnection.functions_details"></a><h2>Functions</h2>
@@ -155,7 +153,6 @@ nm_vpn_connection_get_vpn_state (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.5.17.9.2.6"></a><h4>Returns</h4>
 <p> the VPN state of the active VPN connection.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -183,7 +180,6 @@ nm_vpn_connection_get_banner (<em class="parameter"><code><a class="link" href="
 <a name="id-1.5.17.9.3.6"></a><h4>Returns</h4>
 <p> the VPN login banner of the VPN connection. This is the internal
 string used by the connection, and must not be modified.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -193,16 +189,12 @@ string used by the connection, and must not be modified.</p>
 <a name="NM-VPN-CONNECTION-VPN-STATE:CAPS"></a><h3>NM_VPN_CONNECTION_VPN_STATE</h3>
 <pre class="programlisting">#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-CONNECTION-BANNER:CAPS"></a><h3>NM_VPN_CONNECTION_BANNER</h3>
 <pre class="programlisting">#define NM_VPN_CONNECTION_BANNER "banner"
 </pre>
-<p>
-</p>
 </div>
 </div>
 <div class="refsect1">
@@ -210,7 +202,7 @@ string used by the connection, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMVpnConnection--banner"></a><h3>The <code class="literal">“banner”</code> property</h3>
 <pre class="programlisting">  “banner”                   <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The VPN login banner of the active VPN connection.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -218,7 +210,7 @@ string used by the connection, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMVpnConnection--vpn-state"></a><h3>The <code class="literal">“vpn-state”</code> property</h3>
 <pre class="programlisting">  “vpn-state”                <a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState" title="enum NMVpnConnectionState"><span class="type">NMVpnConnectionState</span></a></pre>
-<p></p>
+<p>The VPN state of the active VPN connection.</p>
 <p>Flags: Read</p>
 <p>Default value: NM_VPN_CONNECTION_STATE_UNKNOWN</p>
 </div>
@@ -237,7 +229,6 @@ user_function (<a class="link" href="NMVpnConnection.html" title="NMVpnConnectio
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMVpnEditor.html b/docs/libnm/html/NMVpnEditor.html
index ee18c74d..d6f1b3ca 100644
--- a/docs/libnm/html/NMVpnEditor.html
+++ b/docs/libnm/html/NMVpnEditor.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMVpnEditor</title>
+<title>NMVpnEditor: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch06.html" title="VPN Plugin API Reference">
 <link rel="prev" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">
 <link rel="next" href="object-tree.html" title="Object Hierarchy">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -208,8 +208,6 @@
 </div>
 <div class="refsect1">
 <a name="NMVpnEditor.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMVpnEditor.functions_details"></a><h2>Functions</h2>
@@ -217,24 +215,12 @@
 <a name="NMVpnEditorPluginFactory"></a><h3>NMVpnEditorPluginFactory ()</h3>
 <pre class="programlisting"><a class="link" href="NMVpnEditor.html#NMVpnEditorPlugin"><span class="returnvalue">NMVpnEditorPlugin</span></a> *
 <span class="c_punctuation">(</span>*NMVpnEditorPluginFactory<span class="c_punctuation">)</span> (<em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.7.3.10.2.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-editor-plugin-factory"></a><h3>nm_vpn_editor_plugin_factory ()</h3>
 <pre class="programlisting"><a class="link" href="NMVpnEditor.html#NMVpnEditorPlugin"><span class="returnvalue">NMVpnEditorPlugin</span></a> *
 nm_vpn_editor_plugin_factory (<em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.7.3.10.3.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -254,12 +240,6 @@ nm_vpn_editor_plugin_get_editor (<em class="parameter"><code><a class="link" hre
 <a name="nm-vpn-editor-plugin-get-capabilities"></a><h3>nm_vpn_editor_plugin_get_capabilities ()</h3>
 <pre class="programlisting"><a class="link" href="NMVpnEditor.html#NMVpnEditorPluginCapability" title="enum NMVpnEditorPluginCapability"><span class="returnvalue">NMVpnEditorPluginCapability</span></a>
 nm_vpn_editor_plugin_get_capabilities (<em class="parameter"><code><a class="link" href="NMVpnEditor.html#NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> *plugin</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.7.3.10.5.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -282,12 +262,6 @@ nm_vpn_editor_plugin_export (<em class="parameter"><code><a class="link" href="N
                              <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
                              <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                              <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.7.3.10.7.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -296,12 +270,6 @@ nm_vpn_editor_plugin_export (<em class="parameter"><code><a class="link" href="N
 nm_vpn_editor_plugin_get_suggested_filename
                                (<em class="parameter"><code><a class="link" href="NMVpnEditor.html#NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> *plugin</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.7.3.10.8.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -321,12 +289,6 @@ nm_vpn_editor_get_widget (<em class="parameter"><code><a class="link" href="NMVp
 nm_vpn_editor_update_connection (<em class="parameter"><code><a class="link" href="NMVpnEditor.html" title="NMVpnEditor"><span class="type">NMVpnEditor</span></a> *editor</code></em>,
                                  <em class="parameter"><code><a href="https://developer.gnome.org/libnm-util/0.9/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.7.3.10.10.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 </div>
 <div class="refsect1">
@@ -380,24 +342,18 @@ nm_vpn_editor_update_connection (<em class="parameter"><code><a class="link" hre
 <a name="NM-VPN-EDITOR-PLUGIN-NAME:CAPS"></a><h3>NM_VPN_EDITOR_PLUGIN_NAME</h3>
 <pre class="programlisting">#define NM_VPN_EDITOR_PLUGIN_NAME "name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-EDITOR-PLUGIN-DESCRIPTION:CAPS"></a><h3>NM_VPN_EDITOR_PLUGIN_DESCRIPTION</h3>
 <pre class="programlisting">#define NM_VPN_EDITOR_PLUGIN_DESCRIPTION "description"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-EDITOR-PLUGIN-SERVICE:CAPS"></a><h3>NM_VPN_EDITOR_PLUGIN_SERVICE</h3>
 <pre class="programlisting">#define NM_VPN_EDITOR_PLUGIN_SERVICE "service"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -552,7 +508,7 @@ to write values to the connection.</p></td>
 <div class="refsect2">
 <a name="NMVpnEditorPlugin--description"></a><h3>The <code class="literal">“description”</code> property</h3>
 <pre class="programlisting">  “description”              <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Longer description of the VPN plugin.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -560,7 +516,7 @@ to write values to the connection.</p></td>
 <div class="refsect2">
 <a name="NMVpnEditorPlugin--name"></a><h3>The <code class="literal">“name”</code> property</h3>
 <pre class="programlisting">  “name”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>Short display name of the VPN plugin.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -568,7 +524,7 @@ to write values to the connection.</p></td>
 <div class="refsect2">
 <a name="NMVpnEditorPlugin--service"></a><h3>The <code class="literal">“service”</code> property</h3>
 <pre class="programlisting">  “service”                  <span class="type">gchar</span> *</pre>
-<p></p>
+<p>D-Bus service name of the plugin's VPN service.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -585,7 +541,6 @@ user_function (<a class="link" href="NMVpnEditor.html" title="NMVpnEditor"><span
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html
index 6b4d8307..c91b65e2 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMWimaxNsp</title>
+<title>NMWimaxNsp: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMAccessPoint.html" title="NMAccessPoint">
 <link rel="next" href="NMIPConfig.html" title="NMIPConfig">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -149,8 +149,6 @@
 </div>
 <div class="refsect1">
 <a name="NMWimaxNsp.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="NMWimaxNsp.functions_details"></a><h2>Functions</h2>
@@ -177,7 +175,6 @@ nm_wimax_nsp_get_name (<em class="parameter"><code><a class="link" href="NMWimax
 <div class="refsect3">
 <a name="id-1.5.20.8.2.6"></a><h4>Returns</h4>
 <p> the name</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -204,7 +201,6 @@ nm_wimax_nsp_get_signal_quality (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="id-1.5.20.8.3.6"></a><h4>Returns</h4>
 <p> the signal quality</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -231,7 +227,6 @@ nm_wimax_nsp_get_network_type (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="id-1.5.20.8.4.6"></a><h4>Returns</h4>
 <p> the network type</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -314,7 +309,6 @@ against</p></td>
 <a name="id-1.5.20.8.6.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection may be activated with this WiMAX NSP,
 <code class="literal">FALSE</code> if it cannot be.</p>
-<p></p>
 </div>
 </div>
 </div>
@@ -324,24 +318,18 @@ against</p></td>
 <a name="NM-WIMAX-NSP-NAME:CAPS"></a><h3>NM_WIMAX_NSP_NAME</h3>
 <pre class="programlisting">#define NM_WIMAX_NSP_NAME           "name"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS"></a><h3>NM_WIMAX_NSP_SIGNAL_QUALITY</h3>
 <pre class="programlisting">#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-WIMAX-NSP-NETWORK-TYPE:CAPS"></a><h3>NM_WIMAX_NSP_NETWORK_TYPE</h3>
 <pre class="programlisting">#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -394,7 +382,7 @@ against</p></td>
 <div class="refsect2">
 <a name="NMWimaxNsp--name"></a><h3>The <code class="literal">“name”</code> property</h3>
 <pre class="programlisting">  “name”                     <span class="type">gchar</span> *</pre>
-<p></p>
+<p>The name of the WiMAX NSP.</p>
 <p>Flags: Read</p>
 <p>Default value: NULL</p>
 </div>
@@ -402,7 +390,7 @@ against</p></td>
 <div class="refsect2">
 <a name="NMWimaxNsp--network-type"></a><h3>The <code class="literal">“network-type”</code> property</h3>
 <pre class="programlisting">  “network-type”             <a class="link" href="NMWimaxNsp.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType"><span class="type">NMWimaxNspNetworkType</span></a></pre>
-<p></p>
+<p>The network type of the WiMAX NSP.</p>
 <p>Flags: Read</p>
 <p>Default value: NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN</p>
 </div>
@@ -410,7 +398,7 @@ against</p></td>
 <div class="refsect2">
 <a name="NMWimaxNsp--signal-quality"></a><h3>The <code class="literal">“signal-quality”</code> property</h3>
 <pre class="programlisting">  “signal-quality”           <span class="type">guint</span></pre>
-<p></p>
+<p>The signal quality of the WiMAX NSP.</p>
 <p>Flags: Read</p>
 <p>Allowed values: &lt;= 100</p>
 <p>Default value: 0</p>
@@ -418,7 +406,6 @@ against</p></td>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/annotation-glossary.html b/docs/libnm/html/annotation-glossary.html
index ffa567c1..ff056841 100644
--- a/docs/libnm/html/annotation-glossary.html
+++ b/docs/libnm/html/annotation-glossary.html
@@ -2,12 +2,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: Annotation Glossary</title>
+<title>Annotation Glossary: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -55,6 +55,8 @@
 <dd class="glossdef"><p>The callback is valid until first called.</p></dd>
 <dt><span class="glossterm"><a name="annotation-glossterm-scope%20call"></a>scope call</span></dt>
 <dd class="glossdef"><p>The callback is valid only during the call to the method.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-skip"></a>skip</span></dt>
+<dd class="glossdef"><p>Exposed in C code, not necessarily available in other languages.</p></dd>
 <a name="glsT"></a><h3 class="title">T</h3>
 <dt><span class="glossterm"><a name="annotation-glossterm-transfer%20container"></a>transfer container</span></dt>
 <dd class="glossdef"><p>Free data container after the code is done.</p></dd>
@@ -66,7 +68,6 @@
 <dd class="glossdef"><p>Override the parsed C type with given type.</p></dd>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index e64d6477..aac846df 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: API Index</title>
+<title>API Index: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="object-tree.html" title="Object Hierarchy">
 <link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,6 +27,8 @@
                      <span class="dim">|</span> 
                   <a class="shortcut" href="#idxI">I</a>
                      <span class="dim">|</span> 
+                  <a class="shortcut" href="#idxK">K</a>
+                     <span class="dim">|</span> 
                   <a class="shortcut" href="#idxM">M</a>
                      <span class="dim">|</span> 
                   <a class="shortcut" href="#idxO">O</a>
@@ -390,6 +392,10 @@
 <a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-0:CAPS" title="NM_AVAILABLE_IN_1_0">NM_AVAILABLE_IN_1_0</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
 </dt>
 <dd></dd>
+<dt>
+<a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-0-4:CAPS" title="NM_AVAILABLE_IN_1_0_4">NM_AVAILABLE_IN_1_0_4</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
+</dt>
+<dd></dd>
 <a name="idxB"></a><h3 class="title">B</h3>
 <dt>
 <a class="link" href="libnm-nm-dbus-interface.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities">NMBluetoothCapabilities</a>, enum in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
@@ -1342,6 +1348,14 @@
 </dt>
 <dd></dd>
 <dt>
+DEFINE_KF_LIST_WRAPPER_PROTO, macro in nm-keyfile-utils
+</dt>
+<dd></dd>
+<dt>
+DEFINE_KF_WRAPPER_PROTO, macro in nm-keyfile-utils
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-0-9-10:CAPS" title="NM_DEPRECATED_IN_0_9_10">NM_DEPRECATED_IN_0_9_10</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
 </dt>
 <dd></dd>
@@ -2591,6 +2605,79 @@
 <a class="link" href="NMSettingIPConfig.html#nm-ip-route-unref" title="nm_ip_route_unref ()">nm_ip_route_unref</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
 </dt>
 <dd></dd>
+<a name="idxK"></a><h3 class="title">K</h3>
+<dt>
+NMKeyfileReadHandler, user_function in nm-keyfile-internal
+</dt>
+<dd></dd>
+<dt>
+NMKeyfileReadType, enum in nm-keyfile-internal
+</dt>
+<dd></dd>
+<dt>
+NMKeyfileReadTypeDataWarn, struct in nm-keyfile-internal
+</dt>
+<dd></dd>
+<dt>
+NMKeyfileWarnSeverity, enum in nm-keyfile-internal
+</dt>
+<dd></dd>
+<dt>
+NMKeyfileWriteHandler, user_function in nm-keyfile-internal
+</dt>
+<dd></dd>
+<dt>
+NMKeyfileWriteType, enum in nm-keyfile-internal
+</dt>
+<dd></dd>
+<dt>
+NMKeyfileWriteTypeDataCert, struct in nm-keyfile-internal
+</dt>
+<dd></dd>
+<dt>
+NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB, macro in nm-keyfile-internal
+</dt>
+<dd></dd>
+<dt>
+NM_KEYFILE_CERT_SCHEME_PREFIX_PATH, macro in nm-keyfile-internal
+</dt>
+<dd></dd>
+<dt>
+nm_keyfile_detect_unqualified_path_scheme, function in nm-keyfile-internal
+</dt>
+<dd></dd>
+<dt>
+nm_keyfile_plugin_get_alias_for_setting_name, function in nm-keyfile-utils
+</dt>
+<dd></dd>
+<dt>
+nm_keyfile_plugin_get_setting_name_for_alias, function in nm-keyfile-utils
+</dt>
+<dd></dd>
+<dt>
+nm_keyfile_plugin_kf_get_keys, function in nm-keyfile-utils
+</dt>
+<dd></dd>
+<dt>
+nm_keyfile_plugin_kf_get_string, function in nm-keyfile-internal
+</dt>
+<dd></dd>
+<dt>
+nm_keyfile_plugin_kf_has_key, function in nm-keyfile-utils
+</dt>
+<dd></dd>
+<dt>
+nm_keyfile_plugin_kf_set_string, function in nm-keyfile-internal
+</dt>
+<dd></dd>
+<dt>
+nm_keyfile_read, function in nm-keyfile-internal
+</dt>
+<dd></dd>
+<dt>
+nm_keyfile_write, function in nm-keyfile-internal
+</dt>
+<dd></dd>
 <a name="idxM"></a><h3 class="title">M</h3>
 <dt>
 <a class="link" href="libnm-nm-version.html#NM-MAJOR-VERSION:CAPS" title="NM_MAJOR_VERSION">NM_MAJOR_VERSION</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
@@ -3088,6 +3175,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#NMSettingConnection--autoconnect-slaves" title="The “autoconnect-slaves” property">NMSettingConnection:autoconnect-slaves</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--gateway-ping-timeout" title="The “gateway-ping-timeout” property">NMSettingConnection:gateway-ping-timeout</a>, object property in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -3136,6 +3227,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves">NMSettingConnectionAutoconnectSlaves</a>, enum in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fcoe-flags" title="The “app-fcoe-flags” property">NMSettingDcb:app-fcoe-flags</a>, object property in <a class="link" href="NMSettingDcb.html" title="NMSettingDcb">NMSettingDcb</a>
 </dt>
 <dd></dd>
@@ -3716,6 +3811,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-CERT-SCHEME-PREFIX-PATH:CAPS" title="NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH">NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH</a>, macro in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-clear-altsubject-matches" title="nm_setting_802_1x_clear_altsubject_matches ()">nm_setting_802_1x_clear_altsubject_matches</a>, function in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
@@ -4480,6 +4579,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES:CAPS" title="NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES">NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES</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-GATEWAY-PING-TIMEOUT:CAPS" title="NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT">NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -4492,6 +4595,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-autoconnect-slaves" title="nm_setting_connection_get_autoconnect_slaves ()">nm_setting_connection_get_autoconnect_slaves</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-connection-type" title="nm_setting_connection_get_connection_type ()">nm_setting_connection_get_connection_type</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
@@ -6474,6 +6581,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libnm-nm-version.html#NM-VERSION-1-0-2:CAPS" title="NM_VERSION_1_0_2">NM_VERSION_1_0_2</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-nm-version.html#NM-VERSION-1-0-4:CAPS" title="NM_VERSION_1_0_4">NM_VERSION_1_0_4</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libnm-nm-version.html#NM-VERSION-CUR-STABLE:CAPS" title="NM_VERSION_CUR_STABLE">NM_VERSION_CUR_STABLE</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
 </dt>
 <dd></dd>
@@ -6773,6 +6888,10 @@
 <a class="link" href="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-IP6-CONFIG-ROUTES:CAPS" title="NM_VPN_PLUGIN_IP6_CONFIG_ROUTES">NM_VPN_PLUGIN_IP6_CONFIG_ROUTES</a>, macro in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
 </dt>
 <dd></dd>
+<dt>
+VPN_SECRETS_GROUP, macro in nm-keyfile-utils
+</dt>
+<dd></dd>
 <a name="idxW"></a><h3 class="title">W</h3>
 <dt>
 <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType">NMWepKeyType</a>, enum in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
@@ -6828,7 +6947,6 @@
 <dd></dd>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/ch02.html b/docs/libnm/html/ch02.html
index 8275cbd8..64f06223 100644
--- a/docs/libnm/html/ch02.html
+++ b/docs/libnm/html/ch02.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: Client Object API Reference</title>
+<title>Client Object API Reference: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="ref-overview.html" title="Overview">
 <link rel="next" href="NMClient.html" title="NMClient">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -41,7 +41,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/ch03.html b/docs/libnm/html/ch03.html
index 5a52fb4c..e30c11dc 100644
--- a/docs/libnm/html/ch03.html
+++ b/docs/libnm/html/ch03.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: Connection and Setting API Reference</title>
+<title>Connection and Setting API Reference: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">
 <link rel="next" href="libnm-NMConnection.html" title="NMConnection">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -120,7 +120,6 @@ use WEP, LEAP, WPA or WPA2/RSN security</span>
 </dl></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/ch04.html b/docs/libnm/html/ch04.html
index 851d3f2b..6513b1a8 100644
--- a/docs/libnm/html/ch04.html
+++ b/docs/libnm/html/ch04.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: Device and Runtime Configuration API Reference</title>
+<title>Device and Runtime Configuration API Reference: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
 <link rel="next" href="NMDevice.html" title="NMDevice">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -89,7 +89,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/ch05.html b/docs/libnm/html/ch05.html
index 08ddd5cc..8dd164e2 100644
--- a/docs/libnm/html/ch05.html
+++ b/docs/libnm/html/ch05.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: Utility API Reference</title>
+<title>Utility API Reference: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="NMDhcpConfig.html" title="NMDhcpConfig">
 <link rel="next" href="libnm-nm-utils.html" title="nm-utils">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,7 +32,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/ch06.html b/docs/libnm/html/ch06.html
index 4e2d3dc4..7cbb0f5e 100644
--- a/docs/libnm/html/ch06.html
+++ b/docs/libnm/html/ch06.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: VPN Plugin API Reference</title>
+<title>VPN Plugin API Reference: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="libnm-nm-version.html" title="nm-version">
 <link rel="next" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,7 +32,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index 8affed8e..f197c752 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="next" href="ref-overview.html" title="Overview">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -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.0.2
+      for libnm 1.0.4
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm/1.0/" target="_top">https://developer.gnome.org/libnm/1.0/</a>.
@@ -253,7 +253,6 @@ use WEP, LEAP, WPA or WPA2/RSN security</span>
 </dl></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml
index ebd23df0..0f085cb3 100644
--- a/docs/libnm/html/index.sgml
+++ b/docs/libnm/html/index.sgml
@@ -87,8 +87,28 @@
 <ANCHOR id="NM-CLIENT-CONNECTION-ADDED:CAPS" href="libnm/NMClient.html#NM-CLIENT-CONNECTION-ADDED:CAPS">
 <ANCHOR id="NM-CLIENT-CONNECTION-REMOVED:CAPS" href="libnm/NMClient.html#NM-CLIENT-CONNECTION-REMOVED:CAPS">
 <ANCHOR id="NMClientPermission" href="libnm/NMClient.html#NMClientPermission">
+<ANCHOR id="NM-CLIENT-PERMISSION-NONE:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-NONE:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-ENABLE-DISABLE-NETWORK:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-NETWORK:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIFI:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIFI:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-ENABLE-DISABLE-WWAN:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WWAN:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIMAX:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIMAX:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-SLEEP-WAKE:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-SLEEP-WAKE:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-NETWORK-CONTROL:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-NETWORK-CONTROL:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-WIFI-SHARE-PROTECTED:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-WIFI-SHARE-PROTECTED:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-WIFI-SHARE-OPEN:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-WIFI-SHARE-OPEN:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-SETTINGS-MODIFY-SYSTEM:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-SYSTEM:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-SETTINGS-MODIFY-OWN:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-OWN:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-SETTINGS-MODIFY-HOSTNAME:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-HOSTNAME:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-LAST:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-LAST:CAPS">
 <ANCHOR id="NMClientPermissionResult" href="libnm/NMClient.html#NMClientPermissionResult">
+<ANCHOR id="NM-CLIENT-PERMISSION-RESULT-UNKNOWN:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-RESULT-UNKNOWN:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-RESULT-YES:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-RESULT-YES:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-RESULT-AUTH:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-RESULT-AUTH:CAPS">
+<ANCHOR id="NM-CLIENT-PERMISSION-RESULT-NO:CAPS" href="libnm/NMClient.html#NM-CLIENT-PERMISSION-RESULT-NO:CAPS">
 <ANCHOR id="NMClientError" href="libnm/NMClient.html#NMClientError">
+<ANCHOR id="NM-CLIENT-ERROR-FAILED:CAPS" href="libnm/NMClient.html#NM-CLIENT-ERROR-FAILED:CAPS">
+<ANCHOR id="NM-CLIENT-ERROR-MANAGER-NOT-RUNNING:CAPS" href="libnm/NMClient.html#NM-CLIENT-ERROR-MANAGER-NOT-RUNNING:CAPS">
+<ANCHOR id="NM-CLIENT-ERROR-OBJECT-CREATION-FAILED:CAPS" href="libnm/NMClient.html#NM-CLIENT-ERROR-OBJECT-CREATION-FAILED:CAPS">
 <ANCHOR id="NM-CLIENT-ERROR:CAPS" href="libnm/NMClient.html#NM-CLIENT-ERROR:CAPS">
 <ANCHOR id="NMClient.property-details" href="libnm/NMClient.html#NMClient.property-details">
 <ANCHOR id="NMClient--activating-connection" href="libnm/NMClient.html#NMClient--activating-connection">
@@ -182,16 +202,79 @@
 <ANCHOR id="nm-vpn-plugin-error-quark" href="libnm/libnm-nm-errors.html#nm-vpn-plugin-error-quark">
 <ANCHOR id="libnm-nm-errors.other_details" href="libnm/libnm-nm-errors.html#libnm-nm-errors.other_details">
 <ANCHOR id="NMAgentManagerError" href="libnm/libnm-nm-errors.html#NMAgentManagerError">
+<ANCHOR id="NM-AGENT-MANAGER-ERROR-FAILED:CAPS" href="libnm/libnm-nm-errors.html#NM-AGENT-MANAGER-ERROR-FAILED:CAPS">
+<ANCHOR id="NM-AGENT-MANAGER-ERROR-PERMISSION-DENIED:CAPS" href="libnm/libnm-nm-errors.html#NM-AGENT-MANAGER-ERROR-PERMISSION-DENIED:CAPS">
+<ANCHOR id="NM-AGENT-MANAGER-ERROR-INVALID-IDENTIFIER:CAPS" href="libnm/libnm-nm-errors.html#NM-AGENT-MANAGER-ERROR-INVALID-IDENTIFIER:CAPS">
+<ANCHOR id="NM-AGENT-MANAGER-ERROR-NOT-REGISTERED:CAPS" href="libnm/libnm-nm-errors.html#NM-AGENT-MANAGER-ERROR-NOT-REGISTERED:CAPS">
+<ANCHOR id="NM-AGENT-MANAGER-ERROR-NO-SECRETS:CAPS" href="libnm/libnm-nm-errors.html#NM-AGENT-MANAGER-ERROR-NO-SECRETS:CAPS">
+<ANCHOR id="NM-AGENT-MANAGER-ERROR-USER-CANCELED:CAPS" href="libnm/libnm-nm-errors.html#NM-AGENT-MANAGER-ERROR-USER-CANCELED:CAPS">
 <ANCHOR id="NMConnectionError" href="libnm/libnm-nm-errors.html#NMConnectionError">
+<ANCHOR id="NM-CONNECTION-ERROR-FAILED:CAPS" href="libnm/libnm-nm-errors.html#NM-CONNECTION-ERROR-FAILED:CAPS">
+<ANCHOR id="NM-CONNECTION-ERROR-SETTING-NOT-FOUND:CAPS" href="libnm/libnm-nm-errors.html#NM-CONNECTION-ERROR-SETTING-NOT-FOUND:CAPS">
+<ANCHOR id="NM-CONNECTION-ERROR-PROPERTY-NOT-FOUND:CAPS" href="libnm/libnm-nm-errors.html#NM-CONNECTION-ERROR-PROPERTY-NOT-FOUND:CAPS">
+<ANCHOR id="NM-CONNECTION-ERROR-PROPERTY-NOT-SECRET:CAPS" href="libnm/libnm-nm-errors.html#NM-CONNECTION-ERROR-PROPERTY-NOT-SECRET:CAPS">
+<ANCHOR id="NM-CONNECTION-ERROR-MISSING-SETTING:CAPS" href="libnm/libnm-nm-errors.html#NM-CONNECTION-ERROR-MISSING-SETTING:CAPS">
+<ANCHOR id="NM-CONNECTION-ERROR-INVALID-SETTING:CAPS" href="libnm/libnm-nm-errors.html#NM-CONNECTION-ERROR-INVALID-SETTING:CAPS">
+<ANCHOR id="NM-CONNECTION-ERROR-MISSING-PROPERTY:CAPS" href="libnm/libnm-nm-errors.html#NM-CONNECTION-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-CONNECTION-ERROR-INVALID-PROPERTY:CAPS" href="libnm/libnm-nm-errors.html#NM-CONNECTION-ERROR-INVALID-PROPERTY:CAPS">
 <ANCHOR id="NM-CONNECTION-ERROR:CAPS" href="libnm/libnm-nm-errors.html#NM-CONNECTION-ERROR:CAPS">
 <ANCHOR id="NMCryptoError" href="libnm/libnm-nm-errors.html#NMCryptoError">
+<ANCHOR id="NM-CRYPTO-ERROR-FAILED:CAPS" href="libnm/libnm-nm-errors.html#NM-CRYPTO-ERROR-FAILED:CAPS">
+<ANCHOR id="NM-CRYPTO-ERROR-INVALID-DATA:CAPS" href="libnm/libnm-nm-errors.html#NM-CRYPTO-ERROR-INVALID-DATA:CAPS">
+<ANCHOR id="NM-CRYPTO-ERROR-INVALID-PASSWORD:CAPS" href="libnm/libnm-nm-errors.html#NM-CRYPTO-ERROR-INVALID-PASSWORD:CAPS">
+<ANCHOR id="NM-CRYPTO-ERROR-UNKNOWN-CIPHER:CAPS" href="libnm/libnm-nm-errors.html#NM-CRYPTO-ERROR-UNKNOWN-CIPHER:CAPS">
+<ANCHOR id="NM-CRYPTO-ERROR-DECRYPTION-FAILED:CAPS" href="libnm/libnm-nm-errors.html#NM-CRYPTO-ERROR-DECRYPTION-FAILED:CAPS">
+<ANCHOR id="NM-CRYPTO-ERROR-ENCRYPTION-FAILED:CAPS" href="libnm/libnm-nm-errors.html#NM-CRYPTO-ERROR-ENCRYPTION-FAILED:CAPS">
 <ANCHOR id="NM-CRYPTO-ERROR:CAPS" href="libnm/libnm-nm-errors.html#NM-CRYPTO-ERROR:CAPS">
 <ANCHOR id="NMDeviceError" href="libnm/libnm-nm-errors.html#NMDeviceError">
+<ANCHOR id="NM-DEVICE-ERROR-FAILED:CAPS" href="libnm/libnm-nm-errors.html#NM-DEVICE-ERROR-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-ERROR-CREATION-FAILED:CAPS" href="libnm/libnm-nm-errors.html#NM-DEVICE-ERROR-CREATION-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-ERROR-INVALID-CONNECTION:CAPS" href="libnm/libnm-nm-errors.html#NM-DEVICE-ERROR-INVALID-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-ERROR-INCOMPATIBLE-CONNECTION:CAPS" href="libnm/libnm-nm-errors.html#NM-DEVICE-ERROR-INCOMPATIBLE-CONNECTION:CAPS">
+<ANCHOR id="NM-DEVICE-ERROR-NOT-ACTIVE:CAPS" href="libnm/libnm-nm-errors.html#NM-DEVICE-ERROR-NOT-ACTIVE:CAPS">
+<ANCHOR id="NM-DEVICE-ERROR-NOT-SOFTWARE:CAPS" href="libnm/libnm-nm-errors.html#NM-DEVICE-ERROR-NOT-SOFTWARE:CAPS">
+<ANCHOR id="NM-DEVICE-ERROR-NOT-ALLOWED:CAPS" href="libnm/libnm-nm-errors.html#NM-DEVICE-ERROR-NOT-ALLOWED:CAPS">
+<ANCHOR id="NM-DEVICE-ERROR-SPECIFIC-OBJECT-NOT-FOUND:CAPS" href="libnm/libnm-nm-errors.html#NM-DEVICE-ERROR-SPECIFIC-OBJECT-NOT-FOUND:CAPS">
 <ANCHOR id="NM-DEVICE-ERROR:CAPS" href="libnm/libnm-nm-errors.html#NM-DEVICE-ERROR:CAPS">
 <ANCHOR id="NMManagerError" href="libnm/libnm-nm-errors.html#NMManagerError">
+<ANCHOR id="NM-MANAGER-ERROR-FAILED:CAPS" href="libnm/libnm-nm-errors.html#NM-MANAGER-ERROR-FAILED:CAPS">
+<ANCHOR id="NM-MANAGER-ERROR-PERMISSION-DENIED:CAPS" href="libnm/libnm-nm-errors.html#NM-MANAGER-ERROR-PERMISSION-DENIED:CAPS">
+<ANCHOR id="NM-MANAGER-ERROR-UNKNOWN-CONNECTION:CAPS" href="libnm/libnm-nm-errors.html#NM-MANAGER-ERROR-UNKNOWN-CONNECTION:CAPS">
+<ANCHOR id="NM-MANAGER-ERROR-UNKNOWN-DEVICE:CAPS" href="libnm/libnm-nm-errors.html#NM-MANAGER-ERROR-UNKNOWN-DEVICE:CAPS">
+<ANCHOR id="NM-MANAGER-ERROR-CONNECTION-NOT-AVAILABLE:CAPS" href="libnm/libnm-nm-errors.html#NM-MANAGER-ERROR-CONNECTION-NOT-AVAILABLE:CAPS">
+<ANCHOR id="NM-MANAGER-ERROR-CONNECTION-NOT-ACTIVE:CAPS" href="libnm/libnm-nm-errors.html#NM-MANAGER-ERROR-CONNECTION-NOT-ACTIVE:CAPS">
+<ANCHOR id="NM-MANAGER-ERROR-CONNECTION-ALREADY-ACTIVE:CAPS" href="libnm/libnm-nm-errors.html#NM-MANAGER-ERROR-CONNECTION-ALREADY-ACTIVE:CAPS">
+<ANCHOR id="NM-MANAGER-ERROR-DEPENDENCY-FAILED:CAPS" href="libnm/libnm-nm-errors.html#NM-MANAGER-ERROR-DEPENDENCY-FAILED:CAPS">
+<ANCHOR id="NM-MANAGER-ERROR-ALREADY-ASLEEP-OR-AWAKE:CAPS" href="libnm/libnm-nm-errors.html#NM-MANAGER-ERROR-ALREADY-ASLEEP-OR-AWAKE:CAPS">
+<ANCHOR id="NM-MANAGER-ERROR-ALREADY-ENABLED-OR-DISABLED:CAPS" href="libnm/libnm-nm-errors.html#NM-MANAGER-ERROR-ALREADY-ENABLED-OR-DISABLED:CAPS">
+<ANCHOR id="NM-MANAGER-ERROR-UNKNOWN-LOG-LEVEL:CAPS" href="libnm/libnm-nm-errors.html#NM-MANAGER-ERROR-UNKNOWN-LOG-LEVEL:CAPS">
+<ANCHOR id="NM-MANAGER-ERROR-UNKNOWN-LOG-DOMAIN:CAPS" href="libnm/libnm-nm-errors.html#NM-MANAGER-ERROR-UNKNOWN-LOG-DOMAIN:CAPS">
 <ANCHOR id="NMSecretAgentError" href="libnm/libnm-nm-errors.html#NMSecretAgentError">
+<ANCHOR id="NM-SECRET-AGENT-ERROR-FAILED:CAPS" href="libnm/libnm-nm-errors.html#NM-SECRET-AGENT-ERROR-FAILED:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-ERROR-PERMISSION-DENIED:CAPS" href="libnm/libnm-nm-errors.html#NM-SECRET-AGENT-ERROR-PERMISSION-DENIED:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-ERROR-INVALID-CONNECTION:CAPS" href="libnm/libnm-nm-errors.html#NM-SECRET-AGENT-ERROR-INVALID-CONNECTION:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-ERROR-USER-CANCELED:CAPS" href="libnm/libnm-nm-errors.html#NM-SECRET-AGENT-ERROR-USER-CANCELED:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-ERROR-AGENT-CANCELED:CAPS" href="libnm/libnm-nm-errors.html#NM-SECRET-AGENT-ERROR-AGENT-CANCELED:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-ERROR-NO-SECRETS:CAPS" href="libnm/libnm-nm-errors.html#NM-SECRET-AGENT-ERROR-NO-SECRETS:CAPS">
 <ANCHOR id="NMSettingsError" href="libnm/libnm-nm-errors.html#NMSettingsError">
+<ANCHOR id="NM-SETTINGS-ERROR-FAILED:CAPS" href="libnm/libnm-nm-errors.html#NM-SETTINGS-ERROR-FAILED:CAPS">
+<ANCHOR id="NM-SETTINGS-ERROR-PERMISSION-DENIED:CAPS" href="libnm/libnm-nm-errors.html#NM-SETTINGS-ERROR-PERMISSION-DENIED:CAPS">
+<ANCHOR id="NM-SETTINGS-ERROR-NOT-SUPPORTED:CAPS" href="libnm/libnm-nm-errors.html#NM-SETTINGS-ERROR-NOT-SUPPORTED:CAPS">
+<ANCHOR id="NM-SETTINGS-ERROR-INVALID-CONNECTION:CAPS" href="libnm/libnm-nm-errors.html#NM-SETTINGS-ERROR-INVALID-CONNECTION:CAPS">
+<ANCHOR id="NM-SETTINGS-ERROR-READ-ONLY-CONNECTION:CAPS" href="libnm/libnm-nm-errors.html#NM-SETTINGS-ERROR-READ-ONLY-CONNECTION:CAPS">
+<ANCHOR id="NM-SETTINGS-ERROR-UUID-EXISTS:CAPS" href="libnm/libnm-nm-errors.html#NM-SETTINGS-ERROR-UUID-EXISTS:CAPS">
+<ANCHOR id="NM-SETTINGS-ERROR-INVALID-HOSTNAME:CAPS" href="libnm/libnm-nm-errors.html#NM-SETTINGS-ERROR-INVALID-HOSTNAME:CAPS">
 <ANCHOR id="NMVpnPluginError" href="libnm/libnm-nm-errors.html#NMVpnPluginError">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-FAILED:CAPS" href="libnm/libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-FAILED:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-STARTING-IN-PROGRESS:CAPS" href="libnm/libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-STARTING-IN-PROGRESS:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-ALREADY-STARTED:CAPS" href="libnm/libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-ALREADY-STARTED:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-STOPPING-IN-PROGRESS:CAPS" href="libnm/libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-STOPPING-IN-PROGRESS:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-ALREADY-STOPPED:CAPS" href="libnm/libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-ALREADY-STOPPED:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-WRONG-STATE:CAPS" href="libnm/libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-WRONG-STATE:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-BAD-ARGUMENTS:CAPS" href="libnm/libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-BAD-ARGUMENTS:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-LAUNCH-FAILED:CAPS" href="libnm/libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-LAUNCH-FAILED:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-INVALID-CONNECTION:CAPS" href="libnm/libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-INVALID-CONNECTION:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-ERROR-INTERACTIVE-NOT-SUPPORTED:CAPS" href="libnm/libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-INTERACTIVE-NOT-SUPPORTED:CAPS">
 <ANCHOR id="libnm-nm-dbus-interface" href="libnm/libnm-nm-dbus-interface.html">
 <ANCHOR id="libnm-nm-dbus-interface.other" href="libnm/libnm-nm-dbus-interface.html#libnm-nm-dbus-interface.other">
 <ANCHOR id="libnm-nm-dbus-interface.object-hierarchy" href="libnm/libnm-nm-dbus-interface.html#libnm-nm-dbus-interface.object-hierarchy">
@@ -239,20 +322,180 @@
 <ANCHOR id="NM-DBUS-INTERFACE-SECRET-AGENT:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DBUS-INTERFACE-SECRET-AGENT:CAPS">
 <ANCHOR id="NM-DBUS-PATH-SECRET-AGENT:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DBUS-PATH-SECRET-AGENT:CAPS">
 <ANCHOR id="NMState" href="libnm/libnm-nm-dbus-interface.html#NMState">
+<ANCHOR id="NM-STATE-UNKNOWN:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-STATE-UNKNOWN:CAPS">
+<ANCHOR id="NM-STATE-ASLEEP:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-STATE-ASLEEP:CAPS">
+<ANCHOR id="NM-STATE-DISCONNECTED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-STATE-DISCONNECTED:CAPS">
+<ANCHOR id="NM-STATE-DISCONNECTING:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-STATE-DISCONNECTING:CAPS">
+<ANCHOR id="NM-STATE-CONNECTING:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-STATE-CONNECTING:CAPS">
+<ANCHOR id="NM-STATE-CONNECTED-LOCAL:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-STATE-CONNECTED-LOCAL:CAPS">
+<ANCHOR id="NM-STATE-CONNECTED-SITE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-STATE-CONNECTED-SITE:CAPS">
+<ANCHOR id="NM-STATE-CONNECTED-GLOBAL:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-STATE-CONNECTED-GLOBAL:CAPS">
 <ANCHOR id="NMConnectivityState" href="libnm/libnm-nm-dbus-interface.html#NMConnectivityState">
+<ANCHOR id="NM-CONNECTIVITY-UNKNOWN:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-CONNECTIVITY-UNKNOWN:CAPS">
+<ANCHOR id="NM-CONNECTIVITY-NONE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-CONNECTIVITY-NONE:CAPS">
+<ANCHOR id="NM-CONNECTIVITY-PORTAL:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-CONNECTIVITY-PORTAL:CAPS">
+<ANCHOR id="NM-CONNECTIVITY-LIMITED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-CONNECTIVITY-LIMITED:CAPS">
+<ANCHOR id="NM-CONNECTIVITY-FULL:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-CONNECTIVITY-FULL:CAPS">
 <ANCHOR id="NMDeviceType" href="libnm/libnm-nm-dbus-interface.html#NMDeviceType">
+<ANCHOR id="NM-DEVICE-TYPE-UNKNOWN:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-ETHERNET:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-ETHERNET:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-WIFI:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-WIFI:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-UNUSED1:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-UNUSED1:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-UNUSED2:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-UNUSED2:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-BT:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-BT:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-OLPC-MESH:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-OLPC-MESH:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-WIMAX:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-WIMAX:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-MODEM:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-MODEM:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-INFINIBAND:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-INFINIBAND:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-BOND:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-BOND:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-VLAN:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-VLAN:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-ADSL:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-ADSL:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-BRIDGE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-BRIDGE:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-GENERIC:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-GENERIC:CAPS">
+<ANCHOR id="NM-DEVICE-TYPE-TEAM:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-TEAM:CAPS">
 <ANCHOR id="NMDeviceCapabilities" href="libnm/libnm-nm-dbus-interface.html#NMDeviceCapabilities">
+<ANCHOR id="NM-DEVICE-CAP-NONE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-CAP-NONE:CAPS">
+<ANCHOR id="NM-DEVICE-CAP-NM-SUPPORTED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-CAP-NM-SUPPORTED:CAPS">
+<ANCHOR id="NM-DEVICE-CAP-CARRIER-DETECT:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-CAP-CARRIER-DETECT:CAPS">
+<ANCHOR id="NM-DEVICE-CAP-IS-SOFTWARE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-CAP-IS-SOFTWARE:CAPS">
 <ANCHOR id="NMDeviceWifiCapabilities" href="libnm/libnm-nm-dbus-interface.html#NMDeviceWifiCapabilities">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-NONE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-NONE:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-CIPHER-WEP40:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-CIPHER-WEP40:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-CIPHER-WEP104:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-CIPHER-WEP104:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-CIPHER-TKIP:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-CIPHER-TKIP:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-CIPHER-CCMP:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-CIPHER-CCMP:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-WPA:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-WPA:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-RSN:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-RSN:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-AP:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-AP:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-ADHOC:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-ADHOC:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-FREQ-VALID:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-FREQ-VALID:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-FREQ-2GHZ:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-FREQ-2GHZ:CAPS">
+<ANCHOR id="NM-WIFI-DEVICE-CAP-FREQ-5GHZ:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-FREQ-5GHZ:CAPS">
 <ANCHOR id="NM80211ApFlags" href="libnm/libnm-nm-dbus-interface.html#NM80211ApFlags">
+<ANCHOR id="NM-802-11-AP-FLAGS-NONE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-AP-FLAGS-NONE:CAPS">
+<ANCHOR id="NM-802-11-AP-FLAGS-PRIVACY:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-AP-FLAGS-PRIVACY:CAPS">
 <ANCHOR id="NM80211ApSecurityFlags" href="libnm/libnm-nm-dbus-interface.html#NM80211ApSecurityFlags">
+<ANCHOR id="NM-802-11-AP-SEC-NONE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-NONE:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-PAIR-WEP40:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-PAIR-WEP40:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-PAIR-WEP104:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-PAIR-WEP104:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-PAIR-TKIP:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-PAIR-TKIP:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-PAIR-CCMP:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-PAIR-CCMP:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-GROUP-WEP40:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-GROUP-WEP40:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-GROUP-WEP104:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-GROUP-WEP104:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-GROUP-TKIP:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-GROUP-TKIP:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-GROUP-CCMP:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-GROUP-CCMP:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-KEY-MGMT-PSK:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-KEY-MGMT-PSK:CAPS">
+<ANCHOR id="NM-802-11-AP-SEC-KEY-MGMT-802-1X:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-KEY-MGMT-802-1X:CAPS">
 <ANCHOR id="NM80211Mode" href="libnm/libnm-nm-dbus-interface.html#NM80211Mode">
+<ANCHOR id="NM-802-11-MODE-UNKNOWN:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-MODE-UNKNOWN:CAPS">
+<ANCHOR id="NM-802-11-MODE-ADHOC:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-MODE-ADHOC:CAPS">
+<ANCHOR id="NM-802-11-MODE-INFRA:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-MODE-INFRA:CAPS">
+<ANCHOR id="NM-802-11-MODE-AP:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-802-11-MODE-AP:CAPS">
 <ANCHOR id="NMBluetoothCapabilities" href="libnm/libnm-nm-dbus-interface.html#NMBluetoothCapabilities">
+<ANCHOR id="NM-BT-CAPABILITY-NONE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-BT-CAPABILITY-NONE:CAPS">
+<ANCHOR id="NM-BT-CAPABILITY-DUN:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-BT-CAPABILITY-DUN:CAPS">
+<ANCHOR id="NM-BT-CAPABILITY-NAP:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-BT-CAPABILITY-NAP:CAPS">
 <ANCHOR id="NMDeviceModemCapabilities" href="libnm/libnm-nm-dbus-interface.html#NMDeviceModemCapabilities">
+<ANCHOR id="NM-DEVICE-MODEM-CAPABILITY-NONE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-NONE:CAPS">
+<ANCHOR id="NM-DEVICE-MODEM-CAPABILITY-POTS:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-POTS:CAPS">
+<ANCHOR id="NM-DEVICE-MODEM-CAPABILITY-CDMA-EVDO:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-CDMA-EVDO:CAPS">
+<ANCHOR id="NM-DEVICE-MODEM-CAPABILITY-GSM-UMTS:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-GSM-UMTS:CAPS">
+<ANCHOR id="NM-DEVICE-MODEM-CAPABILITY-LTE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-LTE:CAPS">
 <ANCHOR id="NMDeviceState" href="libnm/libnm-nm-dbus-interface.html#NMDeviceState">
+<ANCHOR id="NM-DEVICE-STATE-UNKNOWN:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-UNMANAGED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-UNMANAGED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-UNAVAILABLE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-UNAVAILABLE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-DISCONNECTED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-DISCONNECTED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-PREPARE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-PREPARE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-CONFIG:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-CONFIG:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-NEED-AUTH:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-NEED-AUTH:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-IP-CONFIG:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-IP-CONFIG:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-IP-CHECK:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-IP-CHECK:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-SECONDARIES:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-SECONDARIES:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-ACTIVATED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-ACTIVATED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-DEACTIVATING:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-DEACTIVATING:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-FAILED:CAPS">
 <ANCHOR id="NMDeviceStateReason" href="libnm/libnm-nm-dbus-interface.html#NMDeviceStateReason">
+<ANCHOR id="NM-DEVICE-STATE-REASON-NONE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-NONE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-UNKNOWN:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-UNKNOWN:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-NOW-MANAGED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-NOW-MANAGED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-NOW-UNMANAGED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-NOW-UNMANAGED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-CONFIG-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-CONFIG-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-IP-CONFIG-UNAVAILABLE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-IP-CONFIG-UNAVAILABLE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-IP-CONFIG-EXPIRED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-IP-CONFIG-EXPIRED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-NO-SECRETS:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-NO-SECRETS:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SUPPLICANT-DISCONNECT:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SUPPLICANT-DISCONNECT:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SUPPLICANT-CONFIG-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SUPPLICANT-CONFIG-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SUPPLICANT-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SUPPLICANT-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SUPPLICANT-TIMEOUT:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SUPPLICANT-TIMEOUT:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-PPP-START-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-PPP-START-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-PPP-DISCONNECT:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-PPP-DISCONNECT:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-PPP-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-PPP-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-DHCP-START-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-DHCP-START-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-DHCP-ERROR:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-DHCP-ERROR:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-DHCP-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-DHCP-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SHARED-START-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SHARED-START-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SHARED-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SHARED-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-AUTOIP-START-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-AUTOIP-START-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-AUTOIP-ERROR:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-AUTOIP-ERROR:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-AUTOIP-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-AUTOIP-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-BUSY:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-BUSY:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-NO-DIAL-TONE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-NO-DIAL-TONE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-NO-CARRIER:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-NO-CARRIER:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-DIAL-TIMEOUT:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-DIAL-TIMEOUT:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-DIAL-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-DIAL-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-INIT-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-INIT-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-APN-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-APN-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-REGISTRATION-NOT-SEARCHING:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-NOT-SEARCHING:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-REGISTRATION-DENIED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-DENIED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-REGISTRATION-TIMEOUT:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-TIMEOUT:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-REGISTRATION-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-PIN-CHECK-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-PIN-CHECK-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-FIRMWARE-MISSING:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-FIRMWARE-MISSING:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-REMOVED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-REMOVED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SLEEPING:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SLEEPING:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-CONNECTION-REMOVED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-CONNECTION-REMOVED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-USER-REQUESTED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-USER-REQUESTED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-CARRIER:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-CARRIER:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-CONNECTION-ASSUMED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-CONNECTION-ASSUMED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SUPPLICANT-AVAILABLE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SUPPLICANT-AVAILABLE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-NOT-FOUND:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-NOT-FOUND:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-BT-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-BT-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-SIM-NOT-INSERTED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-SIM-NOT-INSERTED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-SIM-PIN-REQUIRED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-SIM-PIN-REQUIRED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-SIM-PUK-REQUIRED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-SIM-PUK-REQUIRED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-GSM-SIM-WRONG:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-SIM-WRONG:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-INFINIBAND-MODE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-INFINIBAND-MODE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-DEPENDENCY-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-DEPENDENCY-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-BR2684-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-BR2684-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-MANAGER-UNAVAILABLE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-MANAGER-UNAVAILABLE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SSID-NOT-FOUND:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SSID-NOT-FOUND:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SECONDARY-CONNECTION-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SECONDARY-CONNECTION-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-DCB-FCOE-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-DCB-FCOE-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-TEAMD-CONTROL-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-TEAMD-CONTROL-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-FAILED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-FAILED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-MODEM-AVAILABLE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-AVAILABLE:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-SIM-PIN-INCORRECT:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SIM-PIN-INCORRECT:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-NEW-ACTIVATION:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-NEW-ACTIVATION:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-PARENT-CHANGED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-PARENT-CHANGED:CAPS">
+<ANCHOR id="NM-DEVICE-STATE-REASON-PARENT-MANAGED-CHANGED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-PARENT-MANAGED-CHANGED:CAPS">
 <ANCHOR id="NMActiveConnectionState" href="libnm/libnm-nm-dbus-interface.html#NMActiveConnectionState">
+<ANCHOR id="NM-ACTIVE-CONNECTION-STATE-UNKNOWN:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-UNKNOWN:CAPS">
+<ANCHOR id="NM-ACTIVE-CONNECTION-STATE-ACTIVATING:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATING:CAPS">
+<ANCHOR id="NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS">
+<ANCHOR id="NM-ACTIVE-CONNECTION-STATE-DEACTIVATING:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-DEACTIVATING:CAPS">
+<ANCHOR id="NM-ACTIVE-CONNECTION-STATE-DEACTIVATED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-DEACTIVATED:CAPS">
 <ANCHOR id="NMSecretAgentGetSecretsFlags" href="libnm/libnm-nm-dbus-interface.html#NMSecretAgentGetSecretsFlags">
+<ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-NONE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-NONE:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-ALLOW-INTERACTION:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-ALLOW-INTERACTION:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-REQUEST-NEW:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-REQUEST-NEW:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-USER-REQUESTED:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-USER-REQUESTED:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-ONLY-SYSTEM:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-ONLY-SYSTEM:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-NO-ERRORS:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-NO-ERRORS:CAPS">
 <ANCHOR id="NMSecretAgentCapabilities" href="libnm/libnm-nm-dbus-interface.html#NMSecretAgentCapabilities">
+<ANCHOR id="NM-SECRET-AGENT-CAPABILITY-NONE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-SECRET-AGENT-CAPABILITY-NONE:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-CAPABILITY-VPN-HINTS:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-SECRET-AGENT-CAPABILITY-VPN-HINTS:CAPS">
+<ANCHOR id="NM-SECRET-AGENT-CAPABILITY-LAST:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-SECRET-AGENT-CAPABILITY-LAST:CAPS">
 <ANCHOR id="libnm-NMConnection" href="libnm/libnm-NMConnection.html">
 <ANCHOR id="libnm-NMConnection.functions" href="libnm/libnm-NMConnection.html#libnm-NMConnection.functions">
 <ANCHOR id="libnm-NMConnection.other" href="libnm/libnm-NMConnection.html#libnm-NMConnection.other">
@@ -320,6 +563,9 @@
 <ANCHOR id="NMConnectionInterface" href="libnm/libnm-NMConnection.html#NMConnectionInterface">
 <ANCHOR id="NM-VARIANT-TYPE-SETTING:CAPS" href="libnm/libnm-NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS">
 <ANCHOR id="NMConnectionSerializationFlags" href="libnm/libnm-NMConnection.html#NMConnectionSerializationFlags">
+<ANCHOR id="NM-CONNECTION-SERIALIZE-ALL:CAPS" href="libnm/libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-ALL:CAPS">
+<ANCHOR id="NM-CONNECTION-SERIALIZE-NO-SECRETS:CAPS" href="libnm/libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-NO-SECRETS:CAPS">
+<ANCHOR id="NM-CONNECTION-SERIALIZE-ONLY-SECRETS:CAPS" href="libnm/libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-ONLY-SECRETS:CAPS">
 <ANCHOR id="NMSimpleConnection" href="libnm/NMSimpleConnection.html">
 <ANCHOR id="NMSimpleConnection.functions" href="libnm/NMSimpleConnection.html#NMSimpleConnection.functions">
 <ANCHOR id="NMSimpleConnection.object-hierarchy" href="libnm/NMSimpleConnection.html#NMSimpleConnection.object-hierarchy">
@@ -355,9 +601,27 @@
 <ANCHOR id="NMSetting.other_details" href="libnm/NMSetting.html#NMSetting.other_details">
 <ANCHOR id="NM-SETTING-NAME:CAPS" href="libnm/NMSetting.html#NM-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingSecretFlags" href="libnm/NMSetting.html#NMSettingSecretFlags">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-NONE:CAPS" href="libnm/NMSetting.html#NM-SETTING-SECRET-FLAG-NONE:CAPS">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS" href="libnm/NMSetting.html#NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS" href="libnm/NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS">
+<ANCHOR id="NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS" href="libnm/NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS">
 <ANCHOR id="NMSettingCompareFlags" href="libnm/NMSetting.html#NMSettingCompareFlags">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-EXACT:CAPS" href="libnm/NMSetting.html#NM-SETTING-COMPARE-FLAG-EXACT:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-FUZZY:CAPS" href="libnm/NMSetting.html#NM-SETTING-COMPARE-FLAG-FUZZY:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-IGNORE-ID:CAPS" href="libnm/NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-ID:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-IGNORE-SECRETS:CAPS" href="libnm/NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-SECRETS:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-IGNORE-AGENT-OWNED-SECRETS:CAPS" href="libnm/NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-AGENT-OWNED-SECRETS:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-IGNORE-NOT-SAVED-SECRETS:CAPS" href="libnm/NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-NOT-SAVED-SECRETS:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-DIFF-RESULT-WITH-DEFAULT:CAPS" href="libnm/NMSetting.html#NM-SETTING-COMPARE-FLAG-DIFF-RESULT-WITH-DEFAULT:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-DIFF-RESULT-NO-DEFAULT:CAPS" href="libnm/NMSetting.html#NM-SETTING-COMPARE-FLAG-DIFF-RESULT-NO-DEFAULT:CAPS">
+<ANCHOR id="NM-SETTING-COMPARE-FLAG-IGNORE-TIMESTAMP:CAPS" href="libnm/NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-TIMESTAMP:CAPS">
 <ANCHOR id="NMSetting-struct" href="libnm/NMSetting.html#NMSetting-struct">
 <ANCHOR id="NMSettingDiffResult" href="libnm/NMSetting.html#NMSettingDiffResult">
+<ANCHOR id="NM-SETTING-DIFF-RESULT-UNKNOWN:CAPS" href="libnm/NMSetting.html#NM-SETTING-DIFF-RESULT-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-DIFF-RESULT-IN-A:CAPS" href="libnm/NMSetting.html#NM-SETTING-DIFF-RESULT-IN-A:CAPS">
+<ANCHOR id="NM-SETTING-DIFF-RESULT-IN-B:CAPS" href="libnm/NMSetting.html#NM-SETTING-DIFF-RESULT-IN-B:CAPS">
+<ANCHOR id="NM-SETTING-DIFF-RESULT-IN-A-DEFAULT:CAPS" href="libnm/NMSetting.html#NM-SETTING-DIFF-RESULT-IN-A-DEFAULT:CAPS">
+<ANCHOR id="NM-SETTING-DIFF-RESULT-IN-B-DEFAULT:CAPS" href="libnm/NMSetting.html#NM-SETTING-DIFF-RESULT-IN-B-DEFAULT:CAPS">
 <ANCHOR id="NMSetting.property-details" href="libnm/NMSetting.html#NMSetting.property-details">
 <ANCHOR id="NMSetting--name" href="libnm/NMSetting.html#NMSetting--name">
 <ANCHOR id="NMSettingConnection" href="libnm/NMSettingConnection.html">
@@ -386,6 +650,7 @@
 <ANCHOR id="nm-setting-connection-get-master" href="libnm/NMSettingConnection.html#nm-setting-connection-get-master">
 <ANCHOR id="nm-setting-connection-is-slave-type" href="libnm/NMSettingConnection.html#nm-setting-connection-is-slave-type">
 <ANCHOR id="nm-setting-connection-get-slave-type" href="libnm/NMSettingConnection.html#nm-setting-connection-get-slave-type">
+<ANCHOR id="nm-setting-connection-get-autoconnect-slaves" href="libnm/NMSettingConnection.html#nm-setting-connection-get-autoconnect-slaves">
 <ANCHOR id="nm-setting-connection-get-num-secondaries" href="libnm/NMSettingConnection.html#nm-setting-connection-get-num-secondaries">
 <ANCHOR id="nm-setting-connection-get-secondary" href="libnm/NMSettingConnection.html#nm-setting-connection-get-secondary">
 <ANCHOR id="nm-setting-connection-add-secondary" href="libnm/NMSettingConnection.html#nm-setting-connection-add-secondary">
@@ -409,12 +674,18 @@
 <ANCHOR id="NM-SETTING-CONNECTION-ZONE:CAPS" href="libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE:CAPS">
 <ANCHOR id="NM-SETTING-CONNECTION-MASTER:CAPS" href="libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-MASTER:CAPS">
 <ANCHOR id="NM-SETTING-CONNECTION-SLAVE-TYPE:CAPS" href="libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-SLAVE-TYPE:CAPS">
+<ANCHOR id="NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES:CAPS" href="libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES:CAPS">
 <ANCHOR id="NM-SETTING-CONNECTION-SECONDARIES:CAPS" href="libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-SECONDARIES:CAPS">
 <ANCHOR id="NM-SETTING-CONNECTION-GATEWAY-PING-TIMEOUT:CAPS" href="libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-GATEWAY-PING-TIMEOUT:CAPS">
+<ANCHOR id="NMSettingConnectionAutoconnectSlaves" href="libnm/NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves">
+<ANCHOR id="NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-DEFAULT:CAPS" href="libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-DEFAULT:CAPS">
+<ANCHOR id="NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-NO:CAPS" href="libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-NO:CAPS">
+<ANCHOR id="NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-YES:CAPS" href="libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-YES:CAPS">
 <ANCHOR id="NMSettingConnection-struct" href="libnm/NMSettingConnection.html#NMSettingConnection-struct">
 <ANCHOR id="NMSettingConnection.property-details" href="libnm/NMSettingConnection.html#NMSettingConnection.property-details">
 <ANCHOR id="NMSettingConnection--autoconnect" href="libnm/NMSettingConnection.html#NMSettingConnection--autoconnect">
 <ANCHOR id="NMSettingConnection--autoconnect-priority" href="libnm/NMSettingConnection.html#NMSettingConnection--autoconnect-priority">
+<ANCHOR id="NMSettingConnection--autoconnect-slaves" href="libnm/NMSettingConnection.html#NMSettingConnection--autoconnect-slaves">
 <ANCHOR id="NMSettingConnection--gateway-ping-timeout" href="libnm/NMSettingConnection.html#NMSettingConnection--gateway-ping-timeout">
 <ANCHOR id="NMSettingConnection--id" href="libnm/NMSettingConnection.html#NMSettingConnection--id">
 <ANCHOR id="NMSettingConnection--interface-name" href="libnm/NMSettingConnection.html#NMSettingConnection--interface-name">
@@ -503,8 +774,16 @@
 <ANCHOR id="nm-setting-802-1x-get-phase2-private-key-password-flags" href="libnm/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password-flags">
 <ANCHOR id="nm-setting-802-1x-get-phase2-private-key-format" href="libnm/NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format">
 <ANCHOR id="NMSetting8021x.other_details" href="libnm/NMSetting8021x.html#NMSetting8021x.other_details">
+<ANCHOR id="NM-SETTING-802-1X-CERT-SCHEME-PREFIX-PATH:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-CERT-SCHEME-PREFIX-PATH:CAPS">
 <ANCHOR id="NMSetting8021xCKFormat" href="libnm/NMSetting8021x.html#NMSetting8021xCKFormat">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-X509:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-X509:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS">
 <ANCHOR id="NMSetting8021xCKScheme" href="libnm/NMSetting8021x.html#NMSetting8021xCKScheme">
+<ANCHOR id="NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS">
+<ANCHOR id="NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-SETTING-NAME:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-SETTING-NAME:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-EAP:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-EAP:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-IDENTITY:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-IDENTITY:CAPS">
@@ -770,6 +1049,10 @@
 <ANCHOR id="NMSettingDcb.other_details" href="libnm/NMSettingDcb.html#NMSettingDcb.other_details">
 <ANCHOR id="NM-SETTING-DCB-SETTING-NAME:CAPS" href="libnm/NMSettingDcb.html#NM-SETTING-DCB-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingDcbFlags" href="libnm/NMSettingDcb.html#NMSettingDcbFlags">
+<ANCHOR id="NM-SETTING-DCB-FLAG-NONE:CAPS" href="libnm/NMSettingDcb.html#NM-SETTING-DCB-FLAG-NONE:CAPS">
+<ANCHOR id="NM-SETTING-DCB-FLAG-ENABLE:CAPS" href="libnm/NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS">
+<ANCHOR id="NM-SETTING-DCB-FLAG-ADVERTISE:CAPS" href="libnm/NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS">
+<ANCHOR id="NM-SETTING-DCB-FLAG-WILLING:CAPS" href="libnm/NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS">
 <ANCHOR id="NM-SETTING-DCB-FCOE-MODE-FABRIC:CAPS" href="libnm/NMSettingDcb.html#NM-SETTING-DCB-FCOE-MODE-FABRIC:CAPS">
 <ANCHOR id="NM-SETTING-DCB-FCOE-MODE-VN2VN:CAPS" href="libnm/NMSettingDcb.html#NM-SETTING-DCB-FCOE-MODE-VN2VN:CAPS">
 <ANCHOR id="NM-SETTING-DCB-APP-FCOE-FLAGS:CAPS" href="libnm/NMSettingDcb.html#NM-SETTING-DCB-APP-FCOE-FLAGS:CAPS">
@@ -1025,6 +1308,10 @@
 <ANCHOR id="NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS" href="libnm/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS">
 <ANCHOR id="NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS" href="libnm/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS">
 <ANCHOR id="NMSettingIP6ConfigPrivacy" href="libnm/NMSettingIP6Config.html#NMSettingIP6ConfigPrivacy">
+<ANCHOR id="NM-SETTING-IP6-CONFIG-PRIVACY-UNKNOWN:CAPS" href="libnm/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-IP6-CONFIG-PRIVACY-DISABLED:CAPS" href="libnm/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-DISABLED:CAPS">
+<ANCHOR id="NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-PUBLIC-ADDR:CAPS" href="libnm/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-PUBLIC-ADDR:CAPS">
+<ANCHOR id="NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-TEMP-ADDR:CAPS" href="libnm/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-TEMP-ADDR:CAPS">
 <ANCHOR id="NMSettingIP6Config.property-details" href="libnm/NMSettingIP6Config.html#NMSettingIP6Config.property-details">
 <ANCHOR id="NMSettingIP6Config--ip6-privacy" href="libnm/NMSettingIP6Config.html#NMSettingIP6Config--ip6-privacy">
 <ANCHOR id="NMSettingOlpcMesh" href="libnm/NMSettingOlpcMesh.html">
@@ -1151,6 +1438,9 @@
 <ANCHOR id="NMSettingSerial.other_details" href="libnm/NMSettingSerial.html#NMSettingSerial.other_details">
 <ANCHOR id="NM-SETTING-SERIAL-SETTING-NAME:CAPS" href="libnm/NMSettingSerial.html#NM-SETTING-SERIAL-SETTING-NAME:CAPS">
 <ANCHOR id="NMSettingSerialParity" href="libnm/NMSettingSerial.html#NMSettingSerialParity">
+<ANCHOR id="NM-SETTING-SERIAL-PARITY-NONE:CAPS" href="libnm/NMSettingSerial.html#NM-SETTING-SERIAL-PARITY-NONE:CAPS">
+<ANCHOR id="NM-SETTING-SERIAL-PARITY-EVEN:CAPS" href="libnm/NMSettingSerial.html#NM-SETTING-SERIAL-PARITY-EVEN:CAPS">
+<ANCHOR id="NM-SETTING-SERIAL-PARITY-ODD:CAPS" href="libnm/NMSettingSerial.html#NM-SETTING-SERIAL-PARITY-ODD:CAPS">
 <ANCHOR id="NM-SETTING-SERIAL-BAUD:CAPS" href="libnm/NMSettingSerial.html#NM-SETTING-SERIAL-BAUD:CAPS">
 <ANCHOR id="NM-SETTING-SERIAL-BITS:CAPS" href="libnm/NMSettingSerial.html#NM-SETTING-SERIAL-BITS:CAPS">
 <ANCHOR id="NM-SETTING-SERIAL-PARITY:CAPS" href="libnm/NMSettingSerial.html#NM-SETTING-SERIAL-PARITY:CAPS">
@@ -1217,7 +1507,12 @@
 <ANCHOR id="NM-SETTING-VLAN-INGRESS-PRIORITY-MAP:CAPS" href="libnm/NMSettingVlan.html#NM-SETTING-VLAN-INGRESS-PRIORITY-MAP:CAPS">
 <ANCHOR id="NM-SETTING-VLAN-EGRESS-PRIORITY-MAP:CAPS" href="libnm/NMSettingVlan.html#NM-SETTING-VLAN-EGRESS-PRIORITY-MAP:CAPS">
 <ANCHOR id="NMVlanPriorityMap" href="libnm/NMSettingVlan.html#NMVlanPriorityMap">
+<ANCHOR id="NM-VLAN-INGRESS-MAP:CAPS" href="libnm/NMSettingVlan.html#NM-VLAN-INGRESS-MAP:CAPS">
+<ANCHOR id="NM-VLAN-EGRESS-MAP:CAPS" href="libnm/NMSettingVlan.html#NM-VLAN-EGRESS-MAP:CAPS">
 <ANCHOR id="NMVlanFlags" href="libnm/NMSettingVlan.html#NMVlanFlags">
+<ANCHOR id="NM-VLAN-FLAG-REORDER-HEADERS:CAPS" href="libnm/NMSettingVlan.html#NM-VLAN-FLAG-REORDER-HEADERS:CAPS">
+<ANCHOR id="NM-VLAN-FLAG-GVRP:CAPS" href="libnm/NMSettingVlan.html#NM-VLAN-FLAG-GVRP:CAPS">
+<ANCHOR id="NM-VLAN-FLAG-LOOSE-BINDING:CAPS" href="libnm/NMSettingVlan.html#NM-VLAN-FLAG-LOOSE-BINDING:CAPS">
 <ANCHOR id="NMSettingVlan.property-details" href="libnm/NMSettingVlan.html#NMSettingVlan.property-details">
 <ANCHOR id="NMSettingVlan--egress-priority-map" href="libnm/NMSettingVlan.html#NMSettingVlan--egress-priority-map">
 <ANCHOR id="NMSettingVlan--flags" href="libnm/NMSettingVlan.html#NMSettingVlan--flags">
@@ -1434,6 +1729,10 @@
 <ANCHOR id="NMSettingWirelessSecurity.other_details" href="libnm/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity.other_details">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS" href="libnm/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-SETTING-NAME:CAPS">
 <ANCHOR id="NMWepKeyType" href="libnm/NMSettingWirelessSecurity.html#NMWepKeyType">
+<ANCHOR id="NM-WEP-KEY-TYPE-UNKNOWN:CAPS" href="libnm/NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-UNKNOWN:CAPS">
+<ANCHOR id="NM-WEP-KEY-TYPE-KEY:CAPS" href="libnm/NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-KEY:CAPS">
+<ANCHOR id="NM-WEP-KEY-TYPE-PASSPHRASE:CAPS" href="libnm/NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-PASSPHRASE:CAPS">
+<ANCHOR id="NM-WEP-KEY-TYPE-LAST:CAPS" href="libnm/NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-LAST:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-KEY-MGMT:CAPS" href="libnm/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-KEY-MGMT:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-WEP-TX-KEYIDX:CAPS" href="libnm/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-WEP-TX-KEYIDX:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-AUTH-ALG:CAPS" href="libnm/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-AUTH-ALG:CAPS">
@@ -1988,6 +2287,10 @@
 <ANCHOR id="NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS">
 <ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE:CAPS">
 <ANCHOR id="NMWimaxNspNetworkType" href="libnm/NMWimaxNsp.html#NMWimaxNspNetworkType">
+<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS">
+<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS">
+<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS">
+<ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS">
 <ANCHOR id="NMWimaxNsp.property-details" href="libnm/NMWimaxNsp.html#NMWimaxNsp.property-details">
 <ANCHOR id="NMWimaxNsp--name" href="libnm/NMWimaxNsp.html#NMWimaxNsp--name">
 <ANCHOR id="NMWimaxNsp--network-type" href="libnm/NMWimaxNsp.html#NMWimaxNsp--network-type">
@@ -2102,6 +2405,15 @@
 <ANCHOR id="nm-utils-check-virtual-device-compatibility" href="libnm/libnm-nm-utils.html#nm-utils-check-virtual-device-compatibility">
 <ANCHOR id="libnm-nm-utils.other_details" href="libnm/libnm-nm-utils.html#libnm-nm-utils.other_details">
 <ANCHOR id="NMUtilsSecurityType" href="libnm/libnm-nm-utils.html#NMUtilsSecurityType">
+<ANCHOR id="NMU-SEC-INVALID:CAPS" href="libnm/libnm-nm-utils.html#NMU-SEC-INVALID:CAPS">
+<ANCHOR id="NMU-SEC-NONE:CAPS" href="libnm/libnm-nm-utils.html#NMU-SEC-NONE:CAPS">
+<ANCHOR id="NMU-SEC-STATIC-WEP:CAPS" href="libnm/libnm-nm-utils.html#NMU-SEC-STATIC-WEP:CAPS">
+<ANCHOR id="NMU-SEC-LEAP:CAPS" href="libnm/libnm-nm-utils.html#NMU-SEC-LEAP:CAPS">
+<ANCHOR id="NMU-SEC-DYNAMIC-WEP:CAPS" href="libnm/libnm-nm-utils.html#NMU-SEC-DYNAMIC-WEP:CAPS">
+<ANCHOR id="NMU-SEC-WPA-PSK:CAPS" href="libnm/libnm-nm-utils.html#NMU-SEC-WPA-PSK:CAPS">
+<ANCHOR id="NMU-SEC-WPA-ENTERPRISE:CAPS" href="libnm/libnm-nm-utils.html#NMU-SEC-WPA-ENTERPRISE:CAPS">
+<ANCHOR id="NMU-SEC-WPA2-PSK:CAPS" href="libnm/libnm-nm-utils.html#NMU-SEC-WPA2-PSK:CAPS">
+<ANCHOR id="NMU-SEC-WPA2-ENTERPRISE:CAPS" href="libnm/libnm-nm-utils.html#NMU-SEC-WPA2-ENTERPRISE:CAPS">
 <ANCHOR id="NM-UTILS-HWADDR-LEN-MAX:CAPS" href="libnm/libnm-nm-utils.html#NM-UTILS-HWADDR-LEN-MAX:CAPS">
 <ANCHOR id="NM-UTILS-INET-ADDRSTRLEN:CAPS" href="libnm/libnm-nm-utils.html#NM-UTILS-INET-ADDRSTRLEN:CAPS">
 <ANCHOR id="libnm-nm-version" href="libnm/libnm-nm-version.html">
@@ -2117,6 +2429,8 @@
 <ANCHOR id="NM-VERSION-0-9-8:CAPS" href="libnm/libnm-nm-version.html#NM-VERSION-0-9-8:CAPS">
 <ANCHOR id="NM-VERSION-0-9-10:CAPS" href="libnm/libnm-nm-version.html#NM-VERSION-0-9-10:CAPS">
 <ANCHOR id="NM-VERSION-1-0:CAPS" href="libnm/libnm-nm-version.html#NM-VERSION-1-0:CAPS">
+<ANCHOR id="NM-VERSION-1-0-2:CAPS" href="libnm/libnm-nm-version.html#NM-VERSION-1-0-2:CAPS">
+<ANCHOR id="NM-VERSION-1-0-4:CAPS" href="libnm/libnm-nm-version.html#NM-VERSION-1-0-4:CAPS">
 <ANCHOR id="NM-VERSION-MIN-REQUIRED:CAPS" href="libnm/libnm-nm-version.html#NM-VERSION-MIN-REQUIRED:CAPS">
 <ANCHOR id="NM-VERSION-MAX-ALLOWED:CAPS" href="libnm/libnm-nm-version.html#NM-VERSION-MAX-ALLOWED:CAPS">
 <ANCHOR id="NM-DEPRECATED-IN-0-9-10-FOR:CAPS" href="libnm/libnm-nm-version.html#NM-DEPRECATED-IN-0-9-10-FOR:CAPS">
@@ -2128,6 +2442,7 @@
 <ANCHOR id="NM-DEPRECATED-IN-1-0:CAPS" href="libnm/libnm-nm-version.html#NM-DEPRECATED-IN-1-0:CAPS">
 <ANCHOR id="NM-AVAILABLE-IN-0-9-10:CAPS" href="libnm/libnm-nm-version.html#NM-AVAILABLE-IN-0-9-10:CAPS">
 <ANCHOR id="NM-AVAILABLE-IN-1-0:CAPS" href="libnm/libnm-nm-version.html#NM-AVAILABLE-IN-1-0:CAPS">
+<ANCHOR id="NM-AVAILABLE-IN-1-0-4:CAPS" href="libnm/libnm-nm-version.html#NM-AVAILABLE-IN-1-0-4:CAPS">
 <ANCHOR id="libnm-nm-vpn-dbus-interface" href="libnm/libnm-nm-vpn-dbus-interface.html">
 <ANCHOR id="libnm-nm-vpn-dbus-interface.other" href="libnm/libnm-nm-vpn-dbus-interface.html#libnm-nm-vpn-dbus-interface.other">
 <ANCHOR id="libnm-nm-vpn-dbus-interface.object-hierarchy" href="libnm/libnm-nm-vpn-dbus-interface.html#libnm-nm-vpn-dbus-interface.object-hierarchy">
@@ -2160,9 +2475,39 @@
 <ANCHOR id="NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS">
 <ANCHOR id="NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS">
 <ANCHOR id="NMVpnServiceState" href="libnm/libnm-nm-vpn-dbus-interface.html#NMVpnServiceState">
+<ANCHOR id="NM-VPN-SERVICE-STATE-UNKNOWN:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-UNKNOWN:CAPS">
+<ANCHOR id="NM-VPN-SERVICE-STATE-INIT:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-INIT:CAPS">
+<ANCHOR id="NM-VPN-SERVICE-STATE-SHUTDOWN:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-SHUTDOWN:CAPS">
+<ANCHOR id="NM-VPN-SERVICE-STATE-STARTING:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-STARTING:CAPS">
+<ANCHOR id="NM-VPN-SERVICE-STATE-STARTED:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-STARTED:CAPS">
+<ANCHOR id="NM-VPN-SERVICE-STATE-STOPPING:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-STOPPING:CAPS">
+<ANCHOR id="NM-VPN-SERVICE-STATE-STOPPED:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-STOPPED:CAPS">
 <ANCHOR id="NMVpnConnectionState" href="libnm/libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-UNKNOWN:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-UNKNOWN:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-PREPARE:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-PREPARE:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-NEED-AUTH:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-NEED-AUTH:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-CONNECT:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-CONNECT:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-IP-CONFIG-GET:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-IP-CONFIG-GET:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-ACTIVATED:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-ACTIVATED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-FAILED:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-FAILED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-DISCONNECTED:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-DISCONNECTED:CAPS">
 <ANCHOR id="NMVpnConnectionStateReason" href="libnm/libnm-nm-vpn-dbus-interface.html#NMVpnConnectionStateReason">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-UNKNOWN:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-UNKNOWN:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-NONE:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-NONE:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-USER-DISCONNECTED:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-USER-DISCONNECTED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-DEVICE-DISCONNECTED:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-DEVICE-DISCONNECTED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-SERVICE-STOPPED:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-STOPPED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-IP-CONFIG-INVALID:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-IP-CONFIG-INVALID:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-CONNECT-TIMEOUT:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-CONNECT-TIMEOUT:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-TIMEOUT:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-TIMEOUT:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-FAILED:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-FAILED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-NO-SECRETS:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-NO-SECRETS:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-LOGIN-FAILED:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-LOGIN-FAILED:CAPS">
+<ANCHOR id="NM-VPN-CONNECTION-STATE-REASON-CONNECTION-REMOVED:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-CONNECTION-REMOVED:CAPS">
 <ANCHOR id="NMVpnPluginFailure" href="libnm/libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure">
+<ANCHOR id="NM-VPN-PLUGIN-FAILURE-LOGIN-FAILED:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-FAILURE-LOGIN-FAILED:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-FAILURE-CONNECT-FAILED:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-FAILURE-CONNECT-FAILED:CAPS">
+<ANCHOR id="NM-VPN-PLUGIN-FAILURE-BAD-IP-CONFIG:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-FAILURE-BAD-IP-CONFIG:CAPS">
 <ANCHOR id="NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS">
 <ANCHOR id="NM-VPN-PLUGIN-CONFIG-BANNER:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-BANNER:CAPS">
 <ANCHOR id="NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS" href="libnm/libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS">
@@ -2216,6 +2561,10 @@
 <ANCHOR id="nm-vpn-editor-update-connection" href="libnm/NMVpnEditor.html#nm-vpn-editor-update-connection">
 <ANCHOR id="NMVpnEditor.other_details" href="libnm/NMVpnEditor.html#NMVpnEditor.other_details">
 <ANCHOR id="NMVpnEditorPluginCapability" href="libnm/NMVpnEditor.html#NMVpnEditorPluginCapability">
+<ANCHOR id="NM-VPN-EDITOR-PLUGIN-CAPABILITY-NONE:CAPS" href="libnm/NMVpnEditor.html#NM-VPN-EDITOR-PLUGIN-CAPABILITY-NONE:CAPS">
+<ANCHOR id="NM-VPN-EDITOR-PLUGIN-CAPABILITY-IMPORT:CAPS" href="libnm/NMVpnEditor.html#NM-VPN-EDITOR-PLUGIN-CAPABILITY-IMPORT:CAPS">
+<ANCHOR id="NM-VPN-EDITOR-PLUGIN-CAPABILITY-EXPORT:CAPS" href="libnm/NMVpnEditor.html#NM-VPN-EDITOR-PLUGIN-CAPABILITY-EXPORT:CAPS">
+<ANCHOR id="NM-VPN-EDITOR-PLUGIN-CAPABILITY-IPV6:CAPS" href="libnm/NMVpnEditor.html#NM-VPN-EDITOR-PLUGIN-CAPABILITY-IPV6:CAPS">
 <ANCHOR id="NM-VPN-EDITOR-PLUGIN-NAME:CAPS" href="libnm/NMVpnEditor.html#NM-VPN-EDITOR-PLUGIN-NAME:CAPS">
 <ANCHOR id="NM-VPN-EDITOR-PLUGIN-DESCRIPTION:CAPS" href="libnm/NMVpnEditor.html#NM-VPN-EDITOR-PLUGIN-DESCRIPTION:CAPS">
 <ANCHOR id="NM-VPN-EDITOR-PLUGIN-SERVICE:CAPS" href="libnm/NMVpnEditor.html#NM-VPN-EDITOR-PLUGIN-SERVICE:CAPS">
@@ -2235,6 +2584,7 @@
 <ANCHOR id="annotation-glossterm-out" href="libnm/annotation-glossary.html#annotation-glossterm-out">
 <ANCHOR id="annotation-glossterm-scope async" href="libnm/annotation-glossary.html#annotation-glossterm-scope async">
 <ANCHOR id="annotation-glossterm-scope call" href="libnm/annotation-glossary.html#annotation-glossterm-scope call">
+<ANCHOR id="annotation-glossterm-skip" href="libnm/annotation-glossary.html#annotation-glossterm-skip">
 <ANCHOR id="annotation-glossterm-transfer container" href="libnm/annotation-glossary.html#annotation-glossterm-transfer container">
 <ANCHOR id="annotation-glossterm-transfer full" href="libnm/annotation-glossary.html#annotation-glossterm-transfer full">
 <ANCHOR id="annotation-glossterm-transfer none" href="libnm/annotation-glossary.html#annotation-glossterm-transfer none">
diff --git a/docs/libnm/html/libnm-NMConnection.html b/docs/libnm/html/libnm-NMConnection.html
index 3ff7a3b6..7c3f7952 100644
--- a/docs/libnm/html/libnm-NMConnection.html
+++ b/docs/libnm/html/libnm-NMConnection.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: NMConnection</title>
+<title>NMConnection: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="next" href="NMSimpleConnection.html" title="NMSimpleConnection">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -742,7 +742,6 @@ need to result in a connection that passes <a class="link" href="libnm-NMConnect
 could not
 be deserialized (in which case <em class="parameter"><code>connection</code></em>
 will be unchanged).</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -843,7 +842,6 @@ each flag's behavior.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the comparison succeeds, <code class="literal">FALSE</code> if it does not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -899,7 +897,6 @@ differ mapped to one or more of <a class="link" href="NMSetting.html#NMSettingDi
 <a name="id-1.4.2.7.11.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connections contain the same values, <code class="literal">FALSE</code> if they do
 not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -942,7 +939,6 @@ setting and which property failed validation, and how it failed validation.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection is valid, <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1001,7 +997,6 @@ why the connection is invalid, if the function returns an error.</p></td>
 <div class="refsect3">
 <a name="id-1.4.2.7.13.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection is valid, <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1045,7 +1040,6 @@ elements. </p></td>
 <a name="id-1.4.2.7.14.6"></a><h4>Returns</h4>
 <p> the setting name of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object which has invalid or
 missing secrets</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1164,7 +1158,6 @@ or <a class="link" href="libnm-NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS" t
 <a name="id-1.4.2.7.17.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the secrets were successfully updated, <code class="literal">FALSE</code> if the update
 failed (tried to update secrets for a setting that doesn't exist, etc)</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1225,7 +1218,6 @@ nm_connection_get_path (<em class="parameter"><code><a href="https://developer.g
 <a name="id-1.4.2.7.19.6"></a><h4>Returns</h4>
 <p> the D-Bus path of the connection, previously set by a call to
 <a class="link" href="libnm-NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()"><code class="function">nm_connection_set_path()</code></a>.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1256,7 +1248,6 @@ NetworkManager, this is the name of the created interface.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.20.7"></a><h4>Returns</h4>
 <p> Name of the kernel interface or <code class="literal">NULL</code></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1297,7 +1288,6 @@ property of the connection and matches that against <em class="parameter"><code>
 <a name="id-1.4.2.7.21.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection is of the given <em class="parameter"><code>type</code></em>
 , <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1386,7 +1376,6 @@ nm_connection_get_uuid (<em class="parameter"><code><a href="https://developer.g
 <div class="refsect3">
 <a name="id-1.4.2.7.24.6"></a><h4>Returns</h4>
 <p> the UUID from the connection's 'connection' setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1413,7 +1402,6 @@ nm_connection_get_id (<em class="parameter"><code><a href="https://developer.gno
 <div class="refsect3">
 <a name="id-1.4.2.7.25.6"></a><h4>Returns</h4>
 <p> the ID from the connection's 'connection' setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1440,7 +1428,6 @@ nm_connection_get_connection_type (<em class="parameter"><code><a href="https://
 <div class="refsect3">
 <a name="id-1.4.2.7.26.6"></a><h4>Returns</h4>
 <p> the type from the connection's 'connection' setting</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1470,7 +1457,6 @@ activated even if the device it refers to doesn't exist).</p>
 <a name="id-1.4.2.7.27.6"></a><h4>Returns</h4>
 <p> whether <em class="parameter"><code>connection</code></em>
 refers to a virtual device</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2225,32 +2211,24 @@ nm_connection_get_setting_vlan (<em class="parameter"><code><a href="https://dev
 <a name="NM-CONNECTION-SECRETS-UPDATED:CAPS"></a><h3>NM_CONNECTION_SECRETS_UPDATED</h3>
 <pre class="programlisting">#define NM_CONNECTION_SECRETS_UPDATED "secrets-updated"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CONNECTION-SECRETS-CLEARED:CAPS"></a><h3>NM_CONNECTION_SECRETS_CLEARED</h3>
 <pre class="programlisting">#define NM_CONNECTION_SECRETS_CLEARED "secrets-cleared"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CONNECTION-CHANGED:CAPS"></a><h3>NM_CONNECTION_CHANGED</h3>
 <pre class="programlisting">#define NM_CONNECTION_CHANGED         "changed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS"></a><h3>NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD</h3>
 <pre class="programlisting">#define NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD "ip6-config-method"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2349,7 +2327,6 @@ calling <a class="link" href="libnm-NMConnection.html#nm-connection-to-dbus" tit
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 3d03fe4c..1272e0d3 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: nm-dbus-interface</title>
+<title>nm-dbus-interface: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch02.html" title="Client Object API Reference">
 <link rel="prev" href="libnm-nm-errors.html" title="nm-errors">
 <link rel="next" href="ch03.html" title="Connection and Setting API Reference">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -286,11 +286,10 @@
 </div>
 <div class="refsect1">
 <a name="libnm-nm-dbus-interface.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="libnm-nm-dbus-interface.functions_details"></a><h2>Functions</h2>
+<p></p>
 </div>
 <div class="refsect1">
 <a name="libnm-nm-dbus-interface.other_details"></a><h2>Types and Values</h2>
@@ -298,320 +297,240 @@
 <a name="NM-DBUS-SERVICE:CAPS"></a><h3>NM_DBUS_SERVICE</h3>
 <pre class="programlisting">#define NM_DBUS_SERVICE                     "org.freedesktop.NetworkManager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH:CAPS"></a><h3>NM_DBUS_PATH</h3>
 <pre class="programlisting">#define NM_DBUS_PATH                        "/org/freedesktop/NetworkManager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE:CAPS"></a><h3>NM_DBUS_INTERFACE</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE                   "org.freedesktop.NetworkManager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE            NM_DBUS_INTERFACE ".Device"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-WIRED:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_WIRED</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_WIRED      NM_DBUS_INTERFACE_DEVICE ".Wired"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-ADSL:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_ADSL</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_ADSL       NM_DBUS_INTERFACE_DEVICE ".Adsl"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-WIRELESS:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_WIRELESS</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_WIRELESS   NM_DBUS_INTERFACE_DEVICE ".Wireless"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-BLUETOOTH:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_BLUETOOTH</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_BLUETOOTH  NM_DBUS_INTERFACE_DEVICE ".Bluetooth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-OLPC-MESH:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_OLPC_MESH</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_OLPC_MESH  NM_DBUS_INTERFACE_DEVICE ".OlpcMesh"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-ACCESS-POINT:CAPS"></a><h3>NM_DBUS_PATH_ACCESS_POINT</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_ACCESS_POINT           NM_DBUS_PATH "/AccessPoint"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-ACCESS-POINT:CAPS"></a><h3>NM_DBUS_INTERFACE_ACCESS_POINT</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_ACCESS_POINT      NM_DBUS_INTERFACE ".AccessPoint"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-MODEM:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_MODEM</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_MODEM      NM_DBUS_INTERFACE_DEVICE ".Modem"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-WIMAX:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_WIMAX</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_WIMAX      NM_DBUS_INTERFACE_DEVICE ".WiMax"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-WIMAX-NSP:CAPS"></a><h3>NM_DBUS_INTERFACE_WIMAX_NSP</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_WIMAX_NSP         NM_DBUS_INTERFACE ".WiMax.Nsp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-WIMAX-NSP:CAPS"></a><h3>NM_DBUS_PATH_WIMAX_NSP</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_WIMAX_NSP              NM_DBUS_PATH "/Nsp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-ACTIVE-CONNECTION:CAPS"></a><h3>NM_DBUS_INTERFACE_ACTIVE_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_ACTIVE_CONNECTION NM_DBUS_INTERFACE ".Connection.Active"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-IP4-CONFIG:CAPS"></a><h3>NM_DBUS_INTERFACE_IP4_CONFIG</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_IP4_CONFIG        NM_DBUS_INTERFACE ".IP4Config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DHCP4-CONFIG:CAPS"></a><h3>NM_DBUS_INTERFACE_DHCP4_CONFIG</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DHCP4_CONFIG      NM_DBUS_INTERFACE ".DHCP4Config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-IP6-CONFIG:CAPS"></a><h3>NM_DBUS_INTERFACE_IP6_CONFIG</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_IP6_CONFIG        NM_DBUS_INTERFACE ".IP6Config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DHCP6-CONFIG:CAPS"></a><h3>NM_DBUS_INTERFACE_DHCP6_CONFIG</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DHCP6_CONFIG      NM_DBUS_INTERFACE ".DHCP6Config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-INFINIBAND:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_INFINIBAND</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_INFINIBAND NM_DBUS_INTERFACE_DEVICE ".Infiniband"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-BOND:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_BOND</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_BOND       NM_DBUS_INTERFACE_DEVICE ".Bond"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-TEAM:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_TEAM</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_TEAM       NM_DBUS_INTERFACE_DEVICE ".Team"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-VLAN:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_VLAN</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_VLAN       NM_DBUS_INTERFACE_DEVICE ".Vlan"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-BRIDGE:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_BRIDGE</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_BRIDGE     NM_DBUS_INTERFACE_DEVICE ".Bridge"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-GENERIC:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_GENERIC</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_GENERIC    NM_DBUS_INTERFACE_DEVICE ".Generic"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-VETH:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_VETH</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_VETH       NM_DBUS_INTERFACE_DEVICE ".Veth"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-TUN:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_TUN</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_TUN        NM_DBUS_INTERFACE_DEVICE ".Tun"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-MACVLAN:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_MACVLAN</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_MACVLAN    NM_DBUS_INTERFACE_DEVICE ".Macvlan"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-VXLAN:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_VXLAN</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_VXLAN      NM_DBUS_INTERFACE_DEVICE ".Vxlan"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-DEVICE-GRE:CAPS"></a><h3>NM_DBUS_INTERFACE_DEVICE_GRE</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_DEVICE_GRE        NM_DBUS_INTERFACE_DEVICE ".Gre"
 </pre>
-<p>
-</p>
 </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>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-SETTINGS:CAPS"></a><h3>NM_DBUS_PATH_SETTINGS</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_SETTINGS             "/org/freedesktop/NetworkManager/Settings"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-SETTINGS-CONNECTION:CAPS"></a><h3>NM_DBUS_INTERFACE_SETTINGS_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_SETTINGS_CONNECTION "org.freedesktop.NetworkManager.Settings.Connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-SETTINGS-CONNECTION:CAPS"></a><h3>NM_DBUS_PATH_SETTINGS_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_SETTINGS_CONNECTION  "/org/freedesktop/NetworkManager/Settings/Connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-SETTINGS-CONNECTION-SECRETS:CAPS"></a><h3>NM_DBUS_INTERFACE_SETTINGS_CONNECTION_SECRETS</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_SETTINGS_CONNECTION_SECRETS "org.freedesktop.NetworkManager.Settings.Connection.Secrets"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-AGENT-MANAGER:CAPS"></a><h3>NM_DBUS_INTERFACE_AGENT_MANAGER</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_AGENT_MANAGER   NM_DBUS_INTERFACE ".AgentManager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-AGENT-MANAGER:CAPS"></a><h3>NM_DBUS_PATH_AGENT_MANAGER</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_AGENT_MANAGER        "/org/freedesktop/NetworkManager/AgentManager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-SECRET-AGENT:CAPS"></a><h3>NM_DBUS_INTERFACE_SECRET_AGENT</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_SECRET_AGENT    NM_DBUS_INTERFACE ".SecretAgent"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-SECRET-AGENT:CAPS"></a><h3>NM_DBUS_PATH_SECRET_AGENT</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_SECRET_AGENT         "/org/freedesktop/NetworkManager/SecretAgent"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1881,6 +1800,20 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-DEVICE-STATE-REASON-PARENT-CHANGED:CAPS"></a>NM_DEVICE_STATE_REASON_PARENT_CHANGED</p></td>
+<td class="enum_member_description">
+<p>the device's parent changed</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-DEVICE-STATE-REASON-PARENT-MANAGED-CHANGED:CAPS"></a>NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED</p></td>
+<td class="enum_member_description">
+<p>the device parent's management changed</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -2057,7 +1990,6 @@ VPN plugin authentication dialogs.</p>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html
index b62be03e..92ea7737 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: nm-errors</title>
+<title>nm-errors: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch02.html" title="Client Object API Reference">
 <link rel="prev" href="NMObject.html" title="NMObject">
 <link rel="next" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -197,8 +197,6 @@
 </div>
 <div class="refsect1">
 <a name="libnm-nm-errors.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="libnm-nm-errors.functions_details"></a><h2>Functions</h2>
@@ -206,136 +204,78 @@
 <a name="nm-agent-manager-error-quark"></a><h3>nm_agent_manager_error_quark ()</h3>
 <pre class="programlisting"><span class="returnvalue">GQuark</span>
 nm_agent_manager_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.5.7.2.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-AGENT-MANAGER-ERROR:CAPS"></a><h3>NM_AGENT_MANAGER_ERROR</h3>
 <pre class="programlisting">#define NM_AGENT_MANAGER_ERROR (nm_agent_manager_error_quark ())
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-connection-error-quark"></a><h3>nm_connection_error_quark ()</h3>
 <pre class="programlisting"><span class="returnvalue">GQuark</span>
 nm_connection_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.5.7.4.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-crypto-error-quark"></a><h3>nm_crypto_error_quark ()</h3>
 <pre class="programlisting"><span class="returnvalue">GQuark</span>
 nm_crypto_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.5.7.5.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-device-error-quark"></a><h3>nm_device_error_quark ()</h3>
 <pre class="programlisting"><span class="returnvalue">GQuark</span>
 nm_device_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.5.7.6.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-manager-error-quark"></a><h3>nm_manager_error_quark ()</h3>
 <pre class="programlisting"><span class="returnvalue">GQuark</span>
 nm_manager_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.5.7.7.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-MANAGER-ERROR:CAPS"></a><h3>NM_MANAGER_ERROR</h3>
 <pre class="programlisting">#define NM_MANAGER_ERROR (nm_manager_error_quark ())
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-secret-agent-error-quark"></a><h3>nm_secret_agent_error_quark ()</h3>
 <pre class="programlisting"><span class="returnvalue">GQuark</span>
 nm_secret_agent_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.5.7.9.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SECRET-AGENT-ERROR:CAPS"></a><h3>NM_SECRET_AGENT_ERROR</h3>
 <pre class="programlisting">#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-settings-error-quark"></a><h3>nm_settings_error_quark ()</h3>
 <pre class="programlisting"><span class="returnvalue">GQuark</span>
 nm_settings_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.5.7.11.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTINGS-ERROR:CAPS"></a><h3>NM_SETTINGS_ERROR</h3>
 <pre class="programlisting">#define NM_SETTINGS_ERROR (nm_settings_error_quark ())
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-ERROR:CAPS"></a><h3>NM_VPN_PLUGIN_ERROR</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_ERROR      (nm_vpn_plugin_error_quark ())
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-plugin-error-quark"></a><h3>nm_vpn_plugin_error_quark ()</h3>
 <pre class="programlisting"><span class="returnvalue">GQuark</span>
 nm_vpn_plugin_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.3.5.7.14.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 </div>
 <div class="refsect1">
@@ -506,8 +446,6 @@ methods, or may be returned from D-Bus operations (eg on <a class="link" href="N
 <a name="NM-CONNECTION-ERROR:CAPS"></a><h3>NM_CONNECTION_ERROR</h3>
 <pre class="programlisting">#define NM_CONNECTION_ERROR nm_connection_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -575,8 +513,6 @@ and some <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span
 <a name="NM-CRYPTO-ERROR:CAPS"></a><h3>NM_CRYPTO_ERROR</h3>
 <pre class="programlisting">#define NM_CRYPTO_ERROR nm_crypto_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -664,8 +600,6 @@ returned from D-Bus operations (where they correspond to errors in the
 <a name="NM-DEVICE-ERROR:CAPS"></a><h3>NM_DEVICE_ERROR</h3>
 <pre class="programlisting">#define NM_DEVICE_ERROR nm_device_error_quark ()
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1020,7 +954,6 @@ to errors in the "org.freedesktop.NetworkManager.VPN.Error" namespace.</p>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 60eb603e..d3789e5b 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: nm-utils</title>
+<title>nm-utils: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch05.html" title="Utility API Reference">
 <link rel="prev" href="ch05.html" title="Utility API Reference">
 <link rel="next" href="libnm-nm-version.html" title="nm-version">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -532,7 +532,6 @@ number of known SSID-cloaking methods.</p>
 <div class="refsect3">
 <a name="id-1.6.2.7.2.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the SSID is "empty", <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -572,7 +571,6 @@ be used for display of SSIDs.</p>
 <a name="id-1.6.2.7.3.6"></a><h4>Returns</h4>
 <p> pointer to the escaped SSID, which uses an internal static buffer
 and will be overwritten by subsequent calls to this function</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -632,7 +630,6 @@ NULLs, even though that is functionally pointless.</p>
 <div class="refsect3">
 <a name="id-1.6.2.7.4.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the SSIDs are the same, <code class="literal">FALSE</code> if they are not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -766,7 +763,6 @@ e.g. (<a class="link" href="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-PAIR-C
 <p> <code class="literal">TRUE</code> if the device capabilities and AP capabilties intersect and are
 compatible with the desired <em class="parameter"><code>type</code></em>
 , <code class="literal">FALSE</code> if they are not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -807,7 +803,6 @@ e.g. <a class="link" href="libnm-nm-utils.html#NMU-SEC-STATIC-WEP:CAPS"><span cl
 <p> <code class="literal">TRUE</code> if the device capabilities are compatible with the desired
 <em class="parameter"><code>type</code></em>
 , <code class="literal">FALSE</code> if they are not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -844,7 +839,6 @@ nm_utils_wep_key_valid (<em class="parameter"><code>const <span class="type">cha
 <a name="id-1.6.2.7.8.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>key</code></em>
 is a WEP key, <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -873,7 +867,6 @@ nm_utils_wpa_psk_valid (<em class="parameter"><code>const <span class="type">cha
 <a name="id-1.6.2.7.9.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>psk</code></em>
 is a WPA PSK, <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1099,7 +1092,6 @@ nm_utils_ip4_netmask_to_prefix (<em class="parameter"><code><span class="type">g
 <div class="refsect3">
 <a name="id-1.6.2.7.16.5"></a><h4>Returns</h4>
 <p> the CIDR prefix represented by the netmask</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1125,7 +1117,6 @@ nm_utils_ip4_prefix_to_netmask (<em class="parameter"><code><span class="type">g
 <div class="refsect3">
 <a name="id-1.6.2.7.17.5"></a><h4>Returns</h4>
 <p> the netmask represented by the prefix, in network byte order</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1155,7 +1146,6 @@ falls in the predefined classes.</p>
 <div class="refsect3">
 <a name="id-1.6.2.7.18.6"></a><h4>Returns</h4>
 <p> the default class prefix for the given IP</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1509,7 +1499,6 @@ nm_utils_uuid_generate (<em class="parameter"><code><span class="type">void</spa
 <a name="id-1.6.2.7.29.4"></a><h4>Returns</h4>
 <p> a newly allocated UUID suitable for use as the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
 object's <a class="link" href="NMSettingConnection.html#NMSettingConnection--id" title="The “id” property"><span class="type">“id”</span></a>: property.  Should be freed with <code class="function">g_free()</code></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1539,7 +1528,6 @@ recognized by NetworkManager.</p>
 <div class="refsect3">
 <a name="id-1.6.2.7.30.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the file is a certificate, <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1577,7 +1565,6 @@ recognized by NetworkManager.</p>
 <div class="refsect3">
 <a name="id-1.6.2.7.31.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the file is a private key, <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1605,7 +1592,6 @@ nm_utils_file_is_pkcs12 (<em class="parameter"><code>const <span class="type">ch
 <div class="refsect3">
 <a name="id-1.6.2.7.32.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the file is PKCS#12, <code class="literal">FALSE</code> if it is not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1614,12 +1600,6 @@ nm_utils_file_is_pkcs12 (<em class="parameter"><code>const <span class="type">ch
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 <span class="c_punctuation">(</span>*NMUtilsFileSearchInPathsPredicate<span class="c_punctuation">)</span> (<em class="parameter"><code>const <span class="type">char</span> *filename</code></em>,
                                       <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
-<p>
-</p>
-<div class="refsect3">
-<a name="id-1.6.2.7.33.5"></a><h4>Returns</h4>
-<p></p>
-</div>
 </div>
 <hr>
 <div class="refsect2">
@@ -1726,7 +1706,6 @@ nm_utils_wifi_freq_to_channel (<em class="parameter"><code><span class="type">gu
 <div class="refsect3">
 <a name="id-1.6.2.7.35.6"></a><h4>Returns</h4>
 <p> the channel represented by the frequency or 0</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1763,7 +1742,6 @@ nm_utils_wifi_channel_to_freq (<em class="parameter"><code><span class="type">gu
 <p> the frequency represented by the channel of the band,
 or -1 when the freq is invalid, or 0 when the band
 is invalid</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1804,7 +1782,6 @@ nm_utils_wifi_find_next_channel (<em class="parameter"><code><span class="type">
 <div class="refsect3">
 <a name="id-1.6.2.7.37.6"></a><h4>Returns</h4>
 <p> the next channel in the specified direction or 0</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1839,7 +1816,6 @@ nm_utils_wifi_is_channel_valid (<em class="parameter"><code><span class="type">g
 <div class="refsect3">
 <a name="id-1.6.2.7.38.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> or <code class="literal">FALSE</code></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1870,7 +1846,6 @@ support it, this will use unicode graphics characters to represent
 <div class="refsect3">
 <a name="id-1.6.2.7.39.6"></a><h4>Returns</h4>
 <p> the graphical representation of the access point strength</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -1901,7 +1876,6 @@ nm_utils_hwaddr_len (<em class="parameter"><code><span class="type">int</span> t
 <div class="refsect3">
 <a name="id-1.6.2.7.40.7"></a><h4>Returns</h4>
 <p> the length.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2028,7 +2002,6 @@ the size of the buffer in bytes.</p></td>
 couldn't be parsed
 or would be shorter or longer than <em class="parameter"><code>length</code></em>
 .</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2069,7 +2042,6 @@ is expected to convert to
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>asc</code></em>
 appears to be a valid hardware address
 of the indicated length, <code class="literal">FALSE</code> if not.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2195,7 +2167,6 @@ is ASCII</p></td>
 and <em class="parameter"><code>hwaddr2</code></em>
 are equivalent, <code class="literal">FALSE</code> if they are
 different (or either of them is invalid).</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2303,7 +2274,6 @@ function in net/core/dev.c.</p>
 <div class="refsect3">
 <a name="id-1.6.2.7.49.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if interface name is valid, otherwise <code class="literal">FALSE</code> is returned.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2332,7 +2302,6 @@ nm_utils_is_uuid (<em class="parameter"><code>const <span class="type">char</spa
 <a name="id-1.6.2.7.50.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>str</code></em>
 is a UUID, <code class="literal">FALSE</code> if not</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2342,8 +2311,9 @@ is a UUID, <code class="literal">FALSE</code> if not</p>
 nm_utils_inet4_ntop (<em class="parameter"><code><span class="type">in_addr_t</span> inaddr</code></em>,
                      <em class="parameter"><code><span class="type">char</span> *dst</code></em>);</pre>
 <p>Wrapper for inet_ntop.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.6.2.7.51.5"></a><h4>Parameters</h4>
+<a name="id-1.6.2.7.51.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2374,11 +2344,10 @@ buffer to avoid these issues.</p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.6.2.7.51.6"></a><h4>Returns</h4>
+<a name="id-1.6.2.7.51.7"></a><h4>Returns</h4>
 <p> the input buffer <em class="parameter"><code>dst</code></em>
 , or a pointer to an
 internal, static buffer. This function cannot fail.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2388,8 +2357,9 @@ internal, static buffer. This function cannot fail.</p>
 nm_utils_inet6_ntop (<em class="parameter"><code>const <span class="type">struct in6_addr</span> *in6addr</code></em>,
                      <em class="parameter"><code><span class="type">char</span> *dst</code></em>);</pre>
 <p>Wrapper for inet_ntop.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
-<a name="id-1.6.2.7.52.5"></a><h4>Parameters</h4>
+<a name="id-1.6.2.7.52.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2420,13 +2390,12 @@ buffer to avoid these issues.</p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.6.2.7.52.6"></a><h4>Returns</h4>
+<a name="id-1.6.2.7.52.7"></a><h4>Returns</h4>
 <p> the input buffer <em class="parameter"><code>dst</code></em>
 , or a pointer to an
 internal, static buffer. <code class="literal">NULL</code> is not allowed as <em class="parameter"><code>in6addr</code></em>
 ,
 otherwise, this function cannot fail.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2463,7 +2432,6 @@ nm_utils_ipaddr_valid (<em class="parameter"><code><span class="type">int</span>
 <div class="refsect3">
 <a name="id-1.6.2.7.53.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> or <code class="literal">FALSE</code></p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -2519,7 +2487,6 @@ underlying device driver.</p>
 <div class="refsect3">
 <a name="id-1.6.2.7.54.9"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> or <code class="literal">FALSE</code></p>
-<p></p>
 </div>
 </div>
 </div>
@@ -2628,7 +2595,6 @@ for both <a class="link" href="libnm-nm-utils.html#nm-utils-inet4-ntop" title="n
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html
index 7cbebd93..99310a5c 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: nm-version</title>
+<title>nm-version: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch05.html" title="Utility API Reference">
 <link rel="prev" href="libnm-nm-utils.html" title="nm-utils">
 <link rel="next" href="ch06.html" title="VPN Plugin API Reference">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -77,6 +77,14 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-VERSION-1-0-2:CAPS" title="NM_VERSION_1_0_2">NM_VERSION_1_0_2</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-VERSION-1-0-4:CAPS" title="NM_VERSION_1_0_4">NM_VERSION_1_0_4</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="libnm-nm-version.html#NM-VERSION-MIN-REQUIRED:CAPS" title="NM_VERSION_MIN_REQUIRED">NM_VERSION_MIN_REQUIRED</a></td>
 </tr>
 <tr>
@@ -130,13 +138,15 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-0:CAPS" title="NM_AVAILABLE_IN_1_0">NM_AVAILABLE_IN_1_0</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-0-4:CAPS" title="NM_AVAILABLE_IN_1_0_4">NM_AVAILABLE_IN_1_0_4</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="libnm-nm-version.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="libnm-nm-version.functions_details"></a><h2>Functions</h2>
@@ -158,7 +168,7 @@ is compiled against.</p>
 <hr>
 <div class="refsect2">
 <a name="NM-MICRO-VERSION:CAPS"></a><h3>NM_MICRO_VERSION</h3>
-<pre class="programlisting">#define NM_MICRO_VERSION (2)
+<pre class="programlisting">#define NM_MICRO_VERSION (4)
 </pre>
 <p>Evaluates to the micro version number of NetworkManager which this source
 compiled against.</p>
@@ -198,7 +208,6 @@ compiled against.</p>
 <a name="id-1.6.3.6.5.5"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the version of the NetworkManager header files
 is the same as or newer than the passed-in version.</p>
-<p></p>
 </div>
 </div>
 <hr>
@@ -206,119 +215,108 @@ is the same as or newer than the passed-in version.</p>
 <a name="NM-ENCODE-VERSION:CAPS"></a><h3>NM_ENCODE_VERSION()</h3>
 <pre class="programlisting">#define NM_ENCODE_VERSION(major,minor,micro) ((major) &lt;&lt; 16 | (minor) &lt;&lt; 8 | (micro))
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VERSION-0-9-8:CAPS"></a><h3>NM_VERSION_0_9_8</h3>
 <pre class="programlisting">#define NM_VERSION_0_9_8  (NM_ENCODE_VERSION (0, 9, 8))
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VERSION-0-9-10:CAPS"></a><h3>NM_VERSION_0_9_10</h3>
 <pre class="programlisting">#define NM_VERSION_0_9_10 (NM_ENCODE_VERSION (0, 9, 10))
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VERSION-1-0:CAPS"></a><h3>NM_VERSION_1_0</h3>
 <pre class="programlisting">#define NM_VERSION_1_0    (NM_ENCODE_VERSION (1, 0, 0))
 </pre>
-<p>
-</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-VERSION-1-0-2:CAPS"></a><h3>NM_VERSION_1_0_2</h3>
+<pre class="programlisting">#define NM_VERSION_1_0_2  (NM_ENCODE_VERSION (1, 0, 2))
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-VERSION-1-0-4:CAPS"></a><h3>NM_VERSION_1_0_4</h3>
+<pre class="programlisting">#define NM_VERSION_1_0_4  (NM_ENCODE_VERSION (1, 0, 4))
+</pre>
 </div>
 <hr>
 <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_VERSION_CUR_STABLE)
 </pre>
-<p>
-</p>
 </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_VERSION_CUR_STABLE)
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEPRECATED-IN-0-9-10-FOR:CAPS"></a><h3>NM_DEPRECATED_IN_0_9_10_FOR()</h3>
 <pre class="programlisting"># define NM_DEPRECATED_IN_0_9_10_FOR(f) G_DEPRECATED_FOR(f)
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEPRECATED-IN-1-0-FOR:CAPS"></a><h3>NM_DEPRECATED_IN_1_0_FOR()</h3>
 <pre class="programlisting"># define NM_DEPRECATED_IN_1_0_FOR(f)    G_DEPRECATED_FOR(f)
 </pre>
-<p>
-</p>
 </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-CUR-STABLE:CAPS"></a><h3>NM_VERSION_CUR_STABLE</h3>
-<pre class="programlisting">#define NM_VERSION_CUR_STABLE  NM_VERSION_1_0
+<pre class="programlisting">#define NM_VERSION_CUR_STABLE  NM_VERSION_1_0_2
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VERSION-NEXT-STABLE:CAPS"></a><h3>NM_VERSION_NEXT_STABLE</h3>
-<pre class="programlisting">#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0
+<pre class="programlisting">#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0_4
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEPRECATED-IN-0-9-10:CAPS"></a><h3>NM_DEPRECATED_IN_0_9_10</h3>
 <pre class="programlisting"># define NM_DEPRECATED_IN_0_9_10        G_DEPRECATED
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DEPRECATED-IN-1-0:CAPS"></a><h3>NM_DEPRECATED_IN_1_0</h3>
 <pre class="programlisting"># define NM_DEPRECATED_IN_1_0           G_DEPRECATED
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-AVAILABLE-IN-0-9-10:CAPS"></a><h3>NM_AVAILABLE_IN_0_9_10</h3>
 <pre class="programlisting"># define NM_AVAILABLE_IN_0_9_10         G_UNAVAILABLE(0.9,10)
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-AVAILABLE-IN-1-0:CAPS"></a><h3>NM_AVAILABLE_IN_1_0</h3>
 <pre class="programlisting"># define NM_AVAILABLE_IN_1_0            G_UNAVAILABLE(1,0)
 </pre>
-<p>
-</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-AVAILABLE-IN-1-0-4:CAPS"></a><h3>NM_AVAILABLE_IN_1_0_4</h3>
+<pre class="programlisting"># define NM_AVAILABLE_IN_1_0_4          G_UNAVAILABLE(1,0.4)
+</pre>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
index d48bb1cd..cb1bb7f5 100644
--- a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: nm-vpn-dbus-interface</title>
+<title>nm-vpn-dbus-interface: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch06.html" title="VPN Plugin API Reference">
 <link rel="prev" href="ch06.html" title="VPN Plugin API Reference">
 <link rel="next" href="NMVpnEditor.html" title="NMVpnEditor">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -302,11 +302,10 @@
 </div>
 <div class="refsect1">
 <a name="libnm-nm-vpn-dbus-interface.description"></a><h2>Description</h2>
-<p>
-</p>
 </div>
 <div class="refsect1">
 <a name="libnm-nm-vpn-dbus-interface.functions_details"></a><h2>Functions</h2>
+<p></p>
 </div>
 <div class="refsect1">
 <a name="libnm-nm-vpn-dbus-interface.other_details"></a><h2>Types and Values</h2>
@@ -314,200 +313,150 @@
 <a name="NM-DBUS-PATH-VPN:CAPS"></a><h3>NM_DBUS_PATH_VPN</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_VPN                  "/org/freedesktop/NetworkManager/VPN/Manager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-VPN:CAPS"></a><h3>NM_DBUS_INTERFACE_VPN</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_VPN             "org.freedesktop.NetworkManager.VPN.Manager"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-PATH-VPN-CONNECTION:CAPS"></a><h3>NM_DBUS_PATH_VPN_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_PATH_VPN_CONNECTION       "/org/freedesktop/NetworkManager/VPN/Connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INTERFACE-VPN-CONNECTION:CAPS"></a><h3>NM_DBUS_INTERFACE_VPN_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_INTERFACE_VPN_CONNECTION  "org.freedesktop.NetworkManager.VPN.Connection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-DBUS-PLUGIN-PATH:CAPS"></a><h3>NM_VPN_DBUS_PLUGIN_PATH</h3>
 <pre class="programlisting">#define NM_VPN_DBUS_PLUGIN_PATH           "/org/freedesktop/NetworkManager/VPN/Plugin"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-DBUS-PLUGIN-INTERFACE:CAPS"></a><h3>NM_VPN_DBUS_PLUGIN_INTERFACE</h3>
 <pre class="programlisting">#define NM_VPN_DBUS_PLUGIN_INTERFACE      "org.freedesktop.NetworkManager.VPN.Plugin"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-NO-ACTIVE-VPN-CONNECTION:CAPS"></a><h3>NM_DBUS_NO_ACTIVE_VPN_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_NO_ACTIVE_VPN_CONNECTION "org.freedesktop.NetworkManager.VPNConnections.NoActiveVPNConnection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-NO-VPN-CONNECTIONS:CAPS"></a><h3>NM_DBUS_NO_VPN_CONNECTIONS</h3>
 <pre class="programlisting">#define NM_DBUS_NO_VPN_CONNECTIONS       "org.freedesktop.NetworkManager.VPNConnections.NoVPNConnections"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-INVALID-VPN-CONNECTION:CAPS"></a><h3>NM_DBUS_INVALID_VPN_CONNECTION</h3>
 <pre class="programlisting">#define NM_DBUS_INVALID_VPN_CONNECTION   "org.freedesktop.NetworkManager.VPNConnections.InvalidVPNConnection"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-ERROR-PREFIX:CAPS"></a><h3>NM_DBUS_VPN_ERROR_PREFIX</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_ERROR_PREFIX              "org.freedesktop.NetworkManager.VPN.Error"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-STARTING-IN-PROGRESS:CAPS"></a><h3>NM_DBUS_VPN_STARTING_IN_PROGRESS</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_STARTING_IN_PROGRESS      "StartingInProgress"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-ALREADY-STARTED:CAPS"></a><h3>NM_DBUS_VPN_ALREADY_STARTED</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_ALREADY_STARTED           "AlreadyStarted"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-STOPPING-IN-PROGRESS:CAPS"></a><h3>NM_DBUS_VPN_STOPPING_IN_PROGRESS</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_STOPPING_IN_PROGRESS      "StoppingInProgress"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-ALREADY-STOPPED:CAPS"></a><h3>NM_DBUS_VPN_ALREADY_STOPPED</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_ALREADY_STOPPED           "AlreadyStopped"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-WRONG-STATE:CAPS"></a><h3>NM_DBUS_VPN_WRONG_STATE</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_WRONG_STATE               "WrongState"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-BAD-ARGUMENTS:CAPS"></a><h3>NM_DBUS_VPN_BAD_ARGUMENTS</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_BAD_ARGUMENTS             "BadArguments"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-INTERACTIVE-NOT-SUPPORTED:CAPS"></a><h3>NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED "InteractiveNotSupported"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-LOGIN-BANNER:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_LOGIN_BANNER</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_LOGIN_BANNER   "LoginBanner"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-LOGIN-FAILED:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_LOGIN_FAILED</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_LOGIN_FAILED   "LoginFailed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-LAUNCH-FAILED:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED  "LaunchFailed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-CONNECT-FAILED:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_CONNECT_FAILED</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_CONNECT_FAILED "ConnectFailed"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-VPN-CONFIG-BAD:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD "VPNConfigBad"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-IP-CONFIG-BAD:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD  "IPConfigBad"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_STATE_CHANGE</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE   "StateChange"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS"></a><h3>NM_DBUS_VPN_SIGNAL_IP4_CONFIG</h3>
 <pre class="programlisting">#define NM_DBUS_VPN_SIGNAL_IP4_CONFIG     "IP4Config"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -813,269 +762,202 @@
 <a name="NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_TUNDEV</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_TUNDEV      "tundev"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-CONFIG-BANNER:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_BANNER</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_BANNER      "banner"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY "gateway"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-CONFIG-MTU:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_MTU</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_MTU         "mtu"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-CONFIG-HAS-IP4:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_HAS_IP4</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_HAS_IP4     "has-ip4"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-CONFIG-HAS-IP6:CAPS"></a><h3>NM_VPN_PLUGIN_CONFIG_HAS_IP6</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CONFIG_HAS_IP6     "has-ip6"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-CAN-PERSIST:CAPS"></a><h3>NM_VPN_PLUGIN_CAN_PERSIST</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_CAN_PERSIST        "can-persist"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-INT-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY "internal-gateway"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-ADDRESS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS     "address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-PTP:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_PTP</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_PTP         "ptp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-PREFIX:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_PREFIX</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_PREFIX      "prefix"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-DNS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_DNS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_DNS         "dns"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-NBNS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_NBNS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_NBNS        "nbns"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-MSS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_MSS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_MSS         "mss"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-DOMAIN:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN      "domain"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-DOMAINS:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS     "domains"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-ROUTES:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_ROUTES      "routes"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT "never-default"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY   NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-BANNER:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_BANNER</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_BANNER      NM_VPN_PLUGIN_CONFIG_BANNER
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-EXT-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-MTU:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_MTU</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_MTU         NM_VPN_PLUGIN_CONFIG_MTU
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP4-CONFIG-TUNDEV:CAPS"></a><h3>NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV      NM_VPN_PLUGIN_CONFIG_TUNDEV
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-INT-GATEWAY:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY "internal-gateway"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-ADDRESS:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS     "address"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-PTP:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_PTP</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_PTP         "ptp"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-PREFIX:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_PREFIX</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_PREFIX      "prefix"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-DNS:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_DNS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_DNS         "dns"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-MSS:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_MSS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_MSS         "mss"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-DOMAIN:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN      "domain"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-DOMAINS:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS     "domains"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-ROUTES:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_ROUTES</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_ROUTES      "routes"
 </pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-VPN-PLUGIN-IP6-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT</h3>
 <pre class="programlisting">#define NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT "never-default"
 </pre>
-<p>
-</p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index 58b5d8e4..ff749308 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
 <book xmlns="http://www.devhelp.net/book" title="libnm Reference Manual" link="index.html" author="" name="libnm" version="2" language="c">
   <chapters>
     <sub name="Overview" link="ref-overview.html"/>
@@ -394,6 +393,7 @@
     <keyword type="function" name="nm_setting_connection_get_master ()" link="NMSettingConnection.html#nm-setting-connection-get-master"/>
     <keyword type="function" name="nm_setting_connection_is_slave_type ()" link="NMSettingConnection.html#nm-setting-connection-is-slave-type"/>
     <keyword type="function" name="nm_setting_connection_get_slave_type ()" link="NMSettingConnection.html#nm-setting-connection-get-slave-type"/>
+    <keyword type="function" name="nm_setting_connection_get_autoconnect_slaves ()" link="NMSettingConnection.html#nm-setting-connection-get-autoconnect-slaves" since="1.0.4"/>
     <keyword type="function" name="nm_setting_connection_get_num_secondaries ()" link="NMSettingConnection.html#nm-setting-connection-get-num-secondaries"/>
     <keyword type="function" name="nm_setting_connection_get_secondary ()" link="NMSettingConnection.html#nm-setting-connection-get-secondary"/>
     <keyword type="function" name="nm_setting_connection_add_secondary ()" link="NMSettingConnection.html#nm-setting-connection-add-secondary"/>
@@ -416,11 +416,14 @@
     <keyword type="macro" name="NM_SETTING_CONNECTION_ZONE" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_MASTER" link="NMSettingConnection.html#NM-SETTING-CONNECTION-MASTER:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_SLAVE_TYPE" link="NMSettingConnection.html#NM-SETTING-CONNECTION-SLAVE-TYPE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES" link="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_SECONDARIES" link="NMSettingConnection.html#NM-SETTING-CONNECTION-SECONDARIES:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT" link="NMSettingConnection.html#NM-SETTING-CONNECTION-GATEWAY-PING-TIMEOUT:CAPS"/>
+    <keyword type="enum" name="enum NMSettingConnectionAutoconnectSlaves" link="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves"/>
     <keyword type="struct" name="struct NMSettingConnection" link="NMSettingConnection.html#NMSettingConnection-struct"/>
     <keyword type="property" name="The “autoconnect” property" link="NMSettingConnection.html#NMSettingConnection--autoconnect"/>
     <keyword type="property" name="The “autoconnect-priority” property" link="NMSettingConnection.html#NMSettingConnection--autoconnect-priority"/>
+    <keyword type="property" name="The “autoconnect-slaves” property" link="NMSettingConnection.html#NMSettingConnection--autoconnect-slaves"/>
     <keyword type="property" name="The “gateway-ping-timeout” property" link="NMSettingConnection.html#NMSettingConnection--gateway-ping-timeout"/>
     <keyword type="property" name="The “id” property" link="NMSettingConnection.html#NMSettingConnection--id"/>
     <keyword type="property" name="The “interface-name” property" link="NMSettingConnection.html#NMSettingConnection--interface-name"/>
@@ -501,6 +504,7 @@
     <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_password ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password"/>
     <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_password_flags ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-password-flags"/>
     <keyword type="function" name="nm_setting_802_1x_get_phase2_private_key_format ()" link="NMSetting8021x.html#nm-setting-802-1x-get-phase2-private-key-format"/>
+    <keyword type="macro" name="NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH" link="NMSetting8021x.html#NM-SETTING-802-1X-CERT-SCHEME-PREFIX-PATH:CAPS"/>
     <keyword type="enum" name="enum NMSetting8021xCKFormat" link="NMSetting8021x.html#NMSetting8021xCKFormat"/>
     <keyword type="enum" name="enum NMSetting8021xCKScheme" link="NMSetting8021x.html#NMSetting8021xCKScheme"/>
     <keyword type="macro" name="NM_SETTING_802_1X_SETTING_NAME" link="NMSetting8021x.html#NM-SETTING-802-1X-SETTING-NAME:CAPS"/>
@@ -1678,6 +1682,8 @@
     <keyword type="macro" name="NM_VERSION_0_9_8" link="libnm-nm-version.html#NM-VERSION-0-9-8:CAPS"/>
     <keyword type="macro" name="NM_VERSION_0_9_10" link="libnm-nm-version.html#NM-VERSION-0-9-10:CAPS"/>
     <keyword type="macro" name="NM_VERSION_1_0" link="libnm-nm-version.html#NM-VERSION-1-0:CAPS"/>
+    <keyword type="macro" name="NM_VERSION_1_0_2" link="libnm-nm-version.html#NM-VERSION-1-0-2:CAPS"/>
+    <keyword type="macro" name="NM_VERSION_1_0_4" link="libnm-nm-version.html#NM-VERSION-1-0-4: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_FOR()" link="libnm-nm-version.html#NM-DEPRECATED-IN-0-9-10-FOR:CAPS"/>
@@ -1688,6 +1694,7 @@
     <keyword type="macro" name="NM_DEPRECATED_IN_1_0" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-0:CAPS"/>
     <keyword type="macro" name="NM_AVAILABLE_IN_0_9_10" link="libnm-nm-version.html#NM-AVAILABLE-IN-0-9-10:CAPS"/>
     <keyword type="macro" name="NM_AVAILABLE_IN_1_0" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-0:CAPS"/>
+    <keyword type="macro" name="NM_AVAILABLE_IN_1_0_4" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-0-4:CAPS"/>
     <keyword type="macro" name="NM_DBUS_PATH_VPN" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-PATH-VPN:CAPS"/>
     <keyword type="macro" name="NM_DBUS_INTERFACE_VPN" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-INTERFACE-VPN:CAPS"/>
     <keyword type="macro" name="NM_DBUS_PATH_VPN_CONNECTION" link="libnm-nm-vpn-dbus-interface.html#NM-DBUS-PATH-VPN-CONNECTION:CAPS"/>
@@ -1769,5 +1776,346 @@
     <keyword type="property" name="The “name” property" link="NMVpnEditor.html#NMVpnEditorPlugin--name"/>
     <keyword type="property" name="The “service” property" link="NMVpnEditor.html#NMVpnEditorPlugin--service"/>
     <keyword type="signal" name="The “changed” signal" link="NMVpnEditor.html#NMVpnEditor-changed"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_NONE" link="NMClient.html#NM-CLIENT-PERMISSION-NONE:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-NETWORK:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIFI:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WWAN:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIMAX:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_SLEEP_WAKE" link="NMClient.html#NM-CLIENT-PERMISSION-SLEEP-WAKE:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_NETWORK_CONTROL" link="NMClient.html#NM-CLIENT-PERMISSION-NETWORK-CONTROL:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED" link="NMClient.html#NM-CLIENT-PERMISSION-WIFI-SHARE-PROTECTED:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN" link="NMClient.html#NM-CLIENT-PERMISSION-WIFI-SHARE-OPEN:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM" link="NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-SYSTEM:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN" link="NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-OWN:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME" link="NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-HOSTNAME:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_LAST" link="NMClient.html#NM-CLIENT-PERMISSION-LAST:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_UNKNOWN" link="NMClient.html#NM-CLIENT-PERMISSION-RESULT-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_YES" link="NMClient.html#NM-CLIENT-PERMISSION-RESULT-YES:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_AUTH" link="NMClient.html#NM-CLIENT-PERMISSION-RESULT-AUTH:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_NO" link="NMClient.html#NM-CLIENT-PERMISSION-RESULT-NO:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_ERROR_FAILED" link="NMClient.html#NM-CLIENT-ERROR-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_ERROR_MANAGER_NOT_RUNNING" link="NMClient.html#NM-CLIENT-ERROR-MANAGER-NOT-RUNNING:CAPS"/>
+    <keyword type="constant" name="NM_CLIENT_ERROR_OBJECT_CREATION_FAILED" link="NMClient.html#NM-CLIENT-ERROR-OBJECT-CREATION-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_AGENT_MANAGER_ERROR_FAILED" link="libnm-nm-errors.html#NM-AGENT-MANAGER-ERROR-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_AGENT_MANAGER_ERROR_PERMISSION_DENIED" link="libnm-nm-errors.html#NM-AGENT-MANAGER-ERROR-PERMISSION-DENIED:CAPS"/>
+    <keyword type="constant" name="NM_AGENT_MANAGER_ERROR_INVALID_IDENTIFIER" link="libnm-nm-errors.html#NM-AGENT-MANAGER-ERROR-INVALID-IDENTIFIER:CAPS"/>
+    <keyword type="constant" name="NM_AGENT_MANAGER_ERROR_NOT_REGISTERED" link="libnm-nm-errors.html#NM-AGENT-MANAGER-ERROR-NOT-REGISTERED:CAPS"/>
+    <keyword type="constant" name="NM_AGENT_MANAGER_ERROR_NO_SECRETS" link="libnm-nm-errors.html#NM-AGENT-MANAGER-ERROR-NO-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_AGENT_MANAGER_ERROR_USER_CANCELED" link="libnm-nm-errors.html#NM-AGENT-MANAGER-ERROR-USER-CANCELED:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_ERROR_FAILED" link="libnm-nm-errors.html#NM-CONNECTION-ERROR-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_ERROR_SETTING_NOT_FOUND" link="libnm-nm-errors.html#NM-CONNECTION-ERROR-SETTING-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_ERROR_PROPERTY_NOT_FOUND" link="libnm-nm-errors.html#NM-CONNECTION-ERROR-PROPERTY-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_ERROR_PROPERTY_NOT_SECRET" link="libnm-nm-errors.html#NM-CONNECTION-ERROR-PROPERTY-NOT-SECRET:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_ERROR_MISSING_SETTING" link="libnm-nm-errors.html#NM-CONNECTION-ERROR-MISSING-SETTING:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_ERROR_INVALID_SETTING" link="libnm-nm-errors.html#NM-CONNECTION-ERROR-INVALID-SETTING:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_ERROR_MISSING_PROPERTY" link="libnm-nm-errors.html#NM-CONNECTION-ERROR-MISSING-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_ERROR_INVALID_PROPERTY" link="libnm-nm-errors.html#NM-CONNECTION-ERROR-INVALID-PROPERTY:CAPS"/>
+    <keyword type="constant" name="NM_CRYPTO_ERROR_FAILED" link="libnm-nm-errors.html#NM-CRYPTO-ERROR-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_CRYPTO_ERROR_INVALID_DATA" link="libnm-nm-errors.html#NM-CRYPTO-ERROR-INVALID-DATA:CAPS"/>
+    <keyword type="constant" name="NM_CRYPTO_ERROR_INVALID_PASSWORD" link="libnm-nm-errors.html#NM-CRYPTO-ERROR-INVALID-PASSWORD:CAPS"/>
+    <keyword type="constant" name="NM_CRYPTO_ERROR_UNKNOWN_CIPHER" link="libnm-nm-errors.html#NM-CRYPTO-ERROR-UNKNOWN-CIPHER:CAPS"/>
+    <keyword type="constant" name="NM_CRYPTO_ERROR_DECRYPTION_FAILED" link="libnm-nm-errors.html#NM-CRYPTO-ERROR-DECRYPTION-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_CRYPTO_ERROR_ENCRYPTION_FAILED" link="libnm-nm-errors.html#NM-CRYPTO-ERROR-ENCRYPTION-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ERROR_FAILED" link="libnm-nm-errors.html#NM-DEVICE-ERROR-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ERROR_CREATION_FAILED" link="libnm-nm-errors.html#NM-DEVICE-ERROR-CREATION-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ERROR_INVALID_CONNECTION" link="libnm-nm-errors.html#NM-DEVICE-ERROR-INVALID-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION" link="libnm-nm-errors.html#NM-DEVICE-ERROR-INCOMPATIBLE-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ERROR_NOT_ACTIVE" link="libnm-nm-errors.html#NM-DEVICE-ERROR-NOT-ACTIVE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ERROR_NOT_SOFTWARE" link="libnm-nm-errors.html#NM-DEVICE-ERROR-NOT-SOFTWARE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ERROR_NOT_ALLOWED" link="libnm-nm-errors.html#NM-DEVICE-ERROR-NOT-ALLOWED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_ERROR_SPECIFIC_OBJECT_NOT_FOUND" link="libnm-nm-errors.html#NM-DEVICE-ERROR-SPECIFIC-OBJECT-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_MANAGER_ERROR_FAILED" link="libnm-nm-errors.html#NM-MANAGER-ERROR-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_MANAGER_ERROR_PERMISSION_DENIED" link="libnm-nm-errors.html#NM-MANAGER-ERROR-PERMISSION-DENIED:CAPS"/>
+    <keyword type="constant" name="NM_MANAGER_ERROR_UNKNOWN_CONNECTION" link="libnm-nm-errors.html#NM-MANAGER-ERROR-UNKNOWN-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_MANAGER_ERROR_UNKNOWN_DEVICE" link="libnm-nm-errors.html#NM-MANAGER-ERROR-UNKNOWN-DEVICE:CAPS"/>
+    <keyword type="constant" name="NM_MANAGER_ERROR_CONNECTION_NOT_AVAILABLE" link="libnm-nm-errors.html#NM-MANAGER-ERROR-CONNECTION-NOT-AVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE" link="libnm-nm-errors.html#NM-MANAGER-ERROR-CONNECTION-NOT-ACTIVE:CAPS"/>
+    <keyword type="constant" name="NM_MANAGER_ERROR_CONNECTION_ALREADY_ACTIVE" link="libnm-nm-errors.html#NM-MANAGER-ERROR-CONNECTION-ALREADY-ACTIVE:CAPS"/>
+    <keyword type="constant" name="NM_MANAGER_ERROR_DEPENDENCY_FAILED" link="libnm-nm-errors.html#NM-MANAGER-ERROR-DEPENDENCY-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE" link="libnm-nm-errors.html#NM-MANAGER-ERROR-ALREADY-ASLEEP-OR-AWAKE:CAPS"/>
+    <keyword type="constant" name="NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED" link="libnm-nm-errors.html#NM-MANAGER-ERROR-ALREADY-ENABLED-OR-DISABLED:CAPS"/>
+    <keyword type="constant" name="NM_MANAGER_ERROR_UNKNOWN_LOG_LEVEL" link="libnm-nm-errors.html#NM-MANAGER-ERROR-UNKNOWN-LOG-LEVEL:CAPS"/>
+    <keyword type="constant" name="NM_MANAGER_ERROR_UNKNOWN_LOG_DOMAIN" link="libnm-nm-errors.html#NM-MANAGER-ERROR-UNKNOWN-LOG-DOMAIN:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_ERROR_FAILED" link="libnm-nm-errors.html#NM-SECRET-AGENT-ERROR-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_ERROR_PERMISSION_DENIED" link="libnm-nm-errors.html#NM-SECRET-AGENT-ERROR-PERMISSION-DENIED:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_ERROR_INVALID_CONNECTION" link="libnm-nm-errors.html#NM-SECRET-AGENT-ERROR-INVALID-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_ERROR_USER_CANCELED" link="libnm-nm-errors.html#NM-SECRET-AGENT-ERROR-USER-CANCELED:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_ERROR_AGENT_CANCELED" link="libnm-nm-errors.html#NM-SECRET-AGENT-ERROR-AGENT-CANCELED:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_ERROR_NO_SECRETS" link="libnm-nm-errors.html#NM-SECRET-AGENT-ERROR-NO-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_SETTINGS_ERROR_FAILED" link="libnm-nm-errors.html#NM-SETTINGS-ERROR-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_SETTINGS_ERROR_PERMISSION_DENIED" link="libnm-nm-errors.html#NM-SETTINGS-ERROR-PERMISSION-DENIED:CAPS"/>
+    <keyword type="constant" name="NM_SETTINGS_ERROR_NOT_SUPPORTED" link="libnm-nm-errors.html#NM-SETTINGS-ERROR-NOT-SUPPORTED:CAPS"/>
+    <keyword type="constant" name="NM_SETTINGS_ERROR_INVALID_CONNECTION" link="libnm-nm-errors.html#NM-SETTINGS-ERROR-INVALID-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_SETTINGS_ERROR_READ_ONLY_CONNECTION" link="libnm-nm-errors.html#NM-SETTINGS-ERROR-READ-ONLY-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_SETTINGS_ERROR_UUID_EXISTS" link="libnm-nm-errors.html#NM-SETTINGS-ERROR-UUID-EXISTS:CAPS"/>
+    <keyword type="constant" name="NM_SETTINGS_ERROR_INVALID_HOSTNAME" link="libnm-nm-errors.html#NM-SETTINGS-ERROR-INVALID-HOSTNAME:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_FAILED" link="libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS" link="libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-STARTING-IN-PROGRESS:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_ALREADY_STARTED" link="libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-ALREADY-STARTED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS" link="libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-STOPPING-IN-PROGRESS:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED" link="libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-ALREADY-STOPPED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_WRONG_STATE" link="libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-WRONG-STATE:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS" link="libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-BAD-ARGUMENTS:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED" link="libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-LAUNCH-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_INVALID_CONNECTION" link="libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-INVALID-CONNECTION:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED" link="libnm-nm-errors.html#NM-VPN-PLUGIN-ERROR-INTERACTIVE-NOT-SUPPORTED:CAPS"/>
+    <keyword type="constant" name="NM_STATE_UNKNOWN" link="libnm-nm-dbus-interface.html#NM-STATE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_STATE_ASLEEP" link="libnm-nm-dbus-interface.html#NM-STATE-ASLEEP:CAPS"/>
+    <keyword type="constant" name="NM_STATE_DISCONNECTED" link="libnm-nm-dbus-interface.html#NM-STATE-DISCONNECTED:CAPS"/>
+    <keyword type="constant" name="NM_STATE_DISCONNECTING" link="libnm-nm-dbus-interface.html#NM-STATE-DISCONNECTING:CAPS"/>
+    <keyword type="constant" name="NM_STATE_CONNECTING" link="libnm-nm-dbus-interface.html#NM-STATE-CONNECTING:CAPS"/>
+    <keyword type="constant" name="NM_STATE_CONNECTED_LOCAL" link="libnm-nm-dbus-interface.html#NM-STATE-CONNECTED-LOCAL:CAPS"/>
+    <keyword type="constant" name="NM_STATE_CONNECTED_SITE" link="libnm-nm-dbus-interface.html#NM-STATE-CONNECTED-SITE:CAPS"/>
+    <keyword type="constant" name="NM_STATE_CONNECTED_GLOBAL" link="libnm-nm-dbus-interface.html#NM-STATE-CONNECTED-GLOBAL:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_UNKNOWN" link="libnm-nm-dbus-interface.html#NM-CONNECTIVITY-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_NONE" link="libnm-nm-dbus-interface.html#NM-CONNECTIVITY-NONE:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_PORTAL" link="libnm-nm-dbus-interface.html#NM-CONNECTIVITY-PORTAL:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_LIMITED" link="libnm-nm-dbus-interface.html#NM-CONNECTIVITY-LIMITED:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_FULL" link="libnm-nm-dbus-interface.html#NM-CONNECTIVITY-FULL:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_UNKNOWN" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_ETHERNET" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-ETHERNET:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_WIFI" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-WIFI:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_UNUSED1" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-UNUSED1:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_UNUSED2" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-UNUSED2:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_BT" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-BT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_OLPC_MESH" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-OLPC-MESH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_WIMAX" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-WIMAX:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_MODEM" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-MODEM:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_INFINIBAND" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-INFINIBAND:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_BOND" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-BOND:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_VLAN" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-VLAN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_ADSL" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-ADSL:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_BRIDGE" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-BRIDGE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_GENERIC" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-GENERIC:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_TEAM" link="libnm-nm-dbus-interface.html#NM-DEVICE-TYPE-TEAM:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_CAP_NONE" link="libnm-nm-dbus-interface.html#NM-DEVICE-CAP-NONE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_CAP_NM_SUPPORTED" link="libnm-nm-dbus-interface.html#NM-DEVICE-CAP-NM-SUPPORTED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_CAP_CARRIER_DETECT" link="libnm-nm-dbus-interface.html#NM-DEVICE-CAP-CARRIER-DETECT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_CAP_IS_SOFTWARE" link="libnm-nm-dbus-interface.html#NM-DEVICE-CAP-IS-SOFTWARE:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_NONE" link="libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-NONE:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_CIPHER_WEP40" link="libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-CIPHER-WEP40:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_CIPHER_WEP104" link="libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-CIPHER-WEP104:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_CIPHER_TKIP" link="libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-CIPHER-TKIP:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_CIPHER_CCMP" link="libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-CIPHER-CCMP:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_WPA" link="libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-WPA:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_RSN" link="libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-RSN:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_AP" link="libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-AP:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_ADHOC" link="libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-ADHOC:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_FREQ_VALID" link="libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-FREQ-VALID:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_FREQ_2GHZ" link="libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-FREQ-2GHZ:CAPS"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_FREQ_5GHZ" link="libnm-nm-dbus-interface.html#NM-WIFI-DEVICE-CAP-FREQ-5GHZ:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_FLAGS_NONE" link="libnm-nm-dbus-interface.html#NM-802-11-AP-FLAGS-NONE:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_FLAGS_PRIVACY" link="libnm-nm-dbus-interface.html#NM-802-11-AP-FLAGS-PRIVACY:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_NONE" link="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-NONE:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_PAIR_WEP40" link="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-PAIR-WEP40:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_PAIR_WEP104" link="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-PAIR-WEP104:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_PAIR_TKIP" link="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-PAIR-TKIP:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_PAIR_CCMP" link="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-PAIR-CCMP:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_GROUP_WEP40" link="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-GROUP-WEP40:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_GROUP_WEP104" link="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-GROUP-WEP104:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_GROUP_TKIP" link="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-GROUP-TKIP:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_GROUP_CCMP" link="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-GROUP-CCMP:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_KEY_MGMT_PSK" link="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-KEY-MGMT-PSK:CAPS"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_KEY_MGMT_802_1X" link="libnm-nm-dbus-interface.html#NM-802-11-AP-SEC-KEY-MGMT-802-1X:CAPS"/>
+    <keyword type="constant" name="NM_802_11_MODE_UNKNOWN" link="libnm-nm-dbus-interface.html#NM-802-11-MODE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_802_11_MODE_ADHOC" link="libnm-nm-dbus-interface.html#NM-802-11-MODE-ADHOC:CAPS"/>
+    <keyword type="constant" name="NM_802_11_MODE_INFRA" link="libnm-nm-dbus-interface.html#NM-802-11-MODE-INFRA:CAPS"/>
+    <keyword type="constant" name="NM_802_11_MODE_AP" link="libnm-nm-dbus-interface.html#NM-802-11-MODE-AP:CAPS"/>
+    <keyword type="constant" name="NM_BT_CAPABILITY_NONE" link="libnm-nm-dbus-interface.html#NM-BT-CAPABILITY-NONE:CAPS"/>
+    <keyword type="constant" name="NM_BT_CAPABILITY_DUN" link="libnm-nm-dbus-interface.html#NM-BT-CAPABILITY-DUN:CAPS"/>
+    <keyword type="constant" name="NM_BT_CAPABILITY_NAP" link="libnm-nm-dbus-interface.html#NM-BT-CAPABILITY-NAP:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_NONE" link="libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-NONE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_POTS" link="libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-POTS:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO" link="libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-CDMA-EVDO:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS" link="libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-GSM-UMTS:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_LTE" link="libnm-nm-dbus-interface.html#NM-DEVICE-MODEM-CAPABILITY-LTE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_UNKNOWN" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_UNMANAGED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-UNMANAGED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_UNAVAILABLE" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-UNAVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_DISCONNECTED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-DISCONNECTED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_PREPARE" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-PREPARE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_CONFIG" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-CONFIG:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_NEED_AUTH" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-NEED-AUTH:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_IP_CONFIG" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-IP-CONFIG:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_IP_CHECK" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-IP-CHECK:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_SECONDARIES" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-SECONDARIES:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_ACTIVATED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-ACTIVATED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_DEACTIVATING" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-DEACTIVATING:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NONE" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-NONE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_UNKNOWN" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NOW_MANAGED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-NOW-MANAGED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NOW_UNMANAGED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-NOW-UNMANAGED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_CONFIG_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-CONFIG-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-IP-CONFIG-UNAVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-IP-CONFIG-EXPIRED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NO_SECRETS" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-NO-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SUPPLICANT-DISCONNECT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SUPPLICANT-CONFIG-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SUPPLICANT-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SUPPLICANT-TIMEOUT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PPP_START_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-PPP-START-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PPP_DISCONNECT" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-PPP-DISCONNECT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PPP_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-PPP-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DHCP_START_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-DHCP-START-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DHCP_ERROR" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-DHCP-ERROR:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DHCP_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-DHCP-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SHARED_START_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SHARED-START-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SHARED_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SHARED-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-AUTOIP-START-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_AUTOIP_ERROR" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-AUTOIP-ERROR:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_AUTOIP_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-AUTOIP-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_BUSY" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-BUSY:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-NO-DIAL-TONE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-NO-CARRIER:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-DIAL-TIMEOUT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-DIAL-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-INIT-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_APN_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-APN-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-NOT-SEARCHING:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-DENIED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-TIMEOUT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-REGISTRATION-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-PIN-CHECK-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_FIRMWARE_MISSING" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-FIRMWARE-MISSING:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_REMOVED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-REMOVED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SLEEPING" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SLEEPING:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_CONNECTION_REMOVED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-CONNECTION-REMOVED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_USER_REQUESTED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-USER-REQUESTED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_CARRIER" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-CARRIER:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-CONNECTION-ASSUMED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SUPPLICANT-AVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_BT_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-BT-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-SIM-NOT-INSERTED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-SIM-PIN-REQUIRED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-SIM-PUK-REQUIRED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_SIM_WRONG" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-GSM-SIM-WRONG:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_INFINIBAND_MODE" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-INFINIBAND-MODE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-DEPENDENCY-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_BR2684_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-BR2684-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-MANAGER-UNAVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SSID_NOT_FOUND" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SSID-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SECONDARY-CONNECTION-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-DCB-FCOE-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-TEAMD-CONTROL-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_FAILED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_AVAILABLE" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-MODEM-AVAILABLE:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-SIM-PIN-INCORRECT:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NEW_ACTIVATION" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-NEW-ACTIVATION:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PARENT_CHANGED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-PARENT-CHANGED:CAPS"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED" link="libnm-nm-dbus-interface.html#NM-DEVICE-STATE-REASON-PARENT-MANAGED-CHANGED:CAPS"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_UNKNOWN" link="libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_ACTIVATING" link="libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATING:CAPS"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_ACTIVATED" link="libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_DEACTIVATING" link="libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-DEACTIVATING:CAPS"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_DEACTIVATED" link="libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-DEACTIVATED:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE" link="libnm-nm-dbus-interface.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION" link="libnm-nm-dbus-interface.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-ALLOW-INTERACTION:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW" link="libnm-nm-dbus-interface.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-REQUEST-NEW:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED" link="libnm-nm-dbus-interface.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-USER-REQUESTED:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM" link="libnm-nm-dbus-interface.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-ONLY-SYSTEM:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_NO_ERRORS" link="libnm-nm-dbus-interface.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-NO-ERRORS:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_CAPABILITY_NONE" link="libnm-nm-dbus-interface.html#NM-SECRET-AGENT-CAPABILITY-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_CAPABILITY_VPN_HINTS" link="libnm-nm-dbus-interface.html#NM-SECRET-AGENT-CAPABILITY-VPN-HINTS:CAPS"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_CAPABILITY_LAST" link="libnm-nm-dbus-interface.html#NM-SECRET-AGENT-CAPABILITY-LAST:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_SERIALIZE_ALL" link="libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-ALL:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_SERIALIZE_NO_SECRETS" link="libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-NO-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_SERIALIZE_ONLY_SECRETS" link="libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-ONLY-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NONE" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_AGENT_OWNED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NOT_SAVED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NOT_REQUIRED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-REQUIRED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_EXACT" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-EXACT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_FUZZY" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-FUZZY:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_IGNORE_ID" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-ID:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-AGENT-OWNED-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-NOT-SAVED-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-DIFF-RESULT-WITH-DEFAULT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-DIFF-RESULT-NO-DEFAULT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_COMPARE_FLAG_IGNORE_TIMESTAMP" link="NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-TIMESTAMP:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DIFF_RESULT_UNKNOWN" link="NMSetting.html#NM-SETTING-DIFF-RESULT-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DIFF_RESULT_IN_A" link="NMSetting.html#NM-SETTING-DIFF-RESULT-IN-A:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DIFF_RESULT_IN_B" link="NMSetting.html#NM-SETTING-DIFF-RESULT-IN-B:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DIFF_RESULT_IN_A_DEFAULT" link="NMSetting.html#NM-SETTING-DIFF-RESULT-IN-A-DEFAULT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DIFF_RESULT_IN_B_DEFAULT" link="NMSetting.html#NM-SETTING-DIFF-RESULT-IN-B-DEFAULT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT" link="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-DEFAULT:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO" link="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-NO:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES" link="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-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"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_PKCS12" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-PKCS12:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_SCHEME_UNKNOWN" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_SCHEME_BLOB" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-BLOB:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_802_1X_CK_SCHEME_PATH" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-SCHEME-PATH:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DCB_FLAG_NONE" link="NMSettingDcb.html#NM-SETTING-DCB-FLAG-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DCB_FLAG_ENABLE" link="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ENABLE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DCB_FLAG_ADVERTISE" link="NMSettingDcb.html#NM-SETTING-DCB-FLAG-ADVERTISE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_DCB_FLAG_WILLING" link="NMSettingDcb.html#NM-SETTING-DCB-FLAG-WILLING:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-DISABLED:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-PUBLIC-ADDR:CAPS"/>
+    <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_SERIAL_PARITY_NONE" link="NMSettingSerial.html#NM-SETTING-SERIAL-PARITY-NONE:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SERIAL_PARITY_EVEN" link="NMSettingSerial.html#NM-SETTING-SERIAL-PARITY-EVEN:CAPS"/>
+    <keyword type="constant" name="NM_SETTING_SERIAL_PARITY_ODD" link="NMSettingSerial.html#NM-SETTING-SERIAL-PARITY-ODD:CAPS"/>
+    <keyword type="constant" name="NM_VLAN_INGRESS_MAP" link="NMSettingVlan.html#NM-VLAN-INGRESS-MAP:CAPS"/>
+    <keyword type="constant" name="NM_VLAN_EGRESS_MAP" link="NMSettingVlan.html#NM-VLAN-EGRESS-MAP:CAPS"/>
+    <keyword type="constant" name="NM_VLAN_FLAG_REORDER_HEADERS" link="NMSettingVlan.html#NM-VLAN-FLAG-REORDER-HEADERS:CAPS"/>
+    <keyword type="constant" name="NM_VLAN_FLAG_GVRP" link="NMSettingVlan.html#NM-VLAN-FLAG-GVRP:CAPS"/>
+    <keyword type="constant" name="NM_VLAN_FLAG_LOOSE_BINDING" link="NMSettingVlan.html#NM-VLAN-FLAG-LOOSE-BINDING:CAPS"/>
+    <keyword type="constant" name="NM_WEP_KEY_TYPE_UNKNOWN" link="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_WEP_KEY_TYPE_KEY" link="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-KEY:CAPS"/>
+    <keyword type="constant" name="NM_WEP_KEY_TYPE_PASSPHRASE" link="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-PASSPHRASE:CAPS"/>
+    <keyword type="constant" name="NM_WEP_KEY_TYPE_LAST" link="NMSettingWirelessSecurity.html#NM-WEP-KEY-TYPE-LAST:CAPS"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_HOME" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_PARTNER" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_INVALID" link="libnm-nm-utils.html#NMU-SEC-INVALID:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_NONE" link="libnm-nm-utils.html#NMU-SEC-NONE:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_STATIC_WEP" link="libnm-nm-utils.html#NMU-SEC-STATIC-WEP:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_LEAP" link="libnm-nm-utils.html#NMU-SEC-LEAP:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_DYNAMIC_WEP" link="libnm-nm-utils.html#NMU-SEC-DYNAMIC-WEP:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_WPA_PSK" link="libnm-nm-utils.html#NMU-SEC-WPA-PSK:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_WPA_ENTERPRISE" link="libnm-nm-utils.html#NMU-SEC-WPA-ENTERPRISE:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_WPA2_PSK" link="libnm-nm-utils.html#NMU-SEC-WPA2-PSK:CAPS"/>
+    <keyword type="constant" name="NMU_SEC_WPA2_ENTERPRISE" link="libnm-nm-utils.html#NMU-SEC-WPA2-ENTERPRISE:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_UNKNOWN" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_INIT" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-INIT:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_SHUTDOWN" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-SHUTDOWN:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STARTING" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-STARTING:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STARTED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-STARTED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STOPPING" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-STOPPING:CAPS"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STOPPED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-SERVICE-STATE-STOPPED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_UNKNOWN" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_PREPARE" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-PREPARE:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_NEED_AUTH" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-NEED-AUTH:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_CONNECT" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-CONNECT:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_IP_CONFIG_GET" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-IP-CONFIG-GET:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_ACTIVATED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-ACTIVATED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_FAILED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_DISCONNECTED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-DISCONNECTED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_UNKNOWN" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_NONE" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-NONE:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-USER-DISCONNECTED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-DEVICE-DISCONNECTED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-STOPPED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-IP-CONFIG-INVALID:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-CONNECT-TIMEOUT:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-TIMEOUT:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-SERVICE-START-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-NO-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-LOGIN-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-CONNECTION-STATE-REASON-CONNECTION-REMOVED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-FAILURE-LOGIN-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-FAILURE-CONNECT-FAILED:CAPS"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG" link="libnm-nm-vpn-dbus-interface.html#NM-VPN-PLUGIN-FAILURE-BAD-IP-CONFIG:CAPS"/>
+    <keyword type="constant" name="NM_VPN_EDITOR_PLUGIN_CAPABILITY_NONE" link="NMVpnEditor.html#NM-VPN-EDITOR-PLUGIN-CAPABILITY-NONE:CAPS"/>
+    <keyword type="constant" name="NM_VPN_EDITOR_PLUGIN_CAPABILITY_IMPORT" link="NMVpnEditor.html#NM-VPN-EDITOR-PLUGIN-CAPABILITY-IMPORT:CAPS"/>
+    <keyword type="constant" name="NM_VPN_EDITOR_PLUGIN_CAPABILITY_EXPORT" link="NMVpnEditor.html#NM-VPN-EDITOR-PLUGIN-CAPABILITY-EXPORT:CAPS"/>
+    <keyword type="constant" name="NM_VPN_EDITOR_PLUGIN_CAPABILITY_IPV6" link="NMVpnEditor.html#NM-VPN-EDITOR-PLUGIN-CAPABILITY-IPV6:CAPS"/>
   </functions>
 </book>
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index 514bd2b0..424f0762 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: Object Hierarchy</title>
+<title>Object Hierarchy: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="NMVpnEditor.html" title="NMVpnEditor">
 <link rel="next" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -115,6 +115,7 @@
     <span class="lineart">├──</span> <a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat">NMSetting8021xCKFormat</a>
     <span class="lineart">├──</span> <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme">NMSetting8021xCKScheme</a>
     <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="NMSetting.html#NMSettingDiffResult" title="enum NMSettingDiffResult">NMSettingDiffResult</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigPrivacy" title="enum NMSettingIP6ConfigPrivacy">NMSettingIP6ConfigPrivacy</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingSerial.html#NMSettingSerialParity" title="enum NMSettingSerialParity">NMSettingSerialParity</a>
@@ -133,7 +134,6 @@
 </pre>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/ref-overview.html b/docs/libnm/html/ref-overview.html
index 17883712..8d5ab916 100644
--- a/docs/libnm/html/ref-overview.html
+++ b/docs/libnm/html/ref-overview.html
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>libnm Reference Manual: Overview</title>
+<title>Overview: libnm Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="index.html" title="libnm Reference Manual">
 <link rel="next" href="ch02.html" title="Client Object API Reference">
-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -42,7 +42,6 @@
     </p>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.21</div>
+<hr>Generated by GTK-Doc V1.24</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/style.css b/docs/libnm/html/style.css
index c141ddd2..36754209 100644
--- a/docs/libnm/html/style.css
+++ b/docs/libnm/html/style.css
@@ -60,7 +60,7 @@ a:hover
 div.informaltable table
 {
   border-collapse: separate;
-  border-spacing: 1em 0.5em;
+  border-spacing: 1em 0.3em;
   border: none;
 }
 
@@ -148,6 +148,8 @@ div.table table th
 h4
 {
   color: #555753;
+  margin-top: 1em;
+  margin-bottom: 1em;
 }
 
 hr
@@ -166,17 +168,16 @@ dl.toc dt
   padding-bottom: 0.25em;
 }
 
-dl.toc > dd > dl > dt
+dl.toc > dt
 {
   padding-top: 0.25em;
   padding-bottom: 0.25em;
+  font-weight: bold;
 }
 
-dl.toc > dt
+dl.toc > dl
 {
-  padding-top: 1em;
   padding-bottom: 0.5em;
-  font-weight: bold;
 }
 
 .parameter
@@ -346,7 +347,9 @@ acronym,abbr
 }
 
 @media screen {
-  sup a.footnote
+  /* these have a <sup> as a first child, but since there are no parent selectors
+   * we can't use that. */
+  a.footnote
   {
     position: relative;
     top: 0em ! important;
diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt
index 947fea62..ed0cefa8 100644
--- a/docs/libnm/libnm-sections.txt
+++ b/docs/libnm/libnm-sections.txt
@@ -276,6 +276,7 @@ NM_TYPE_SETTINGS_ERROR
 NM_TYPE_SETTING_802_1X_CK_FORMAT
 NM_TYPE_SETTING_802_1X_CK_SCHEME
 NM_TYPE_SETTING_COMPARE_FLAGS
+NM_TYPE_SETTING_CONNECTION_AUTOCONNECT_SLAVES
 NM_TYPE_SETTING_DCB_FLAGS
 NM_TYPE_SETTING_DIFF_RESULT
 NM_TYPE_SETTING_IP6_CONFIG_PRIVACY
@@ -315,6 +316,7 @@ nm_secret_agent_get_secrets_flags_get_type
 nm_setting_802_1x_ck_format_get_type
 nm_setting_802_1x_ck_scheme_get_type
 nm_setting_compare_flags_get_type
+nm_setting_connection_autoconnect_slaves_get_type
 nm_setting_dcb_flags_get_type
 nm_setting_diff_result_get_type
 nm_setting_ip6_config_privacy_get_type
@@ -852,6 +854,35 @@ nm_ip_config_get_type
 </SECTION>
 
 <SECTION>
+<FILE>nm-keyfile-internal</FILE>
+NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB
+NM_KEYFILE_CERT_SCHEME_PREFIX_PATH
+nm_keyfile_detect_unqualified_path_scheme
+NMKeyfileReadType
+NMKeyfileReadHandler
+NMKeyfileWarnSeverity
+NMKeyfileReadTypeDataWarn
+nm_keyfile_read
+NMKeyfileWriteType
+NMKeyfileWriteHandler
+NMKeyfileWriteTypeDataCert
+nm_keyfile_write
+nm_keyfile_plugin_kf_get_string
+nm_keyfile_plugin_kf_set_string
+</SECTION>
+
+<SECTION>
+<FILE>nm-keyfile-utils</FILE>
+VPN_SECRETS_GROUP
+nm_keyfile_plugin_get_alias_for_setting_name
+nm_keyfile_plugin_get_setting_name_for_alias
+DEFINE_KF_LIST_WRAPPER_PROTO
+DEFINE_KF_WRAPPER_PROTO
+nm_keyfile_plugin_kf_get_keys
+nm_keyfile_plugin_kf_has_key
+</SECTION>
+
+<SECTION>
 <FILE>nm-object</FILE>
 <TITLE>NMObject</TITLE>
 NM_OBJECT_PATH
@@ -972,6 +1003,7 @@ nm_setting_get_type
 <SECTION>
 <FILE>nm-setting-8021x</FILE>
 <TITLE>NMSetting8021x</TITLE>
+NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH
 NMSetting8021xCKFormat
 NMSetting8021xCKScheme
 NM_SETTING_802_1X_SETTING_NAME
@@ -1285,8 +1317,10 @@ NM_SETTING_CONNECTION_PERMISSIONS
 NM_SETTING_CONNECTION_ZONE
 NM_SETTING_CONNECTION_MASTER
 NM_SETTING_CONNECTION_SLAVE_TYPE
+NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES
 NM_SETTING_CONNECTION_SECONDARIES
 NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT
+NMSettingConnectionAutoconnectSlaves
 NMSettingConnection
 nm_setting_connection_new
 nm_setting_connection_get_id
@@ -1307,6 +1341,7 @@ nm_setting_connection_remove_permission_by_value
 nm_setting_connection_get_master
 nm_setting_connection_is_slave_type
 nm_setting_connection_get_slave_type
+nm_setting_connection_get_autoconnect_slaves
 nm_setting_connection_get_num_secondaries
 nm_setting_connection_get_secondary
 nm_setting_connection_add_secondary
@@ -2130,6 +2165,8 @@ NM_ENCODE_VERSION
 NM_VERSION_0_9_8
 NM_VERSION_0_9_10
 NM_VERSION_1_0
+NM_VERSION_1_0_2
+NM_VERSION_1_0_4
 NM_VERSION_CUR_STABLE
 NM_VERSION_NEXT_STABLE
 NM_VERSION_MIN_REQUIRED
@@ -2140,6 +2177,7 @@ NM_DEPRECATED_IN_1_0
 NM_DEPRECATED_IN_1_0_FOR
 NM_AVAILABLE_IN_0_9_10
 NM_AVAILABLE_IN_1_0
+NM_AVAILABLE_IN_1_0_4
 </SECTION>
 
 <SECTION>
diff --git a/docs/libnm/libnm.types b/docs/libnm/libnm.types
index c7169090..2742a215 100644
--- a/docs/libnm/libnm.types
+++ b/docs/libnm/libnm.types
@@ -57,6 +57,7 @@ nm_setting_bridge_get_type
 nm_setting_bridge_port_get_type
 nm_setting_cdma_get_type
 nm_setting_compare_flags_get_type
+nm_setting_connection_autoconnect_slaves_get_type
 nm_setting_connection_get_type
 nm_setting_dcb_flags_get_type
 nm_setting_dcb_get_type
diff --git a/docs/libnm/tmpl/libnm-unused.sgml b/docs/libnm/tmpl/libnm-unused.sgml
deleted file mode 100644
index e69de29b..00000000
--- a/docs/libnm/tmpl/libnm-unused.sgml
+++ /dev/null
diff --git a/docs/libnm/tmpl/nm-access-point.sgml b/docs/libnm/tmpl/nm-access-point.sgml
deleted file mode 100644
index 8a5cd28c..00000000
--- a/docs/libnm/tmpl/nm-access-point.sgml
+++ /dev/null
@@ -1,195 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMAccessPoint
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_WPA_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_RSN_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_SSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_BSSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_FREQUENCY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_MAX_BITRATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_STRENGTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACCESS_POINT_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_access_point_get_flags ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_wpa_flags ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_rsn_flags ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_ssid ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_bssid ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_frequency ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_mode ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_max_bitrate ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_get_strength ##### -->
-<para>
-
-</para>
-
-@ap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_filter_connections ##### -->
-<para>
-
-</para>
-
-@ap: 
-@connections: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_access_point_connection_valid ##### -->
-<para>
-
-</para>
-
-@ap: 
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-active-connection.sgml b/docs/libnm/tmpl/nm-active-connection.sgml
deleted file mode 100644
index 77f7be1a..00000000
--- a/docs/libnm/tmpl/nm-active-connection.sgml
+++ /dev/null
@@ -1,264 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMActiveConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_UUID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEVICES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_IP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_DHCP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEFAULT6 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_IP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_DHCP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_VPN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_ACTIVE_CONNECTION_MASTER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_active_connection_get_connection ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_id ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_uuid ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_connection_type ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_specific_object_path ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_devices ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_state ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_master ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_default ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_ip4_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_dhcp4_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_default6 ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_ip6_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_dhcp6_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_active_connection_get_vpn ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-client.sgml b/docs/libnm/tmpl/nm-client.sgml
deleted file mode 100644
index 123aba73..00000000
--- a/docs/libnm/tmpl/nm-client.sgml
+++ /dev/null
@@ -1,798 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMClient
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_CLIENT_VERSION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_STARTUP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_NM_RUNNING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_NETWORKING_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WIRELESS_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WIRELESS_HARDWARE_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WWAN_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WWAN_HARDWARE_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WIMAX_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_WIMAX_HARDWARE_ENABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_ACTIVE_CONNECTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_CONNECTIVITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_PRIMARY_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_ACTIVATING_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_DEVICES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_CONNECTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_CAN_MODIFY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_DEVICE_ADDED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_DEVICE_REMOVED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_PERMISSION_CHANGED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_CONNECTION_ADDED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CLIENT_CONNECTION_REMOVED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMClientPermission ##### -->
-<para>
-
-</para>
-
-@NM_CLIENT_PERMISSION_NONE: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX: 
-@NM_CLIENT_PERMISSION_SLEEP_WAKE: 
-@NM_CLIENT_PERMISSION_NETWORK_CONTROL: 
-@NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED: 
-@NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN: 
-@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM: 
-@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN: 
-@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME: 
-@NM_CLIENT_PERMISSION_LAST: 
-
-<!-- ##### ENUM NMClientPermissionResult ##### -->
-<para>
-
-</para>
-
-@NM_CLIENT_PERMISSION_RESULT_UNKNOWN: 
-@NM_CLIENT_PERMISSION_RESULT_YES: 
-@NM_CLIENT_PERMISSION_RESULT_AUTH: 
-@NM_CLIENT_PERMISSION_RESULT_NO: 
-
-<!-- ##### ENUM NMClientError ##### -->
-<para>
-
-</para>
-
-@NM_CLIENT_ERROR_FAILED: 
-@NM_CLIENT_ERROR_MANAGER_NOT_RUNNING: 
-@NM_CLIENT_ERROR_OBJECT_CREATION_FAILED: 
-
-<!-- ##### MACRO NM_CLIENT_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_client_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_new ##### -->
-<para>
-
-</para>
-
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_new_async ##### -->
-<para>
-
-</para>
-
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_new_finish ##### -->
-<para>
-
-</para>
-
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_version ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_state ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_startup ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_nm_running ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_networking_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_networking_set_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@enabled: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wireless_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wireless_set_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@enabled: 
-
-
-<!-- ##### FUNCTION nm_client_wireless_hardware_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wwan_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wwan_set_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@enabled: 
-
-
-<!-- ##### FUNCTION nm_client_wwan_hardware_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wimax_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_wimax_set_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@enabled: 
-
-
-<!-- ##### FUNCTION nm_client_wimax_hardware_get_enabled ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_logging ##### -->
-<para>
-
-</para>
-
-@client: 
-@level: 
-@domains: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_set_logging ##### -->
-<para>
-
-</para>
-
-@client: 
-@level: 
-@domains: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_permission_result ##### -->
-<para>
-
-</para>
-
-@client: 
-@permission: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_connectivity ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_check_connectivity ##### -->
-<para>
-
-</para>
-
-@client: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_check_connectivity_async ##### -->
-<para>
-
-</para>
-
-@client: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_check_connectivity_finish ##### -->
-<para>
-
-</para>
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_save_hostname ##### -->
-<para>
-
-</para>
-
-@client: 
-@hostname: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_save_hostname_async ##### -->
-<para>
-
-</para>
-
-@client: 
-@hostname: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_save_hostname_finish ##### -->
-<para>
-
-</para>
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_devices ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_device_by_path ##### -->
-<para>
-
-</para>
-
-@client: 
-@object_path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_device_by_iface ##### -->
-<para>
-
-</para>
-
-@client: 
-@iface: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_active_connections ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_primary_connection ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_activating_connection ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_activate_connection_async ##### -->
-<para>
-
-</para>
-
-@client: 
-@connection: 
-@device: 
-@specific_object: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_activate_connection_finish ##### -->
-<para>
-
-</para>
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_add_and_activate_connection_async ##### -->
-<para>
-
-</para>
-
-@client: 
-@partial: 
-@device: 
-@specific_object: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_add_and_activate_connection_finish ##### -->
-<para>
-
-</para>
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_deactivate_connection ##### -->
-<para>
-
-</para>
-
-@client: 
-@active: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_deactivate_connection_async ##### -->
-<para>
-
-</para>
-
-@client: 
-@active: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_deactivate_connection_finish ##### -->
-<para>
-
-</para>
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_connections ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_connection_by_id ##### -->
-<para>
-
-</para>
-
-@client: 
-@id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_connection_by_path ##### -->
-<para>
-
-</para>
-
-@client: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_get_connection_by_uuid ##### -->
-<para>
-
-</para>
-
-@client: 
-@uuid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_add_connection_async ##### -->
-<para>
-
-</para>
-
-@client: 
-@connection: 
-@save_to_disk: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_add_connection_finish ##### -->
-<para>
-
-</para>
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_load_connections ##### -->
-<para>
-
-</para>
-
-@client: 
-@filenames: 
-@failures: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_load_connections_async ##### -->
-<para>
-
-</para>
-
-@client: 
-@filenames: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_load_connections_finish ##### -->
-<para>
-
-</para>
-
-@client: 
-@failures: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_reload_connections ##### -->
-<para>
-
-</para>
-
-@client: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_client_reload_connections_async ##### -->
-<para>
-
-</para>
-
-@client: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_client_reload_connections_finish ##### -->
-<para>
-
-</para>
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-connection.sgml b/docs/libnm/tmpl/nm-connection.sgml
deleted file mode 100644
index 804f0cb2..00000000
--- a/docs/libnm/tmpl/nm-connection.sgml
+++ /dev/null
@@ -1,573 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_CONNECTION_SECRETS_UPDATED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CONNECTION_SECRETS_CLEARED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CONNECTION_CHANGED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMConnectionInterface ##### -->
-<para>
-
-</para>
-
-@parent: 
-@secrets_updated: 
-@secrets_cleared: 
-@changed: 
-
-<!-- ##### FUNCTION nm_connection_add_setting ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting: 
-
-
-<!-- ##### FUNCTION nm_connection_remove_setting ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_type: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_by_name ##### -->
-<para>
-
-</para>
-
-@connection: 
-@name: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_VARIANT_TYPE_SETTING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMConnectionSerializationFlags ##### -->
-<para>
-
-</para>
-
-@NM_CONNECTION_SERIALIZE_ALL: 
-@NM_CONNECTION_SERIALIZE_NO_SECRETS: 
-@NM_CONNECTION_SERIALIZE_ONLY_SECRETS: 
-
-<!-- ##### FUNCTION nm_connection_to_dbus ##### -->
-<para>
-
-</para>
-
-@connection: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_replace_settings ##### -->
-<para>
-
-</para>
-
-@connection: 
-@new_settings: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_replace_settings_from_connection ##### -->
-<para>
-
-</para>
-
-@connection: 
-@new_connection: 
-
-
-<!-- ##### FUNCTION nm_connection_clear_settings ##### -->
-<para>
-
-</para>
-
-@connection: 
-
-
-<!-- ##### FUNCTION nm_connection_compare ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_diff ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@out_settings: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_verify ##### -->
-<para>
-
-</para>
-
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_normalize ##### -->
-<para>
-
-</para>
-
-@connection: 
-@parameters: 
-@modified: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_need_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-@hints: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_clear_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-
-
-<!-- ##### FUNCTION nm_connection_clear_secrets_with_flags ##### -->
-<para>
-
-</para>
-
-@connection: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_connection_update_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_name: 
-@secrets: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_set_path ##### -->
-<para>
-
-</para>
-
-@connection: 
-@path: 
-
-
-<!-- ##### FUNCTION nm_connection_get_path ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_interface_name ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_is_type ##### -->
-<para>
-
-</para>
-
-@connection: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_for_each_setting_value ##### -->
-<para>
-
-</para>
-
-@connection: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_connection_dump ##### -->
-<para>
-
-</para>
-
-@connection: 
-
-
-<!-- ##### FUNCTION nm_connection_get_uuid ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_id ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_connection_type ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_is_virtual ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_virtual_device_description ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_802_1x ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_bluetooth ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_bond ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_team ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_team_port ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_bridge ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_bridge_port ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_cdma ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_connection ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_dcb ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_generic ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_gsm ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_infiniband ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_ip4_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_ip6_config ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_olpc_mesh ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_ppp ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_pppoe ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_serial ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_vpn ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_wimax ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_adsl ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_wired ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_wireless ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_wireless_security ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_connection_get_setting_vlan ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-core-enum-types.sgml b/docs/libnm/tmpl/nm-core-enum-types.sgml
deleted file mode 100644
index 68f14ec3..00000000
--- a/docs/libnm/tmpl/nm-core-enum-types.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-core-enum-types
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
diff --git a/docs/libnm/tmpl/nm-dbus-interface.sgml b/docs/libnm/tmpl/nm-dbus-interface.sgml
deleted file mode 100644
index 127f117d..00000000
--- a/docs/libnm/tmpl/nm-dbus-interface.sgml
+++ /dev/null
@@ -1,552 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-dbus-interface
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DBUS_SERVICE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_WIRED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_ADSL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_WIRELESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_BLUETOOTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_OLPC_MESH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_ACCESS_POINT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_ACCESS_POINT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_MODEM ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_WIMAX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_WIMAX_NSP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_WIMAX_NSP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_ACTIVE_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_IP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DHCP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_IP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DHCP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_INFINIBAND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_BOND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_TEAM ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_VLAN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_BRIDGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_GENERIC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_VETH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_TUN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_MACVLAN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_VXLAN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_DEVICE_GRE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_SETTINGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_SETTINGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_SETTINGS_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_SETTINGS_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_SETTINGS_CONNECTION_SECRETS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_AGENT_MANAGER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_AGENT_MANAGER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_SECRET_AGENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_SECRET_AGENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMState ##### -->
-<para>
-
-</para>
-
-@NM_STATE_UNKNOWN: 
-@NM_STATE_ASLEEP: 
-@NM_STATE_DISCONNECTED: 
-@NM_STATE_DISCONNECTING: 
-@NM_STATE_CONNECTING: 
-@NM_STATE_CONNECTED_LOCAL: 
-@NM_STATE_CONNECTED_SITE: 
-@NM_STATE_CONNECTED_GLOBAL: 
-
-<!-- ##### ENUM NMConnectivityState ##### -->
-<para>
-
-</para>
-
-@NM_CONNECTIVITY_UNKNOWN: 
-@NM_CONNECTIVITY_NONE: 
-@NM_CONNECTIVITY_PORTAL: 
-@NM_CONNECTIVITY_LIMITED: 
-@NM_CONNECTIVITY_FULL: 
-
-<!-- ##### ENUM NMDeviceType ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_TYPE_UNKNOWN: 
-@NM_DEVICE_TYPE_ETHERNET: 
-@NM_DEVICE_TYPE_WIFI: 
-@NM_DEVICE_TYPE_UNUSED1: 
-@NM_DEVICE_TYPE_UNUSED2: 
-@NM_DEVICE_TYPE_BT: 
-@NM_DEVICE_TYPE_OLPC_MESH: 
-@NM_DEVICE_TYPE_WIMAX: 
-@NM_DEVICE_TYPE_MODEM: 
-@NM_DEVICE_TYPE_INFINIBAND: 
-@NM_DEVICE_TYPE_BOND: 
-@NM_DEVICE_TYPE_VLAN: 
-@NM_DEVICE_TYPE_ADSL: 
-@NM_DEVICE_TYPE_BRIDGE: 
-@NM_DEVICE_TYPE_GENERIC: 
-@NM_DEVICE_TYPE_TEAM: 
-
-<!-- ##### ENUM NMDeviceCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_CAP_NONE: 
-@NM_DEVICE_CAP_NM_SUPPORTED: 
-@NM_DEVICE_CAP_CARRIER_DETECT: 
-@NM_DEVICE_CAP_IS_SOFTWARE: 
-
-<!-- ##### ENUM NMDeviceWifiCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_WIFI_DEVICE_CAP_NONE: 
-@NM_WIFI_DEVICE_CAP_CIPHER_WEP40: 
-@NM_WIFI_DEVICE_CAP_CIPHER_WEP104: 
-@NM_WIFI_DEVICE_CAP_CIPHER_TKIP: 
-@NM_WIFI_DEVICE_CAP_CIPHER_CCMP: 
-@NM_WIFI_DEVICE_CAP_WPA: 
-@NM_WIFI_DEVICE_CAP_RSN: 
-@NM_WIFI_DEVICE_CAP_AP: 
-@NM_WIFI_DEVICE_CAP_ADHOC: 
-@NM_WIFI_DEVICE_CAP_FREQ_VALID: 
-@NM_WIFI_DEVICE_CAP_FREQ_2GHZ: 
-@NM_WIFI_DEVICE_CAP_FREQ_5GHZ: 
-
-<!-- ##### ENUM NM80211ApFlags ##### -->
-<para>
-
-</para>
-
-@NM_802_11_AP_FLAGS_NONE: 
-@NM_802_11_AP_FLAGS_PRIVACY: 
-
-<!-- ##### ENUM NM80211ApSecurityFlags ##### -->
-<para>
-
-</para>
-
-@NM_802_11_AP_SEC_NONE: 
-@NM_802_11_AP_SEC_PAIR_WEP40: 
-@NM_802_11_AP_SEC_PAIR_WEP104: 
-@NM_802_11_AP_SEC_PAIR_TKIP: 
-@NM_802_11_AP_SEC_PAIR_CCMP: 
-@NM_802_11_AP_SEC_GROUP_WEP40: 
-@NM_802_11_AP_SEC_GROUP_WEP104: 
-@NM_802_11_AP_SEC_GROUP_TKIP: 
-@NM_802_11_AP_SEC_GROUP_CCMP: 
-@NM_802_11_AP_SEC_KEY_MGMT_PSK: 
-@NM_802_11_AP_SEC_KEY_MGMT_802_1X: 
-
-<!-- ##### ENUM NM80211Mode ##### -->
-<para>
-
-</para>
-
-@NM_802_11_MODE_UNKNOWN: 
-@NM_802_11_MODE_ADHOC: 
-@NM_802_11_MODE_INFRA: 
-@NM_802_11_MODE_AP: 
-
-<!-- ##### ENUM NMBluetoothCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_BT_CAPABILITY_NONE: 
-@NM_BT_CAPABILITY_DUN: 
-@NM_BT_CAPABILITY_NAP: 
-
-<!-- ##### ENUM NMDeviceModemCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_MODEM_CAPABILITY_NONE: 
-@NM_DEVICE_MODEM_CAPABILITY_POTS: 
-@NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO: 
-@NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS: 
-@NM_DEVICE_MODEM_CAPABILITY_LTE: 
-
-<!-- ##### ENUM NMDeviceState ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_STATE_UNKNOWN: 
-@NM_DEVICE_STATE_UNMANAGED: 
-@NM_DEVICE_STATE_UNAVAILABLE: 
-@NM_DEVICE_STATE_DISCONNECTED: 
-@NM_DEVICE_STATE_PREPARE: 
-@NM_DEVICE_STATE_CONFIG: 
-@NM_DEVICE_STATE_NEED_AUTH: 
-@NM_DEVICE_STATE_IP_CONFIG: 
-@NM_DEVICE_STATE_IP_CHECK: 
-@NM_DEVICE_STATE_SECONDARIES: 
-@NM_DEVICE_STATE_ACTIVATED: 
-@NM_DEVICE_STATE_DEACTIVATING: 
-@NM_DEVICE_STATE_FAILED: 
-
-<!-- ##### ENUM NMDeviceStateReason ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_STATE_REASON_NONE: 
-@NM_DEVICE_STATE_REASON_UNKNOWN: 
-@NM_DEVICE_STATE_REASON_NOW_MANAGED: 
-@NM_DEVICE_STATE_REASON_NOW_UNMANAGED: 
-@NM_DEVICE_STATE_REASON_CONFIG_FAILED: 
-@NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE: 
-@NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED: 
-@NM_DEVICE_STATE_REASON_NO_SECRETS: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_PPP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_PPP_DISCONNECT: 
-@NM_DEVICE_STATE_REASON_PPP_FAILED: 
-@NM_DEVICE_STATE_REASON_DHCP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_DHCP_ERROR: 
-@NM_DEVICE_STATE_REASON_DHCP_FAILED: 
-@NM_DEVICE_STATE_REASON_SHARED_START_FAILED: 
-@NM_DEVICE_STATE_REASON_SHARED_FAILED: 
-@NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_AUTOIP_ERROR: 
-@NM_DEVICE_STATE_REASON_AUTOIP_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_BUSY: 
-@NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE: 
-@NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER: 
-@NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_APN_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED: 
-@NM_DEVICE_STATE_REASON_FIRMWARE_MISSING: 
-@NM_DEVICE_STATE_REASON_REMOVED: 
-@NM_DEVICE_STATE_REASON_SLEEPING: 
-@NM_DEVICE_STATE_REASON_CONNECTION_REMOVED: 
-@NM_DEVICE_STATE_REASON_USER_REQUESTED: 
-@NM_DEVICE_STATE_REASON_CARRIER: 
-@NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE: 
-@NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND: 
-@NM_DEVICE_STATE_REASON_BT_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_WRONG: 
-@NM_DEVICE_STATE_REASON_INFINIBAND_MODE: 
-@NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: 
-@NM_DEVICE_STATE_REASON_BR2684_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE: 
-@NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: 
-@NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED: 
-@NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED: 
-@NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_AVAILABLE: 
-@NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT: 
-@NM_DEVICE_STATE_REASON_NEW_ACTIVATION: 
-
-<!-- ##### ENUM NMActiveConnectionState ##### -->
-<para>
-
-</para>
-
-@NM_ACTIVE_CONNECTION_STATE_UNKNOWN: 
-@NM_ACTIVE_CONNECTION_STATE_ACTIVATING: 
-@NM_ACTIVE_CONNECTION_STATE_ACTIVATED: 
-@NM_ACTIVE_CONNECTION_STATE_DEACTIVATING: 
-@NM_ACTIVE_CONNECTION_STATE_DEACTIVATED: 
-
-<!-- ##### ENUM NMSecretAgentGetSecretsFlags ##### -->
-<para>
-
-</para>
-
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_NO_ERRORS: 
-
-<!-- ##### ENUM NMSecretAgentCapabilities ##### -->
-<para>
-
-</para>
-
-@NM_SECRET_AGENT_CAPABILITY_NONE: 
-@NM_SECRET_AGENT_CAPABILITY_VPN_HINTS: 
-@NM_SECRET_AGENT_CAPABILITY_LAST: 
-
diff --git a/docs/libnm/tmpl/nm-device-adsl.sgml b/docs/libnm/tmpl/nm-device-adsl.sgml
deleted file mode 100644
index a6ef7224..00000000
--- a/docs/libnm/tmpl/nm-device-adsl.sgml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceAdsl
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_ADSL_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_adsl_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-bond.sgml b/docs/libnm/tmpl/nm-device-bond.sgml
deleted file mode 100644
index 8feb3de6..00000000
--- a/docs/libnm/tmpl/nm-device-bond.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceBond
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_BOND_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BOND_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BOND_SLAVES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_bond_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bond_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bond_get_slaves ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-bridge.sgml b/docs/libnm/tmpl/nm-device-bridge.sgml
deleted file mode 100644
index 675fdb64..00000000
--- a/docs/libnm/tmpl/nm-device-bridge.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceBridge
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_BRIDGE_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BRIDGE_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BRIDGE_SLAVES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_bridge_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bridge_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bridge_get_slaves ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-bt.sgml b/docs/libnm/tmpl/nm-device-bt.sgml
deleted file mode 100644
index ff536c37..00000000
--- a/docs/libnm/tmpl/nm-device-bt.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceBt
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_BT_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BT_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_BT_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_bt_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bt_get_name ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_bt_get_capabilities ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-ethernet.sgml b/docs/libnm/tmpl/nm-device-ethernet.sgml
deleted file mode 100644
index 9bb88cb3..00000000
--- a/docs/libnm/tmpl/nm-device-ethernet.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceEthernet
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_ETHERNET_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_ETHERNET_SPEED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_ETHERNET_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_ethernet_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_ethernet_get_permanent_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_ethernet_get_speed ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_ethernet_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-generic.sgml b/docs/libnm/tmpl/nm-device-generic.sgml
deleted file mode 100644
index 94f52f55..00000000
--- a/docs/libnm/tmpl/nm-device-generic.sgml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceGeneric
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_GENERIC_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_GENERIC_TYPE_DESCRIPTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_generic_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-infiniband.sgml b/docs/libnm/tmpl/nm-device-infiniband.sgml
deleted file mode 100644
index bc6e35af..00000000
--- a/docs/libnm/tmpl/nm-device-infiniband.sgml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceInfiniband
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_INFINIBAND_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_INFINIBAND_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_infiniband_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_infiniband_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-modem.sgml b/docs/libnm/tmpl/nm-device-modem.sgml
deleted file mode 100644
index 042959ce..00000000
--- a/docs/libnm/tmpl/nm-device-modem.sgml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceModem
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_MODEM_MODEM_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_MODEM_CURRENT_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_modem_get_modem_capabilities ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_modem_get_current_capabilities ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm/tmpl/nm-device-olpc-mesh.sgml
deleted file mode 100644
index 8047c8f8..00000000
--- a/docs/libnm/tmpl/nm-device-olpc-mesh.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceOlpcMesh
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_OLPC_MESH_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_OLPC_MESH_COMPANION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_olpc_mesh_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_olpc_mesh_get_companion ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_olpc_mesh_get_active_channel ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-team.sgml b/docs/libnm/tmpl/nm-device-team.sgml
deleted file mode 100644
index dd23f451..00000000
--- a/docs/libnm/tmpl/nm-device-team.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceTeam
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_TEAM_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_TEAM_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_TEAM_SLAVES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_team_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_team_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_team_get_slaves ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-vlan.sgml b/docs/libnm/tmpl/nm-device-vlan.sgml
deleted file mode 100644
index 44f7d730..00000000
--- a/docs/libnm/tmpl/nm-device-vlan.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceVlan
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_VLAN_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_VLAN_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_VLAN_PARENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_VLAN_VLAN_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_vlan_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_vlan_get_carrier ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_vlan_get_parent ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_vlan_get_vlan_id ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-wifi.sgml b/docs/libnm/tmpl/nm-device-wifi.sgml
deleted file mode 100644
index 57891ab3..00000000
--- a/docs/libnm/tmpl/nm-device-wifi.sgml
+++ /dev/null
@@ -1,179 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceWifi
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_BITRATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIFI_ACCESS_POINTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_permanent_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_mode ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_bitrate ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_capabilities ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_active_access_point ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_access_point_by_path ##### -->
-<para>
-
-</para>
-
-@device: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_get_access_points ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_request_scan ##### -->
-<para>
-
-</para>
-
-@device: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_request_scan_async ##### -->
-<para>
-
-</para>
-
-@device: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_device_wifi_request_scan_finish ##### -->
-<para>
-
-</para>
-
-@device: 
-@result: 
-@error: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-wimax.sgml b/docs/libnm/tmpl/nm-device-wimax.sgml
deleted file mode 100644
index 71a3a039..00000000
--- a/docs/libnm/tmpl/nm-device-wimax.sgml
+++ /dev/null
@@ -1,162 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDeviceWimax
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_HW_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_ACTIVE_NSP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_CENTER_FREQUENCY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_RSSI ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_CINR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_TX_POWER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_BSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_WIMAX_NSPS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_hw_address ##### -->
-<para>
-
-</para>
-
-@wimax: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_active_nsp ##### -->
-<para>
-
-</para>
-
-@wimax: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_nsp_by_path ##### -->
-<para>
-
-</para>
-
-@wimax: 
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_nsps ##### -->
-<para>
-
-</para>
-
-@wimax: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_center_frequency ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_rssi ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_cinr ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_tx_power ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_wimax_get_bsid ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device.sgml b/docs/libnm/tmpl/nm-device.sgml
deleted file mode 100644
index 9abbd944..00000000
--- a/docs/libnm/tmpl/nm-device.sgml
+++ /dev/null
@@ -1,553 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDevice
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DEVICE_DEVICE_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_UDI ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_INTERFACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_IP_INTERFACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_DRIVER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_DRIVER_VERSION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_FIRMWARE_VERSION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_MANAGED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_AUTOCONNECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_FIRMWARE_MISSING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_IP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_DHCP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_IP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_DHCP6_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_STATE_REASON ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_ACTIVE_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_AVAILABLE_CONNECTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_VENDOR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_PRODUCT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_PHYSICAL_PORT_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEVICE_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_get_iface ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_ip_iface ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_device_type ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_udi ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_driver ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_driver_version ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_firmware_version ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_type_description ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_hw_address ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_capabilities ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_managed ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_autoconnect ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_set_autoconnect ##### -->
-<para>
-
-</para>
-
-@device: 
-@autoconnect: 
-
-
-<!-- ##### FUNCTION nm_device_get_firmware_missing ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_ip4_config ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_dhcp4_config ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_ip6_config ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_dhcp6_config ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_state ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_state_reason ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_active_connection ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_available_connections ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_physical_port_id ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_mtu ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_is_software ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_product ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_vendor ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_description ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_disambiguate_names ##### -->
-<para>
-
-</para>
-
-@devices: 
-@num_devices: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_disconnect ##### -->
-<para>
-
-</para>
-
-@device: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_disconnect_async ##### -->
-<para>
-
-</para>
-
-@device: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_device_disconnect_finish ##### -->
-<para>
-
-</para>
-
-@device: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_delete ##### -->
-<para>
-
-</para>
-
-@device: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_delete_async ##### -->
-<para>
-
-</para>
-
-@device: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_device_delete_finish ##### -->
-<para>
-
-</para>
-
-@device: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_filter_connections ##### -->
-<para>
-
-</para>
-
-@device: 
-@connections: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_connection_valid ##### -->
-<para>
-
-</para>
-
-@device: 
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_connection_compatible ##### -->
-<para>
-
-</para>
-
-@device: 
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_device_get_setting_type ##### -->
-<para>
-
-</para>
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-dhcp-config.sgml b/docs/libnm/tmpl/nm-dhcp-config.sgml
deleted file mode 100644
index 9e5bb72a..00000000
--- a/docs/libnm/tmpl/nm-dhcp-config.sgml
+++ /dev/null
@@ -1,66 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMDhcpConfig
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DHCP_CONFIG_FAMILY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DHCP_CONFIG_OPTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_dhcp_config_get_family ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_dhcp_config_get_options ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_dhcp_config_get_one_option ##### -->
-<para>
-
-</para>
-
-@config: 
-@option: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-enum-types.sgml b/docs/libnm/tmpl/nm-enum-types.sgml
deleted file mode 100644
index 8577600d..00000000
--- a/docs/libnm/tmpl/nm-enum-types.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-enum-types
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
diff --git a/docs/libnm/tmpl/nm-errors.sgml b/docs/libnm/tmpl/nm-errors.sgml
deleted file mode 100644
index 8c79b479..00000000
--- a/docs/libnm/tmpl/nm-errors.sgml
+++ /dev/null
@@ -1,263 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-errors
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMAgentManagerError ##### -->
-<para>
-
-</para>
-
-@NM_AGENT_MANAGER_ERROR_FAILED: 
-@NM_AGENT_MANAGER_ERROR_PERMISSION_DENIED: 
-@NM_AGENT_MANAGER_ERROR_INVALID_IDENTIFIER: 
-@NM_AGENT_MANAGER_ERROR_NOT_REGISTERED: 
-@NM_AGENT_MANAGER_ERROR_NO_SECRETS: 
-@NM_AGENT_MANAGER_ERROR_USER_CANCELED: 
-
-<!-- ##### FUNCTION nm_agent_manager_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_AGENT_MANAGER_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMConnectionError ##### -->
-<para>
-
-</para>
-
-@NM_CONNECTION_ERROR_FAILED: 
-@NM_CONNECTION_ERROR_SETTING_NOT_FOUND: 
-@NM_CONNECTION_ERROR_PROPERTY_NOT_FOUND: 
-@NM_CONNECTION_ERROR_PROPERTY_NOT_SECRET: 
-@NM_CONNECTION_ERROR_MISSING_SETTING: 
-@NM_CONNECTION_ERROR_INVALID_SETTING: 
-@NM_CONNECTION_ERROR_MISSING_PROPERTY: 
-@NM_CONNECTION_ERROR_INVALID_PROPERTY: 
-
-<!-- ##### MACRO NM_CONNECTION_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_connection_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### ENUM NMCryptoError ##### -->
-<para>
-
-</para>
-
-@NM_CRYPTO_ERROR_FAILED: 
-@NM_CRYPTO_ERROR_INVALID_DATA: 
-@NM_CRYPTO_ERROR_INVALID_PASSWORD: 
-@NM_CRYPTO_ERROR_UNKNOWN_CIPHER: 
-@NM_CRYPTO_ERROR_DECRYPTION_FAILED: 
-@NM_CRYPTO_ERROR_ENCRYPTION_FAILED: 
-
-<!-- ##### MACRO NM_CRYPTO_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_crypto_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### ENUM NMDeviceError ##### -->
-<para>
-
-</para>
-
-@NM_DEVICE_ERROR_FAILED: 
-@NM_DEVICE_ERROR_CREATION_FAILED: 
-@NM_DEVICE_ERROR_INVALID_CONNECTION: 
-@NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION: 
-@NM_DEVICE_ERROR_NOT_ACTIVE: 
-@NM_DEVICE_ERROR_NOT_SOFTWARE: 
-@NM_DEVICE_ERROR_NOT_ALLOWED: 
-@NM_DEVICE_ERROR_SPECIFIC_OBJECT_NOT_FOUND: 
-
-<!-- ##### MACRO NM_DEVICE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_device_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### ENUM NMManagerError ##### -->
-<para>
-
-</para>
-
-@NM_MANAGER_ERROR_FAILED: 
-@NM_MANAGER_ERROR_PERMISSION_DENIED: 
-@NM_MANAGER_ERROR_UNKNOWN_CONNECTION: 
-@NM_MANAGER_ERROR_UNKNOWN_DEVICE: 
-@NM_MANAGER_ERROR_CONNECTION_NOT_AVAILABLE: 
-@NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE: 
-@NM_MANAGER_ERROR_CONNECTION_ALREADY_ACTIVE: 
-@NM_MANAGER_ERROR_DEPENDENCY_FAILED: 
-@NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE: 
-@NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED: 
-@NM_MANAGER_ERROR_UNKNOWN_LOG_LEVEL: 
-@NM_MANAGER_ERROR_UNKNOWN_LOG_DOMAIN: 
-
-<!-- ##### FUNCTION nm_manager_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_MANAGER_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSecretAgentError ##### -->
-<para>
-
-</para>
-
-@NM_SECRET_AGENT_ERROR_FAILED: 
-@NM_SECRET_AGENT_ERROR_PERMISSION_DENIED: 
-@NM_SECRET_AGENT_ERROR_INVALID_CONNECTION: 
-@NM_SECRET_AGENT_ERROR_USER_CANCELED: 
-@NM_SECRET_AGENT_ERROR_AGENT_CANCELED: 
-@NM_SECRET_AGENT_ERROR_NO_SECRETS: 
-
-<!-- ##### FUNCTION nm_secret_agent_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SECRET_AGENT_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingsError ##### -->
-<para>
-
-</para>
-
-@NM_SETTINGS_ERROR_FAILED: 
-@NM_SETTINGS_ERROR_PERMISSION_DENIED: 
-@NM_SETTINGS_ERROR_NOT_SUPPORTED: 
-@NM_SETTINGS_ERROR_INVALID_CONNECTION: 
-@NM_SETTINGS_ERROR_READ_ONLY_CONNECTION: 
-@NM_SETTINGS_ERROR_UUID_EXISTS: 
-@NM_SETTINGS_ERROR_INVALID_HOSTNAME: 
-
-<!-- ##### FUNCTION nm_settings_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_SETTINGS_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMVpnPluginError ##### -->
-<para>
-
-</para>
-
-@NM_VPN_PLUGIN_ERROR_FAILED: 
-@NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS: 
-@NM_VPN_PLUGIN_ERROR_ALREADY_STARTED: 
-@NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS: 
-@NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED: 
-@NM_VPN_PLUGIN_ERROR_WRONG_STATE: 
-@NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS: 
-@NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED: 
-@NM_VPN_PLUGIN_ERROR_INVALID_CONNECTION: 
-@NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED: 
-
-<!-- ##### MACRO NM_VPN_PLUGIN_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_vpn_plugin_error_quark ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-ip-config.sgml b/docs/libnm/tmpl/nm-ip-config.sgml
deleted file mode 100644
index 2784a9b6..00000000
--- a/docs/libnm/tmpl/nm-ip-config.sgml
+++ /dev/null
@@ -1,152 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMIPConfig
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_IP_CONFIG_FAMILY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP_CONFIG_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP_CONFIG_ADDRESSES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP_CONFIG_NAMESERVERS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP_CONFIG_DOMAINS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP_CONFIG_SEARCHES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_IP_CONFIG_WINS_SERVERS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_ip_config_get_family ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_config_get_gateway ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_config_get_addresses ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_config_get_routes ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_config_get_nameservers ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_config_get_domains ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_config_get_searches ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_config_get_wins_servers ##### -->
-<para>
-
-</para>
-
-@config: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-object.sgml b/docs/libnm/tmpl/nm-object.sgml
deleted file mode 100644
index 98025f3d..00000000
--- a/docs/libnm/tmpl/nm-object.sgml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMObject
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_OBJECT_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_OBJECT_DBUS_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_object_get_path ##### -->
-<para>
-
-</para>
-
-@object: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-remote-connection.sgml b/docs/libnm/tmpl/nm-remote-connection.sgml
deleted file mode 100644
index fb74dcc5..00000000
--- a/docs/libnm/tmpl/nm-remote-connection.sgml
+++ /dev/null
@@ -1,206 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMRemoteConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_REMOTE_CONNECTION_DBUS_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_REMOTE_CONNECTION_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_REMOTE_CONNECTION_UNSAVED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_REMOTE_CONNECTION_VISIBLE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_remote_connection_commit_changes ##### -->
-<para>
-
-</para>
-
-@connection: 
-@save_to_disk: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_commit_changes_async ##### -->
-<para>
-
-</para>
-
-@connection: 
-@save_to_disk: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_commit_changes_finish ##### -->
-<para>
-
-</para>
-
-@connection: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_save ##### -->
-<para>
-
-</para>
-
-@connection: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_save_async ##### -->
-<para>
-
-</para>
-
-@connection: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_save_finish ##### -->
-<para>
-
-</para>
-
-@connection: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_delete ##### -->
-<para>
-
-</para>
-
-@connection: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_delete_async ##### -->
-<para>
-
-</para>
-
-@connection: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_delete_finish ##### -->
-<para>
-
-</para>
-
-@connection: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_get_secrets ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_name: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_get_secrets_async ##### -->
-<para>
-
-</para>
-
-@connection: 
-@setting_name: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_get_secrets_finish ##### -->
-<para>
-
-</para>
-
-@connection: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_get_unsaved ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_remote_connection_get_visible ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-secret-agent-old.sgml b/docs/libnm/tmpl/nm-secret-agent-old.sgml
deleted file mode 100644
index 1e147551..00000000
--- a/docs/libnm/tmpl/nm-secret-agent-old.sgml
+++ /dev/null
@@ -1,197 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSecretAgentOld
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SECRET_AGENT_OLD_IDENTIFIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SECRET_AGENT_OLD_AUTO_REGISTER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SECRET_AGENT_OLD_REGISTERED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SECRET_AGENT_OLD_CAPABILITIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### USER_FUNCTION NMSecretAgentOldGetSecretsFunc ##### -->
-<para>
-
-</para>
-
-@agent: 
-@connection: 
-@secrets: 
-@error: 
-@user_data: 
-
-
-<!-- ##### USER_FUNCTION NMSecretAgentOldSaveSecretsFunc ##### -->
-<para>
-
-</para>
-
-@agent: 
-@connection: 
-@error: 
-@user_data: 
-
-
-<!-- ##### USER_FUNCTION NMSecretAgentOldDeleteSecretsFunc ##### -->
-<para>
-
-</para>
-
-@agent: 
-@connection: 
-@error: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_old_register ##### -->
-<para>
-
-</para>
-
-@self: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_old_register_async ##### -->
-<para>
-
-</para>
-
-@self: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_old_register_finish ##### -->
-<para>
-
-</para>
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_old_unregister ##### -->
-<para>
-
-</para>
-
-@self: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_old_unregister_async ##### -->
-<para>
-
-</para>
-
-@self: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_old_unregister_finish ##### -->
-<para>
-
-</para>
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_old_get_registered ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_old_get_secrets ##### -->
-<para>
-
-</para>
-
-@self: 
-@connection: 
-@setting_name: 
-@hints: 
-@flags: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_old_save_secrets ##### -->
-<para>
-
-</para>
-
-@self: 
-@connection: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_secret_agent_old_delete_secrets ##### -->
-<para>
-
-</para>
-
-@self: 
-@connection: 
-@callback: 
-@user_data: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-8021x.sgml b/docs/libnm/tmpl/nm-setting-8021x.sgml
deleted file mode 100644
index f61f0874..00000000
--- a/docs/libnm/tmpl/nm-setting-8021x.sgml
+++ /dev/null
@@ -1,918 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSetting8021x
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM NMSetting8021xCKFormat ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_802_1X_CK_FORMAT_UNKNOWN: 
-@NM_SETTING_802_1X_CK_FORMAT_X509: 
-@NM_SETTING_802_1X_CK_FORMAT_RAW_KEY: 
-@NM_SETTING_802_1X_CK_FORMAT_PKCS12: 
-
-<!-- ##### ENUM NMSetting8021xCKScheme ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_802_1X_CK_SCHEME_UNKNOWN: 
-@NM_SETTING_802_1X_CK_SCHEME_BLOB: 
-@NM_SETTING_802_1X_CK_SCHEME_PATH: 
-
-<!-- ##### MACRO NM_SETTING_802_1X_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_EAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_IDENTITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_ANONYMOUS_IDENTITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PAC_FILE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CA_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CA_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_SUBJECT_MATCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_ALTSUBJECT_MATCHES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_CLIENT_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE1_PEAPVER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE1_PEAPLABEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_AUTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_AUTHEAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CA_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CA_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_CLIENT_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD_RAW ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PASSWORD_RAW_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PRIVATE_KEY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_PRIVATE_KEY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_PIN_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_802_1X_SYSTEM_CA_CERTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_num_eap_methods ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_eap_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_add_eap_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@eap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_eap_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_eap_method_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@eap: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_clear_eap_methods ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_identity ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_anonymous_identity ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_pac_file ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_system_ca_certs ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_ca_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_ca_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_subject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_num_altsubject_matches ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_add_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@altsubject_match: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_altsubject_match_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@altsubject_match: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_clear_altsubject_matches ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_client_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_client_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_client_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_client_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase1_peapver ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase1_peaplabel ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase1_fast_provisioning ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_auth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_autheap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_ca_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_ca_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_subject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_num_phase2_altsubject_matches ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_add_phase2_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@phase2_altsubject_match: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_phase2_altsubject_match ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_remove_phase2_altsubject_match_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@phase2_altsubject_match: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_clear_phase2_altsubject_matches ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_client_cert_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_client_cert_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_client_cert_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_client_cert ##### -->
-<para>
-
-</para>
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_password_raw ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_password_raw_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_pin ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_pin_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_private_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_private_key_format ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_scheme ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_blob ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_path ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_set_phase2_private_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_802_1x_get_phase2_private_key_format ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-adsl.sgml b/docs/libnm/tmpl/nm-setting-adsl.sgml
deleted file mode 100644
index 8895e119..00000000
--- a/docs/libnm/tmpl/nm-setting-adsl.sgml
+++ /dev/null
@@ -1,187 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingAdsl
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_VPI ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_VCI ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_PPPOA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_PPPOE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_PROTOCOL_IPOATM ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION_VCMUX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_ADSL_ENCAPSULATION_LLC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_adsl_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_protocol ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_encapsulation ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_vpi ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_vci ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_adsl_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-bluetooth.sgml b/docs/libnm/tmpl/nm-setting-bluetooth.sgml
deleted file mode 100644
index 6d1f1468..00000000
--- a/docs/libnm/tmpl/nm-setting-bluetooth.sgml
+++ /dev/null
@@ -1,86 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBluetooth
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_BDADDR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE_DUN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE_PANU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_get_bdaddr ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bluetooth_get_connection_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-bond.sgml b/docs/libnm/tmpl/nm-setting-bond.sgml
deleted file mode 100644
index 25b94199..00000000
--- a/docs/libnm/tmpl/nm-setting-bond.sgml
+++ /dev/null
@@ -1,233 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBond
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_BOND_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_MIIMON ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_DOWNDELAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_UPDELAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_ARP_INTERVAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_ARP_IP_TARGET ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_ARP_VALIDATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_PRIMARY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_PRIMARY_RESELECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_FAIL_OVER_MAC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_USE_CARRIER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_AD_SELECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_RESEND_IGMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BOND_OPTION_LACP_RATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bond_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_num_options ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@out_name: 
-@out_value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_option_by_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_add_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@name: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_remove_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_validate_option ##### -->
-<para>
-
-</para>
-
-@name: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_valid_options ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bond_get_option_default ##### -->
-<para>
-
-</para>
-
-@setting: 
-@name: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-bridge-port.sgml b/docs/libnm/tmpl/nm-setting-bridge-port.sgml
deleted file mode 100644
index 7fec001b..00000000
--- a/docs/libnm/tmpl/nm-setting-bridge-port.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBridgePort
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_PATH_COST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_get_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_get_path_cost ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_port_get_hairpin_mode ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-bridge.sgml b/docs/libnm/tmpl/nm-setting-bridge.sgml
deleted file mode 100644
index 216c370a..00000000
--- a/docs/libnm/tmpl/nm-setting-bridge.sgml
+++ /dev/null
@@ -1,152 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingBridge
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_STP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_FORWARD_DELAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_HELLO_TIME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_MAX_AGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_BRIDGE_AGEING_TIME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_bridge_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_stp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_forward_delay ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_hello_time ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_max_age ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_bridge_get_ageing_time ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-cdma.sgml b/docs/libnm/tmpl/nm-setting-cdma.sgml
deleted file mode 100644
index 2f02d707..00000000
--- a/docs/libnm/tmpl/nm-setting-cdma.sgml
+++ /dev/null
@@ -1,104 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingCdma
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_NUMBER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CDMA_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_cdma_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_number ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_cdma_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-connection.sgml b/docs/libnm/tmpl/nm-setting-connection.sgml
deleted file mode 100644
index b8bb9b51..00000000
--- a/docs/libnm/tmpl/nm-setting-connection.sgml
+++ /dev/null
@@ -1,466 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MAX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_UUID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_INTERFACE_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_AUTOCONNECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_TIMESTAMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_READ_ONLY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_PERMISSIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_MASTER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_SLAVE_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_SECONDARIES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMSettingConnection ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSettingConnection:autoconnect ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:autoconnect-priority ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:gateway-ping-timeout ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:id ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:interface-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:master ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:permissions ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:read-only ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:secondaries ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:slave-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:timestamp ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:uuid ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG NMSettingConnection:zone ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION nm_setting_connection_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_uuid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_interface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_connection_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_autoconnect ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_autoconnect_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_timestamp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_read_only ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_num_permissions ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_permission ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@out_ptype: 
-@out_pitem: 
-@out_detail: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_zone ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_permissions_user_allowed ##### -->
-<para>
-
-</para>
-
-@setting: 
-@uname: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_add_permission ##### -->
-<para>
-
-</para>
-
-@setting: 
-@ptype: 
-@pitem: 
-@detail: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_remove_permission ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_remove_permission_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@ptype: 
-@pitem: 
-@detail: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_master ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_is_slave_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_slave_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_num_secondaries ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_secondary ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_add_secondary ##### -->
-<para>
-
-</para>
-
-@setting: 
-@sec_uuid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_remove_secondary ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_remove_secondary_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@sec_uuid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_connection_get_gateway_ping_timeout ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-dcb.sgml b/docs/libnm/tmpl/nm-setting-dcb.sgml
deleted file mode 100644
index be50bafa..00000000
--- a/docs/libnm/tmpl/nm-setting-dcb.sgml
+++ /dev/null
@@ -1,370 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingDcb
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_DCB_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingDcbFlags ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_DCB_FLAG_NONE: 
-@NM_SETTING_DCB_FLAG_ENABLE: 
-@NM_SETTING_DCB_FLAG_ADVERTISE: 
-@NM_SETTING_DCB_FLAG_WILLING: 
-
-<!-- ##### MACRO NM_SETTING_DCB_FCOE_MODE_FABRIC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_FCOE_MODE_VN2VN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FCOE_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FCOE_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FCOE_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_ISCSI_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_ISCSI_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FIP_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_APP_FIP_PRIORITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_FLOW_CONTROL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_GROUP_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_GROUP_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_BANDWIDTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_dcb_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fcoe_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fcoe_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fcoe_mode ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_iscsi_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_iscsi_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fip_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_app_fip_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_flow_control_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_flow_control ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_flow_control ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@enabled: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_group_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_group_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_group_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@group_id: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_group_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@group_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_group_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@group_id: 
-@bandwidth_percent: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@bandwidth_percent: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_strict_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_strict_bandwidth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@strict: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_get_priority_traffic_class ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_dcb_set_priority_traffic_class ##### -->
-<para>
-
-</para>
-
-@setting: 
-@user_priority: 
-@traffic_class: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-generic.sgml b/docs/libnm/tmpl/nm-setting-generic.sgml
deleted file mode 100644
index 339f99b5..00000000
--- a/docs/libnm/tmpl/nm-setting-generic.sgml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingGeneric
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_GENERIC_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_generic_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-gsm.sgml b/docs/libnm/tmpl/nm-setting-gsm.sgml
deleted file mode 100644
index dd801247..00000000
--- a/docs/libnm/tmpl/nm-setting-gsm.sgml
+++ /dev/null
@@ -1,184 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingGsm
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_GSM_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_NUMBER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_APN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_NETWORK_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_PIN_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_GSM_HOME_ONLY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_gsm_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_number ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_apn ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_network_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_pin ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_home_only ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_pin_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_gsm_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-infiniband.sgml b/docs/libnm/tmpl/nm-setting-infiniband.sgml
deleted file mode 100644
index b6f86e3a..00000000
--- a/docs/libnm/tmpl/nm-setting-infiniband.sgml
+++ /dev/null
@@ -1,129 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingInfiniband
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_TRANSPORT_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_P_KEY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_INFINIBAND_PARENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_transport_mode ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_p_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_parent ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_infiniband_get_virtual_interface_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-ip-config.sgml b/docs/libnm/tmpl/nm-setting-ip-config.sgml
deleted file mode 100644
index f7ae0e4a..00000000
--- a/docs/libnm/tmpl/nm-setting-ip-config.sgml
+++ /dev/null
@@ -1,781 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingIPConfig
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION nm_ip_address_new ##### -->
-<para>
-
-</para>
-
-@family: 
-@addr: 
-@prefix: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_address_new_binary ##### -->
-<para>
-
-</para>
-
-@family: 
-@addr: 
-@prefix: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_address_ref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip_address_unref ##### -->
-<para>
-
-</para>
-
-@address: 
-
-
-<!-- ##### FUNCTION nm_ip_address_equal ##### -->
-<para>
-
-</para>
-
-@address: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_address_dup ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_address_get_family ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_address_get_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_address_set_address ##### -->
-<para>
-
-</para>
-
-@address: 
-@addr: 
-
-
-<!-- ##### FUNCTION nm_ip_address_get_address_binary ##### -->
-<para>
-
-</para>
-
-@address: 
-@addr: 
-
-
-<!-- ##### FUNCTION nm_ip_address_set_address_binary ##### -->
-<para>
-
-</para>
-
-@address: 
-@addr: 
-
-
-<!-- ##### FUNCTION nm_ip_address_get_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_address_set_prefix ##### -->
-<para>
-
-</para>
-
-@address: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip_address_get_attribute_names ##### -->
-<para>
-
-</para>
-
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_address_get_attribute ##### -->
-<para>
-
-</para>
-
-@address: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_address_set_attribute ##### -->
-<para>
-
-</para>
-
-@address: 
-@name: 
-@value: 
-
-
-<!-- ##### FUNCTION nm_ip_route_new ##### -->
-<para>
-
-</para>
-
-@family: 
-@dest: 
-@prefix: 
-@next_hop: 
-@metric: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_route_new_binary ##### -->
-<para>
-
-</para>
-
-@family: 
-@dest: 
-@prefix: 
-@next_hop: 
-@metric: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_route_ref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip_route_unref ##### -->
-<para>
-
-</para>
-
-@route: 
-
-
-<!-- ##### FUNCTION nm_ip_route_equal ##### -->
-<para>
-
-</para>
-
-@route: 
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_route_dup ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_route_get_family ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_route_get_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_route_set_dest ##### -->
-<para>
-
-</para>
-
-@route: 
-@dest: 
-
-
-<!-- ##### FUNCTION nm_ip_route_get_dest_binary ##### -->
-<para>
-
-</para>
-
-@route: 
-@dest: 
-
-
-<!-- ##### FUNCTION nm_ip_route_set_dest_binary ##### -->
-<para>
-
-</para>
-
-@route: 
-@dest: 
-
-
-<!-- ##### FUNCTION nm_ip_route_get_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_route_set_prefix ##### -->
-<para>
-
-</para>
-
-@route: 
-@prefix: 
-
-
-<!-- ##### FUNCTION nm_ip_route_get_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_route_set_next_hop ##### -->
-<para>
-
-</para>
-
-@route: 
-@next_hop: 
-
-
-<!-- ##### FUNCTION nm_ip_route_get_next_hop_binary ##### -->
-<para>
-
-</para>
-
-@route: 
-@next_hop: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_route_set_next_hop_binary ##### -->
-<para>
-
-</para>
-
-@route: 
-@next_hop: 
-
-
-<!-- ##### FUNCTION nm_ip_route_get_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_route_set_metric ##### -->
-<para>
-
-</para>
-
-@route: 
-@metric: 
-
-
-<!-- ##### FUNCTION nm_ip_route_get_attribute_names ##### -->
-<para>
-
-</para>
-
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_route_get_attribute ##### -->
-<para>
-
-</para>
-
-@route: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_ip_route_set_attribute ##### -->
-<para>
-
-</para>
-
-@route: 
-@name: 
-@value: 
-
-
-<!-- ##### MACRO NM_SETTING_IP_CONFIG_METHOD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP_CONFIG_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP_CONFIG_DNS_SEARCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP_CONFIG_ADDRESSES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP_CONFIG_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP_CONFIG_ROUTE_METRIC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP_CONFIG_DHCP_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP_CONFIG_NEVER_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP_CONFIG_MAY_FAIL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_method ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_num_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_add_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_remove_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_remove_dns_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_clear_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_num_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_add_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_remove_dns_search ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_remove_dns_search_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_clear_dns_searches ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_num_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_add_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_remove_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_remove_address_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@address: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_clear_addresses ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_gateway ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_num_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_add_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_remove_route ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_remove_route_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@route: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_clear_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_route_metric ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_ignore_auto_routes ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_ignore_auto_dns ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_dhcp_hostname ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_dhcp_send_hostname ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_never_default ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip_config_get_may_fail ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-ip4-config.sgml b/docs/libnm/tmpl/nm-setting-ip4-config.sgml
deleted file mode 100644
index 4eabe034..00000000
--- a/docs/libnm/tmpl/nm-setting-ip4-config.sgml
+++ /dev/null
@@ -1,91 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingIP4Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_AUTO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_MANUAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_SHARED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP4_CONFIG_METHOD_DISABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip4_config_get_dhcp_client_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-ip6-config.sgml b/docs/libnm/tmpl/nm-setting-ip6-config.sgml
deleted file mode 100644
index 3ba20ae0..00000000
--- a/docs/libnm/tmpl/nm-setting-ip6-config.sgml
+++ /dev/null
@@ -1,108 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingIP6Config
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_IP6_PRIVACY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_IGNORE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_AUTO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_DHCP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_MANUAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_IP6_CONFIG_METHOD_SHARED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingIP6ConfigPrivacy ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR: 
-
-<!-- ##### FUNCTION nm_setting_ip6_config_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ip6_config_get_ip6_privacy ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm/tmpl/nm-setting-olpc-mesh.sgml
deleted file mode 100644
index ec682d73..00000000
--- a/docs/libnm/tmpl/nm-setting-olpc-mesh.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingOlpcMesh
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_SSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_CHANNEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_get_ssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_get_channel ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_olpc_mesh_get_dhcp_anycast_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-ppp.sgml b/docs/libnm/tmpl/nm-setting-ppp.sgml
deleted file mode 100644
index d974da0f..00000000
--- a/docs/libnm/tmpl/nm-setting-ppp.sgml
+++ /dev/null
@@ -1,328 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingPpp
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_PPP_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NOAUTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_EAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_PAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_CHAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_MSCHAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REFUSE_MSCHAPV2 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NOBSDCOMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NODEFLATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_NO_VJ_COMP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REQUIRE_MPPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_REQUIRE_MPPE_128 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_MPPE_STATEFUL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_CRTSCTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_BAUD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_MRU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_LCP_ECHO_FAILURE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPP_LCP_ECHO_INTERVAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_ppp_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_noauth ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_eap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_pap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_chap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_mschap ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_refuse_mschapv2 ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_nobsdcomp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_nodeflate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_no_vj_comp ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_require_mppe ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_require_mppe_128 ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_mppe_stateful ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_crtscts ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_baud ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_mru ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_lcp_echo_failure ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_ppp_get_lcp_echo_interval ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-pppoe.sgml b/docs/libnm/tmpl/nm-setting-pppoe.sgml
deleted file mode 100644
index 32d9e725..00000000
--- a/docs/libnm/tmpl/nm-setting-pppoe.sgml
+++ /dev/null
@@ -1,104 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingPppoe
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_SERVICE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PPPOE_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_service ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_pppoe_get_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-serial.sgml b/docs/libnm/tmpl/nm-setting-serial.sgml
deleted file mode 100644
index d713db5c..00000000
--- a/docs/libnm/tmpl/nm-setting-serial.sgml
+++ /dev/null
@@ -1,129 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingSerial
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingSerialParity ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_SERIAL_PARITY_NONE: 
-@NM_SETTING_SERIAL_PARITY_EVEN: 
-@NM_SETTING_SERIAL_PARITY_ODD: 
-
-<!-- ##### MACRO NM_SETTING_SERIAL_BAUD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_BITS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_PARITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_STOPBITS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_SERIAL_SEND_DELAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_serial_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_baud ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_bits ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_parity ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_stopbits ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_serial_get_send_delay ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-team-port.sgml b/docs/libnm/tmpl/nm-setting-team-port.sgml
deleted file mode 100644
index 809e1878..00000000
--- a/docs/libnm/tmpl/nm-setting-team-port.sgml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingTeamPort
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_PORT_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_PORT_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_team_port_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_team_port_get_config ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-team.sgml b/docs/libnm/tmpl/nm-setting-team.sgml
deleted file mode 100644
index 6c2cb1fa..00000000
--- a/docs/libnm/tmpl/nm-setting-team.sgml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingTeam
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_TEAM_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_team_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_team_get_config ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-vlan.sgml b/docs/libnm/tmpl/nm-setting-vlan.sgml
deleted file mode 100644
index 756c0399..00000000
--- a/docs/libnm/tmpl/nm-setting-vlan.sgml
+++ /dev/null
@@ -1,207 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingVlan
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_PARENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_ID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_INGRESS_PRIORITY_MAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VLAN_EGRESS_PRIORITY_MAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMVlanPriorityMap ##### -->
-<para>
-
-</para>
-
-@NM_VLAN_INGRESS_MAP: 
-@NM_VLAN_EGRESS_MAP: 
-
-<!-- ##### ENUM NMVlanFlags ##### -->
-<para>
-
-</para>
-
-@NM_VLAN_FLAG_REORDER_HEADERS: 
-@NM_VLAN_FLAG_GVRP: 
-@NM_VLAN_FLAG_LOOSE_BINDING: 
-
-<!-- ##### FUNCTION nm_setting_vlan_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_parent ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_id ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_num_priorities ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_get_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@idx: 
-@out_from: 
-@out_to: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_add_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@from: 
-@to: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_remove_priority ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_remove_priority_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@from: 
-@to: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_remove_priority_str_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@str: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_clear_priorities ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-
-
-<!-- ##### FUNCTION nm_setting_vlan_add_priority_str ##### -->
-<para>
-
-</para>
-
-@setting: 
-@map: 
-@str: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-vpn.sgml b/docs/libnm/tmpl/nm-setting-vpn.sgml
deleted file mode 100644
index 2d5e70c9..00000000
--- a/docs/libnm/tmpl/nm-setting-vpn.sgml
+++ /dev/null
@@ -1,210 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingVpn
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_VPN_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_SERVICE_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_USER_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_PERSISTENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_DATA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_VPN_SECRETS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### USER_FUNCTION NMVpnIterFunc ##### -->
-<para>
-
-</para>
-
-@key: 
-@value: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_service_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_user_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_persistent ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_num_data_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_add_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@item: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_remove_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_foreach_data_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_num_secrets ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_add_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@secret: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_get_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_remove_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_vpn_foreach_secret ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-wimax.sgml b/docs/libnm/tmpl/nm-setting-wimax.sgml
deleted file mode 100644
index a7f51a8e..00000000
--- a/docs/libnm/tmpl/nm-setting-wimax.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWimax
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIMAX_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIMAX_NETWORK_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIMAX_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wimax_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wimax_get_network_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wimax_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-wired.sgml b/docs/libnm/tmpl/nm-setting-wired.sgml
deleted file mode 100644
index 156ff4f1..00000000
--- a/docs/libnm/tmpl/nm-setting-wired.sgml
+++ /dev/null
@@ -1,324 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWired
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_PORT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_SPEED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_DUPLEX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_AUTO_NEGOTIATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_CLONED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_SUBCHANNELS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_NETTYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRED_S390_OPTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wired_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_port ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_speed ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_duplex ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_auto_negotiate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_cloned_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mac_address_blacklist ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_num_mac_blacklist_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_add_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_remove_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_remove_mac_blacklist_item_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_clear_mac_blacklist_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_subchannels ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_nettype ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_num_s390_options ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@out_key: 
-@out_value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_s390_option_by_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_add_s390_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_remove_s390_option ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wired_get_valid_s390_options ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-wireless-security.sgml b/docs/libnm/tmpl/nm-setting-wireless-security.sgml
deleted file mode 100644
index 4cb19ed3..00000000
--- a/docs/libnm/tmpl/nm-setting-wireless-security.sgml
+++ /dev/null
@@ -1,447 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWirelessSecurity
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMWepKeyType ##### -->
-<para>
-
-</para>
-
-@NM_WEP_KEY_TYPE_UNKNOWN: 
-@NM_WEP_KEY_TYPE_KEY: 
-@NM_WEP_KEY_TYPE_PASSPHRASE: 
-@NM_WEP_KEY_TYPE_LAST: 
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_KEY_MGMT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_AUTH_ALG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PROTO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PAIRWISE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_GROUP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PSK ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_key_mgmt ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_protos ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_proto ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_add_proto ##### -->
-<para>
-
-</para>
-
-@setting: 
-@proto: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_proto ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_proto_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@proto: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_protos ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_add_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@pairwise: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_pairwise_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@pairwise: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_pairwise ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_num_groups ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_group ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_add_group ##### -->
-<para>
-
-</para>
-
-@setting: 
-@group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_group ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_remove_group_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_clear_groups ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_psk ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_psk_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_username ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_password ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_leap_password_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_set_wep_key ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@key: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_tx_keyidx ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_auth_alg ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_security_get_wep_key_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-wireless.sgml b/docs/libnm/tmpl/nm-setting-wireless.sgml
deleted file mode 100644
index f20aa114..00000000
--- a/docs/libnm/tmpl/nm-setting-wireless.sgml
+++ /dev/null
@@ -1,359 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSettingWireless
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_BAND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_CHANNEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_BSSID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_RATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_TX_POWER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_SEEN_BSSIDS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_HIDDEN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MODE_ADHOC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MODE_AP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_WIRELESS_MODE_INFRA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_setting_wireless_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_ssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mode ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_band ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_channel ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_bssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_rate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_tx_power ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_cloned_mac_address ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mac_address_blacklist ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_num_mac_blacklist_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_add_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_remove_mac_blacklist_item ##### -->
-<para>
-
-</para>
-
-@setting: 
-@idx: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_remove_mac_blacklist_item_by_value ##### -->
-<para>
-
-</para>
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_clear_mac_blacklist_items ##### -->
-<para>
-
-</para>
-
-@setting: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_mtu ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_hidden ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_add_seen_bssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@bssid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_num_seen_bssids ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_get_seen_bssid ##### -->
-<para>
-
-</para>
-
-@setting: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_wireless_ap_security_compatible ##### -->
-<para>
-
-</para>
-
-@s_wireless: 
-@s_wireless_sec: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@ap_mode: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting.sgml b/docs/libnm/tmpl/nm-setting.sgml
deleted file mode 100644
index 88a4e99e..00000000
--- a/docs/libnm/tmpl/nm-setting.sgml
+++ /dev/null
@@ -1,238 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSetting
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_REQUIRED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_SECRET ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_PARAM_FUZZY_IGNORE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMSettingSecretFlags ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_SECRET_FLAG_NONE: 
-@NM_SETTING_SECRET_FLAG_AGENT_OWNED: 
-@NM_SETTING_SECRET_FLAG_NOT_SAVED: 
-@NM_SETTING_SECRET_FLAG_NOT_REQUIRED: 
-
-<!-- ##### ENUM NMSettingCompareFlags ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_COMPARE_FLAG_EXACT: 
-@NM_SETTING_COMPARE_FLAG_FUZZY: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_ID: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT: 
-@NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_TIMESTAMP: 
-
-<!-- ##### STRUCT NMSetting ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG NMSetting:name ##### -->
-<para>
-
-</para>
-
-<!-- ##### USER_FUNCTION NMSettingClearSecretsWithFlagsFn ##### -->
-<para>
-
-</para>
-
-@setting: 
-@secret: 
-@flags: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION NMSettingValueIterFn ##### -->
-<para>
-
-</para>
-
-@setting: 
-@key: 
-@value: 
-@flags: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_lookup_type ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_duplicate ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_get_name ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_verify ##### -->
-<para>
-
-</para>
-
-@setting: 
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_compare ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### ENUM NMSettingDiffResult ##### -->
-<para>
-
-</para>
-
-@NM_SETTING_DIFF_RESULT_UNKNOWN: 
-@NM_SETTING_DIFF_RESULT_IN_A: 
-@NM_SETTING_DIFF_RESULT_IN_B: 
-@NM_SETTING_DIFF_RESULT_IN_A_DEFAULT: 
-@NM_SETTING_DIFF_RESULT_IN_B_DEFAULT: 
-
-<!-- ##### FUNCTION nm_setting_diff ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@flags: 
-@invert_results: 
-@results: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_enumerate_values ##### -->
-<para>
-
-</para>
-
-@setting: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION nm_setting_to_string ##### -->
-<para>
-
-</para>
-
-@setting: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_get_secret_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@secret_name: 
-@out_flags: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_set_secret_flags ##### -->
-<para>
-
-</para>
-
-@setting: 
-@secret_name: 
-@flags: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_setting_get_dbus_property_type ##### -->
-<para>
-
-</para>
-
-@setting: 
-@property_name: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-simple-connection.sgml b/docs/libnm/tmpl/nm-simple-connection.sgml
deleted file mode 100644
index 8ef5406d..00000000
--- a/docs/libnm/tmpl/nm-simple-connection.sgml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMSimpleConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION nm_simple_connection_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_simple_connection_new_from_dbus ##### -->
-<para>
-
-</para>
-
-@dict: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_simple_connection_new_clone ##### -->
-<para>
-
-</para>
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-utils.sgml b/docs/libnm/tmpl/nm-utils.sgml
deleted file mode 100644
index 9981cc58..00000000
--- a/docs/libnm/tmpl/nm-utils.sgml
+++ /dev/null
@@ -1,578 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-utils
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION nm_utils_is_empty_ssid ##### -->
-<para>
-
-</para>
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_escape_ssid ##### -->
-<para>
-
-</para>
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_same_ssid ##### -->
-<para>
-
-</para>
-
-@ssid1: 
-@len1: 
-@ssid2: 
-@len2: 
-@ignore_trailing_null: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ssid_to_utf8 ##### -->
-<para>
-
-</para>
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-<!-- ##### ENUM NMUtilsSecurityType ##### -->
-<para>
-
-</para>
-
-@NMU_SEC_INVALID: 
-@NMU_SEC_NONE: 
-@NMU_SEC_STATIC_WEP: 
-@NMU_SEC_LEAP: 
-@NMU_SEC_DYNAMIC_WEP: 
-@NMU_SEC_WPA_PSK: 
-@NMU_SEC_WPA_ENTERPRISE: 
-@NMU_SEC_WPA2_PSK: 
-@NMU_SEC_WPA2_ENTERPRISE: 
-
-<!-- ##### FUNCTION nm_utils_security_valid ##### -->
-<para>
-
-</para>
-
-@type: 
-@wifi_caps: 
-@have_ap: 
-@adhoc: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ap_mode_security_valid ##### -->
-<para>
-
-</para>
-
-@type: 
-@wifi_caps: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wep_key_valid ##### -->
-<para>
-
-</para>
-
-@key: 
-@wep_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wpa_psk_valid ##### -->
-<para>
-
-</para>
-
-@psk: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_dns_to_variant ##### -->
-<para>
-
-</para>
-
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_dns_from_variant ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_addresses_to_variant ##### -->
-<para>
-
-</para>
-
-@addresses: 
-@gateway: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_addresses_from_variant ##### -->
-<para>
-
-</para>
-
-@value: 
-@out_gateway: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_routes_to_variant ##### -->
-<para>
-
-</para>
-
-@routes: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_routes_from_variant ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_netmask_to_prefix ##### -->
-<para>
-
-</para>
-
-@netmask: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_prefix_to_netmask ##### -->
-<para>
-
-</para>
-
-@prefix: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip4_get_default_prefix ##### -->
-<para>
-
-</para>
-
-@ip: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_dns_to_variant ##### -->
-<para>
-
-</para>
-
-@dns: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_dns_from_variant ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_addresses_to_variant ##### -->
-<para>
-
-</para>
-
-@addresses: 
-@gateway: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_addresses_from_variant ##### -->
-<para>
-
-</para>
-
-@value: 
-@out_gateway: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_routes_to_variant ##### -->
-<para>
-
-</para>
-
-@routes: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip6_routes_from_variant ##### -->
-<para>
-
-</para>
-
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip_addresses_to_variant ##### -->
-<para>
-
-</para>
-
-@addresses: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip_addresses_from_variant ##### -->
-<para>
-
-</para>
-
-@value: 
-@family: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip_routes_to_variant ##### -->
-<para>
-
-</para>
-
-@routes: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ip_routes_from_variant ##### -->
-<para>
-
-</para>
-
-@value: 
-@family: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_uuid_generate ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_file_is_certificate ##### -->
-<para>
-
-</para>
-
-@filename: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_file_is_private_key ##### -->
-<para>
-
-</para>
-
-@filename: 
-@out_encrypted: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_file_is_pkcs12 ##### -->
-<para>
-
-</para>
-
-@filename: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION NMUtilsFileSearchInPathsPredicate ##### -->
-<para>
-
-</para>
-
-@filename: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_file_search_in_paths ##### -->
-<para>
-
-</para>
-
-@progname: 
-@try_first: 
-@paths: 
-@file_test_flags: 
-@predicate: 
-@user_data: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_freq_to_channel ##### -->
-<para>
-
-</para>
-
-@freq: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_channel_to_freq ##### -->
-<para>
-
-</para>
-
-@channel: 
-@band: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_find_next_channel ##### -->
-<para>
-
-</para>
-
-@channel: 
-@direction: 
-@band: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_is_channel_valid ##### -->
-<para>
-
-</para>
-
-@channel: 
-@band: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_wifi_strength_bars ##### -->
-<para>
-
-</para>
-
-@strength: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_UTILS_HWADDR_LEN_MAX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_len ##### -->
-<para>
-
-</para>
-
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_ntoa ##### -->
-<para>
-
-</para>
-
-@addr: 
-@length: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_atoba ##### -->
-<para>
-
-</para>
-
-@asc: 
-@length: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_aton ##### -->
-<para>
-
-</para>
-
-@asc: 
-@buffer: 
-@length: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_valid ##### -->
-<para>
-
-</para>
-
-@asc: 
-@length: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_canonical ##### -->
-<para>
-
-</para>
-
-@asc: 
-@length: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hwaddr_matches ##### -->
-<para>
-
-</para>
-
-@hwaddr1: 
-@hwaddr1_len: 
-@hwaddr2: 
-@hwaddr2_len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_bin2hexstr ##### -->
-<para>
-
-</para>
-
-@src: 
-@len: 
-@final_len: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_hexstr2bin ##### -->
-<para>
-
-</para>
-
-@hex: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_iface_valid_name ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_is_uuid ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
-
-<!-- ##### MACRO NM_UTILS_INET_ADDRSTRLEN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_utils_inet4_ntop ##### -->
-<para>
-
-</para>
-
-@inaddr: 
-@dst: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_inet6_ntop ##### -->
-<para>
-
-</para>
-
-@in6addr: 
-@dst: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_ipaddr_valid ##### -->
-<para>
-
-</para>
-
-@family: 
-@ip: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_utils_check_virtual_device_compatibility ##### -->
-<para>
-
-</para>
-
-@virtual_type: 
-@other_type: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-version.sgml b/docs/libnm/tmpl/nm-version.sgml
deleted file mode 100644
index c27d75bd..00000000
--- a/docs/libnm/tmpl/nm-version.sgml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-version
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_MAJOR_VERSION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_MINOR_VERSION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_MICRO_VERSION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_CHECK_VERSION ##### -->
-<para>
-
-</para>
-
-@major: 
-@minor: 
-@micro: 
-
-
-<!-- ##### MACRO NM_ENCODE_VERSION ##### -->
-<para>
-
-</para>
-
-@major: 
-@minor: 
-@micro: 
-
-
-<!-- ##### MACRO NM_VERSION_0_9_8 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VERSION_0_9_10 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VERSION_1_0 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VERSION_CUR_STABLE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VERSION_NEXT_STABLE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VERSION_MIN_REQUIRED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VERSION_MAX_ALLOWED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEPRECATED_IN_0_9_10 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEPRECATED_IN_0_9_10_FOR ##### -->
-<para>
-
-</para>
-
-@f: 
-
-
-<!-- ##### MACRO NM_DEPRECATED_IN_1_0 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DEPRECATED_IN_1_0_FOR ##### -->
-<para>
-
-</para>
-
-@f: 
-
-
-<!-- ##### MACRO NM_AVAILABLE_IN_0_9_10 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_AVAILABLE_IN_1_0 ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/docs/libnm/tmpl/nm-vpn-connection.sgml b/docs/libnm/tmpl/nm-vpn-connection.sgml
deleted file mode 100644
index 33b7ef29..00000000
--- a/docs/libnm/tmpl/nm-vpn-connection.sgml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMVpnConnection
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_VPN_CONNECTION_VPN_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_CONNECTION_BANNER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION nm_vpn_connection_get_vpn_state ##### -->
-<para>
-
-</para>
-
-@vpn: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_connection_get_banner ##### -->
-<para>
-
-</para>
-
-@vpn: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-vpn-dbus-interface.sgml b/docs/libnm/tmpl/nm-vpn-dbus-interface.sgml
deleted file mode 100644
index c4a88fe3..00000000
--- a/docs/libnm/tmpl/nm-vpn-dbus-interface.sgml
+++ /dev/null
@@ -1,484 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-vpn-dbus-interface
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_DBUS_PATH_VPN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_VPN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_PATH_VPN_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INTERFACE_VPN_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_DBUS_PLUGIN_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_DBUS_PLUGIN_INTERFACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_NO_ACTIVE_VPN_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_NO_VPN_CONNECTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_INVALID_VPN_CONNECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_ERROR_PREFIX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_STARTING_IN_PROGRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_ALREADY_STARTED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_STOPPING_IN_PROGRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_ALREADY_STOPPED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_WRONG_STATE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_BAD_ARGUMENTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_LOGIN_BANNER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_LOGIN_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_CONNECT_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_STATE_CHANGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_DBUS_VPN_SIGNAL_IP4_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMVpnServiceState ##### -->
-<para>
-
-</para>
-
-@NM_VPN_SERVICE_STATE_UNKNOWN: 
-@NM_VPN_SERVICE_STATE_INIT: 
-@NM_VPN_SERVICE_STATE_SHUTDOWN: 
-@NM_VPN_SERVICE_STATE_STARTING: 
-@NM_VPN_SERVICE_STATE_STARTED: 
-@NM_VPN_SERVICE_STATE_STOPPING: 
-@NM_VPN_SERVICE_STATE_STOPPED: 
-
-<!-- ##### ENUM NMVpnConnectionState ##### -->
-<para>
-
-</para>
-
-@NM_VPN_CONNECTION_STATE_UNKNOWN: 
-@NM_VPN_CONNECTION_STATE_PREPARE: 
-@NM_VPN_CONNECTION_STATE_NEED_AUTH: 
-@NM_VPN_CONNECTION_STATE_CONNECT: 
-@NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: 
-@NM_VPN_CONNECTION_STATE_ACTIVATED: 
-@NM_VPN_CONNECTION_STATE_FAILED: 
-@NM_VPN_CONNECTION_STATE_DISCONNECTED: 
-
-<!-- ##### ENUM NMVpnConnectionStateReason ##### -->
-<para>
-
-</para>
-
-@NM_VPN_CONNECTION_STATE_REASON_UNKNOWN: 
-@NM_VPN_CONNECTION_STATE_REASON_NONE: 
-@NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED: 
-@NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED: 
-@NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID: 
-@NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED: 
-@NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS: 
-@NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED: 
-@NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED: 
-
-<!-- ##### ENUM NMVpnPluginFailure ##### -->
-<para>
-
-</para>
-
-@NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED: 
-@NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED: 
-@NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG: 
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_TUNDEV ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_BANNER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_HAS_IP4 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CONFIG_HAS_IP6 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_CAN_PERSIST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_PTP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_PREFIX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_NBNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_MSS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_BANNER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_MTU ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_PTP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_PREFIX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_DNS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_MSS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_ROUTES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/docs/libnm/tmpl/nm-vpn-editor-plugin.sgml b/docs/libnm/tmpl/nm-vpn-editor-plugin.sgml
deleted file mode 100644
index a945515b..00000000
--- a/docs/libnm/tmpl/nm-vpn-editor-plugin.sgml
+++ /dev/null
@@ -1,169 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMVpnEditor
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### USER_FUNCTION NMVpnEditorPluginFactory ##### -->
-<para>
-
-</para>
-
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_editor_plugin_factory ##### -->
-<para>
-
-</para>
-
-@error: 
-@Returns: 
-
-
-<!-- ##### ENUM NMVpnEditorPluginCapability ##### -->
-<para>
-
-</para>
-
-@NM_VPN_EDITOR_PLUGIN_CAPABILITY_NONE: 
-@NM_VPN_EDITOR_PLUGIN_CAPABILITY_IMPORT: 
-@NM_VPN_EDITOR_PLUGIN_CAPABILITY_EXPORT: 
-@NM_VPN_EDITOR_PLUGIN_CAPABILITY_IPV6: 
-
-<!-- ##### MACRO NM_VPN_EDITOR_PLUGIN_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_EDITOR_PLUGIN_DESCRIPTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_VPN_EDITOR_PLUGIN_SERVICE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT NMVpnEditorPluginInterface ##### -->
-<para>
-
-</para>
-
-@g_iface: 
-@get_editor: 
-@get_capabilities: 
-@import_from_file: 
-@export_to_file: 
-@get_suggested_filename: 
-
-<!-- ##### FUNCTION nm_vpn_editor_plugin_get_editor ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_editor_plugin_get_capabilities ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_editor_plugin_import ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@path: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_editor_plugin_export ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@path: 
-@connection: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_editor_plugin_get_suggested_filename ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@connection: 
-@Returns: 
-
-
-<!-- ##### STRUCT NMVpnEditorInterface ##### -->
-<para>
-
-</para>
-
-@g_iface: 
-@get_widget: 
-@placeholder: 
-@update_connection: 
-@changed: 
-
-<!-- ##### FUNCTION nm_vpn_editor_get_widget ##### -->
-<para>
-
-</para>
-
-@editor: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_vpn_editor_update_connection ##### -->
-<para>
-
-</para>
-
-@editor: 
-@connection: 
-@error: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-wimax-nsp.sgml b/docs/libnm/tmpl/nm-wimax-nsp.sgml
deleted file mode 100644
index ceb02601..00000000
--- a/docs/libnm/tmpl/nm-wimax-nsp.sgml
+++ /dev/null
@@ -1,102 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-NMWimaxNsp
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO NM_WIMAX_NSP_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_WIMAX_NSP_SIGNAL_QUALITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_WIMAX_NSP_NETWORK_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM NMWimaxNspNetworkType ##### -->
-<para>
-
-</para>
-
-@NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN: 
-@NM_WIMAX_NSP_NETWORK_TYPE_HOME: 
-@NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: 
-@NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: 
-
-<!-- ##### FUNCTION nm_wimax_nsp_get_name ##### -->
-<para>
-
-</para>
-
-@nsp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_wimax_nsp_get_signal_quality ##### -->
-<para>
-
-</para>
-
-@nsp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_wimax_nsp_get_network_type ##### -->
-<para>
-
-</para>
-
-@nsp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_wimax_nsp_filter_connections ##### -->
-<para>
-
-</para>
-
-@nsp: 
-@connections: 
-@Returns: 
-
-
-<!-- ##### FUNCTION nm_wimax_nsp_connection_valid ##### -->
-<para>
-
-</para>
-
-@nsp: 
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index 6d7de6e6..ee90284c 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.0.2
+1.0.4