Imported Upstream version 1.1.93 upstream/1.1.93

author: Michael Biebl <biebl@debian.org> 2016-04-06 00:46:19 +0200
committer: Michael Biebl <biebl@debian.org> 2016-04-06 00:46:19 +0200
commit: 2bfb3eb7d0323e69affca154395f51d8b577414d (patch)
tree: e3130a5146441296df6d08a0f4ac7222a854c8f8 /docs/api
parent: d9c99a29a0d3384c9c3d2adce430f5cb1134ab6a (diff)
50 files changed, 4138 insertions, 1038 deletions
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 666bad00..aeba9d29 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -3,13 +3,6 @@ AUTOMAKE_OPTIONS = 1.7
 XSLTPROC = xsltproc --xinclude --nonet
 XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml)
 
-OTHER_FILES= \
-	$(top_builddir)/introspection/all.xml \
-	$(top_srcdir)/introspection/generic-types.xml \
-	$(top_srcdir)/introspection/errors.xml \
-	$(top_srcdir)/introspection/vpn-errors.xml \
-	$(top_srcdir)/introspection/generic-types.xml
-
 GENERATED_FILES =
 
 if SETTING_DOCS_AVAILABLE
@@ -47,11 +40,6 @@ MKHTML_OPTIONS=--path="$(abs_srcdir)"
 
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
 content_files = \
-	version.xml \
-	../../COPYING \
-	$(NULL)
-
-expand_content_files = \
 	$(top_builddir)/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
 	$(top_builddir)/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
 	$(top_builddir)/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
@@ -85,12 +73,21 @@ expand_content_files = \
 	$(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
 	$(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
 	$(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
+	$(top_builddir)/man/nmcli.xml \
+	$(top_builddir)/man/nmtui.xml \
+	$(top_builddir)/man/nm-online.xml \
 	$(top_builddir)/man/NetworkManager.xml \
 	$(top_builddir)/man/NetworkManager.conf.xml \
 	$(top_builddir)/man/nmcli-examples.xml \
 	$(top_builddir)/man/nm-settings.xml \
 	$(top_builddir)/man/nm-settings-keyfile.xml \
-	$(top_builddir)/man/nm-settings-ifcfg-rh.xml
+	version.xml \
+	../../COPYING \
+	$(NULL)
+
+if CONFIG_PLUGIN_IFCFG_RH
+content_files += $(top_builddir)/man/nm-settings-ifcfg-rh.xml
+endif
 
 include $(top_srcdir)/gtk-doc.make
 
diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in
index 6a510fef..bccad102 100644
--- a/docs/api/Makefile.in
+++ b/docs/api/Makefile.in
@@ -94,7 +94,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @SETTING_DOCS_AVAILABLE_TRUE@am__append_1 = settings-spec.xml
-@BUILD_SETTING_DOCS_TRUE@am__append_2 = settings-spec.xml
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_2 = $(top_builddir)/man/nm-settings-ifcfg-rh.xml
+@BUILD_SETTING_DOCS_TRUE@am__append_3 = settings-spec.xml
 subdir = docs/api
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
@@ -406,13 +407,6 @@ with_valgrind = @with_valgrind@
 AUTOMAKE_OPTIONS = 1.7
 XSLTPROC = xsltproc --xinclude --nonet
 XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml)
-OTHER_FILES = \
-	$(top_builddir)/introspection/all.xml \
-	$(top_srcdir)/introspection/generic-types.xml \
-	$(top_srcdir)/introspection/errors.xml \
-	$(top_srcdir)/introspection/vpn-errors.xml \
-	$(top_srcdir)/introspection/generic-types.xml
-
 GENERATED_FILES = $(am__append_1)
 
 ####################################
@@ -434,13 +428,7 @@ MKTMPL_OPTIONS =
 MKHTML_OPTIONS = --path="$(abs_srcdir)"
 
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
-content_files = \
-	version.xml \
-	../../COPYING \
-	$(NULL)
-
-expand_content_files = \
-	$(top_builddir)/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
+content_files = $(top_builddir)/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
 	$(top_builddir)/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
 	$(top_builddir)/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
 	$(top_builddir)/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
@@ -473,13 +461,14 @@ expand_content_files = \
 	$(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
 	$(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
 	$(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
+	$(top_builddir)/man/nmcli.xml $(top_builddir)/man/nmtui.xml \
+	$(top_builddir)/man/nm-online.xml \
 	$(top_builddir)/man/NetworkManager.xml \
 	$(top_builddir)/man/NetworkManager.conf.xml \
 	$(top_builddir)/man/nmcli-examples.xml \
 	$(top_builddir)/man/nm-settings.xml \
-	$(top_builddir)/man/nm-settings-keyfile.xml \
-	$(top_builddir)/man/nm-settings-ifcfg-rh.xml
-
+	$(top_builddir)/man/nm-settings-keyfile.xml version.xml \
+	../../COPYING $(NULL) $(am__append_2)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
@@ -524,7 +513,7 @@ REPORT_FILES = \
 CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
 	gtkdoc-check.test html/* tmpl/* xml/* \
 	NetworkManager-sections.txt NetworkManager-overrides.txt \
-	$(am__append_2)
+	$(am__append_3)
 @GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
 @GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
 @GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index 5049ecfe..6823dddb 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -37,7 +37,7 @@
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.5"></a><h2>Description</h2>
+<a name="id-1.4.6.5"></a><h2>Description</h2>
 <p><code class="literal">NetworkManager.conf</code> is the configuration file for NetworkManager. It is used
     to set up various aspects of NetworkManager's behavior. The
     location of the main file and configuration directories may be changed
@@ -66,7 +66,7 @@
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.6"></a><h2>File Format</h2>
+<a name="id-1.4.6.6"></a><h2>File Format</h2>
 <p>
       The configuration file format is so-called key file (sort of
       ini-style format).  It consists of sections (groups) of
@@ -103,7 +103,7 @@ plugins-=remove-me
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.7"></a><h2>
+<a name="id-1.4.6.7"></a><h2>
 <code class="literal">main</code> section</h2>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
@@ -148,7 +148,13 @@ plugins-=remove-me
         the connection files at startup, and when explicitly requested
         via the ReloadConnections D-Bus call. If this key is set to
         '<code class="literal">true</code>', then NetworkManager will reload
-        connection files any time they changed.</p></td>
+        connection files any time they changed.
+        Automatic reloading is not advised because there are race conditions
+        involved and it depends on the way how the editor updates the file.
+        In some situations, NetworkManager might first delete and add the
+        connection anew, instead of updating the existing one. Also, NetworkManager
+        might pick up incomplete settings while the user is still editing the files.
+        </p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="varname">auth-polkit</code></span></p></td>
@@ -324,7 +330,7 @@ no-auto-default=*
           sensitive information such as passwords or configuration settings.
         </p>
 <p>
-          <code class="literal">fatal-warnings</code>: set <code class="function">g_log_set_always_fatal()</code>
+          <code class="literal">fatal-warnings</code>: set g_log_set_always_fatal()
           to core dump on warning messages from glib. This is equivalent
           to the --g-fatal-warnings command line option.
         </p>
@@ -334,7 +340,7 @@ no-auto-default=*
 </table></div>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.8"></a><h2>
+<a name="id-1.4.6.8"></a><h2>
 <code class="literal">keyfile</code> section</h2>
 <p>This section contains keyfile-plugin-specific options, and
     is normally only used when you are not using any other
@@ -386,7 +392,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.9"></a><h2>
+<a name="id-1.4.6.9"></a><h2>
 <code class="literal">ifupdown</code> section</h2>
 <p>This section contains ifupdown-specific options and thus only
     has effect when using the <code class="literal">ifupdown</code> plugin.</p>
@@ -420,7 +426,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.10"></a><h2>
+<a name="id-1.4.6.10"></a><h2>
 <code class="literal">logging</code> section</h2>
 <p>This section controls NetworkManager's logging.  Any
     settings here are overridden by the <code class="option">--log-level</code>
@@ -493,7 +499,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.11"></a><h2>
+<a name="id-1.4.6.11"></a><h2>
 <code class="literal">connection</code> section</h2>
 <p>Specify default values for connections.
     </p>
@@ -507,7 +513,7 @@ ipv6.ip6-privacy=0
 <p>
     </p>
 <div class="refsect2">
-<a name="id-1.4.3.11.4"></a><h3>Supported Properties</h3>
+<a name="id-1.4.6.11.4"></a><h3>Supported Properties</h3>
 <p>
       Not all properties can be overwritten, only the following
       properties are supported to have their default values configured
@@ -576,7 +582,7 @@ ipv6.ip6-privacy=0
 </div>
 <hr>
 <div class="refsect2">
-<a name="id-1.4.3.11.5"></a><h3>Sections</h3>
+<a name="id-1.4.6.11.5"></a><h3>Sections</h3>
 <p>
         You can configure multiple <code class="literal">connection</code>
         sections, by having different sections with a name that all start
@@ -654,7 +660,7 @@ ipv6.ip6-privacy=1
 </div>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.12"></a><h2>
+<a name="id-1.4.6.12"></a><h2>
 <code class="literal">connectivity</code> section</h2>
 <p>This section controls NetworkManager's optional connectivity
     checking functionality.  This allows NetworkManager to detect
@@ -700,7 +706,7 @@ ipv6.ip6-privacy=1
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.13"></a><h2>
+<a name="id-1.4.6.13"></a><h2>
 <code class="literal">global-dns</code> section</h2>
 <p>This section specifies global DNS settings that override
     connection-specific configuration.</p>
@@ -730,7 +736,7 @@ ipv6.ip6-privacy=1
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.14"></a><h2>
+<a name="id-1.4.6.14"></a><h2>
 <code class="literal">global-dns-domain</code> sections</h2>
 <p>Sections with a name starting with the "global-dns-domain-"
     prefix allow to define global DNS configuration for specific
@@ -766,7 +772,7 @@ ipv6.ip6-privacy=1
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.15"></a><h2>
+<a name="id-1.4.6.15"></a><h2>
 <code class="literal">.config</code> sections</h2>
 <p>This is a special section that contains options which apply
       to the configuration file that contains the option.
@@ -869,7 +875,7 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.16"></a><h2>Plugins</h2>
+<a name="id-1.4.6.16"></a><h2>Plugins</h2>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -953,7 +959,7 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
 </table></div>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.17"></a><h2>Appendix</h2>
+<a name="id-1.4.6.17"></a><h2>Appendix</h2>
 <div class="refsect2">
 <a name="device-spec"></a><h3>Device List Format</h3>
 <p>
@@ -1042,11 +1048,11 @@ interface-name:vboxnet*,except:interface-name:vboxnet2
 </div>
 </div>
 <div class="refsect1">
-<a name="id-1.4.3.18"></a><h2>See Also</h2>
+<a name="id-1.4.6.18"></a><h2>See Also</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">NetworkManager</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">nmcli</span>(1)</span>,
-      <span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(5)</span>,
+      <span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(7)</span>,
       <span class="citerefentry"><span class="refentrytitle">nm-online</span>(1)</span>,
       <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span>,
       <span class="citerefentry"><span class="refentrytitle">nm-applet</span>(1)</span>,
diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index d076d1ec..d210c50e 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -43,6 +43,9 @@
       <sub name="Secret flag types" link="secrets-flags.html"/>
     </sub>
     <sub name="UNIX Manual Pages" link="manpages.html">
+      <sub name="nmcli" link="nmcli.html"/>
+      <sub name="nmtui" link="nmtui.html"/>
+      <sub name="nm-online" link="nm-online.html"/>
       <sub name="NetworkManager" link="NetworkManager.html"/>
       <sub name="NetworkManager.conf" link="NetworkManager.conf.html"/>
       <sub name="nmcli-examples" link="nmcli-examples.html"/>
diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html
index f12e5b55..5f08219e 100644
--- a/docs/api/html/NetworkManager.html
+++ b/docs/api/html/NetworkManager.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 API Reference Manual">
 <link rel="up" href="manpages.html" title="UNIX Manual Pages">
-<link rel="prev" href="manpages.html" title="UNIX Manual Pages">
+<link rel="prev" href="nm-online.html" title="nm-online">
 <link rel="next" href="NetworkManager.conf.html" title="NetworkManager.conf">
 <meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -16,7 +16,7 @@
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="manpages.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="manpages.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="nm-online.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="NetworkManager.conf.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
@@ -33,7 +33,7 @@
 <div class="cmdsynopsis"><p><code class="command">NetworkManager [OPTIONS...]</code> </p></div>
 </div>
 <div class="refsect1">
-<a name="id-1.4.2.5"></a><h2>Description</h2>
+<a name="id-1.4.5.5"></a><h2>Description</h2>
 <p>
       The NetworkManager daemon attempts to make networking
       configuration and operation as painless and automatic as
@@ -48,7 +48,7 @@
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.2.6"></a><h2>Dispatcher scripts</h2>
+<a name="id-1.4.5.6"></a><h2>Dispatcher scripts</h2>
 <p>
       NetworkManager will execute scripts in the
       /etc/NetworkManager/dispatcher.d directory or subdirectories in
@@ -296,7 +296,7 @@
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.2.7"></a><h2>Options</h2>
+<a name="id-1.4.5.7"></a><h2>Options</h2>
 <p>The following options are understood:</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
@@ -389,7 +389,7 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="id-1.4.2.8"></a><h2>UDEV PROPERTIES</h2>
+<a name="id-1.4.5.8"></a><h2>UDEV PROPERTIES</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">udev</span>(7)</span>
       device manager is used for the network device discovery. The following
@@ -420,7 +420,7 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="id-1.4.2.9"></a><h2>SIGNALS</h2>
+<a name="id-1.4.5.9"></a><h2>SIGNALS</h2>
 <p>
       NetworkManager process handles the following signals:
       </p>
@@ -458,7 +458,7 @@
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.2.10"></a><h2>DEBUGGING</h2>
+<a name="id-1.4.5.10"></a><h2>DEBUGGING</h2>
 <p>
       The following environment variables are supported to help
       debugging.  When used in conjunction with the
@@ -475,11 +475,11 @@
     </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.2.11"></a><h2>See Also</h2>
+<a name="id-1.4.5.11"></a><h2>See Also</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">NetworkManager.conf</span>(5)</span>,
       <span class="citerefentry"><span class="refentrytitle">nmcli</span>(1)</span>,
-      <span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(5)</span>,
+      <span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(7)</span>,
       <span class="citerefentry"><span class="refentrytitle">nm-online</span>(1)</span>,
       <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span>,
       <span class="citerefentry"><span class="refentrytitle">nm-applet</span>(1)</span>,
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
index 555898aa..6156a6f4 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
@@ -85,7 +85,10 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 Flags  readable   u
 </pre>
-<p>Flags describing the capabilities of the access point.</p>
+<p>        Flags describing the capabilities of the access point.
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211ApFlags">NM80211ApFlags</a>
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -93,7 +96,11 @@ Flags  readable   u
 <pre class="programlisting">
 WpaFlags  readable   u
 </pre>
-<p>Flags describing the access point's capabilities according to WPA (Wifi Protected Access).</p>
+<p>        Flags describing the access point's capabilities according to WPA (Wifi
+        Protected Access).
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211ApSecurityFlags">NM80211ApSecurityFlags</a>
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -101,7 +108,11 @@ WpaFlags  readable   u
 <pre class="programlisting">
 RsnFlags  readable   u
 </pre>
-<p>Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.</p>
+<p>        Flags describing the access point's capabilities according to the RSN
+        (Robust Secure Network) protocol.
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211ApSecurityFlags">NM80211ApSecurityFlags</a>
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -109,7 +120,8 @@ RsnFlags  readable   u
 <pre class="programlisting">
 Ssid  readable   ay
 </pre>
-<p>The Service Set Identifier identifying the access point.</p>
+<p>        The Service Set Identifier identifying the access point.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -117,7 +129,8 @@ Ssid  readable   ay
 <pre class="programlisting">
 Frequency  readable   u
 </pre>
-<p>The radio channel frequency in use by the access point, in MHz.</p>
+<p>        The radio channel frequency in use by the access point, in MHz.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -125,7 +138,8 @@ Frequency  readable   u
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>The hardware address (BSSID) of the access point.</p>
+<p>        The hardware address (BSSID) of the access point.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -133,7 +147,10 @@ HwAddress  readable   s
 <pre class="programlisting">
 Mode  readable   u
 </pre>
-<p>Describes the operating mode of the access point.</p>
+<p>        Describes the operating mode of the access point.
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211Mode">NM80211Mode</a>
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -141,7 +158,9 @@ Mode  readable   u
 <pre class="programlisting">
 MaxBitrate  readable   u
 </pre>
-<p>The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).</p>
+<p>        The maximum bitrate this access point is capable of, in kilobits/second
+        (Kb/s).
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -149,7 +168,8 @@ MaxBitrate  readable   u
 <pre class="programlisting">
 Strength  readable   y
 </pre>
-<p>The current signal quality of the access point, in percent.</p>
+<p>        The current signal quality of the access point, in percent.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -157,7 +177,10 @@ Strength  readable   y
 <pre class="programlisting">
 LastSeen  readable   i
 </pre>
-<p>The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access         point was found in scan results.  A value of -1 means the access point         has never been found in scan results.</p>
+<p>        The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access
+        point was found in scan results. A value of -1 means the access point has
+        never been found in scan results.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
index b1602bcf..c11ce86b 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
@@ -47,11 +47,13 @@
 <div class="refsect1">
 <a name="gdbus-methods-org.freedesktop.NetworkManager.AgentManager"></a><h2>Method Details</h2>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-AgentManager.Register"></a><h3>The <code class="function">Register()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-AgentManager.Register"></a><h3>The Register() method</h3>
 <pre class="programlisting">
 Register (IN  s identifier);
 </pre>
-<p>Called by secret Agents to register their ability to provide and save         network secrets.</p>
+<p>        Called by secret Agents to register their ability to provide and save
+        network secrets.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -59,18 +61,19 @@ Register (IN  s identifier);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">IN s <em class="parameter"><code>identifier</code></em></code>:</span></p></td>
-<td><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][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></td>
+<td><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][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></td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-AgentManager.RegisterWithCapabilities"></a><h3>The <code class="function">RegisterWithCapabilities()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-AgentManager.RegisterWithCapabilities"></a><h3>The RegisterWithCapabilities() method</h3>
 <pre class="programlisting">
 RegisterWithCapabilities (IN  s identifier,
                           IN  u capabilities);
 </pre>
-<p>Like <code class="function">Register()</code> but indicates agent capabilities to NetworkManager.</p>
+<p>        Like Register() but indicates agent capabilities to NetworkManager.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -79,22 +82,25 @@ RegisterWithCapabilities (IN  s identifier,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">IN s <em class="parameter"><code>identifier</code></em></code>:</span></p></td>
-<td><p>See the <code class="function">Register()</code> method's identifier argument.</p></td>
+<td><p>See the Register() method's identifier argument.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN u <em class="parameter"><code>capabilities</code></em></code>:</span></p></td>
-<td><p>Indicates various agent capabilities to NetworkManager.</p></td>
+<td><p>(<a href="https://developer.gnome.org/libnm-glib/0.9/NMSecretAgent.html#NMSecretAgentCapabilities">NMSecretAgentCapabilities</a>) Indicates various agent capabilities to NetworkManager.</p></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-AgentManager.Unregister"></a><h3>The <code class="function">Unregister()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-AgentManager.Unregister"></a><h3>The Unregister() method</h3>
 <pre class="programlisting">
 Unregister ();
 </pre>
-<p>Called by secret Agents to notify NetworkManager that they will no         longer handle requests for network secrets.  Agents are automatically         unregistered when they disconnect from D-Bus.</p>
+<p>        Called by secret Agents to notify NetworkManager that they will no longer
+        handle requests for network secrets. Agents are automatically unregistered
+        when they disconnect from D-Bus.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
index 5d4db35f..cb21000b 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
@@ -61,7 +61,21 @@
 </div>
 <div class="refsect1">
 <a name="gdbus-interface-org-freedesktop-NetworkManager-Connection-Active"></a><h2>Description</h2>
-<p>Objects that implement the Connection.Active interface represent an attempt       to connect to a network using the details provided by a Connection object.       The Connection.Active object tracks the life-cycle of the connection       attempt and if successful indicates whether the connected network is the       "default" or preferred network for access.       NetworkManager has the concept of connections, which can be thought of as       settings, a profile or a configuration that can be applied on a networking       device.       Such settings-connections are exposed as D-Bus object and the active-connection       expresses this relationship between device and settings-connection.       At any time a settings-connection can only be activated on one device and vice       versa. However, during activation and deactivation multiple active-connections       can reference the same device or settings-connection as they are waiting to       be activated or to be deactivated.</p>
+<p>      Objects that implement the Connection.Active interface represent an
+      attempt to connect to a network using the details provided by a Connection
+      object. The Connection.Active object tracks the life-cycle of the
+      connection attempt and if successful indicates whether the connected
+      network is the "default" or preferred network for access. NetworkManager
+      has the concept of connections, which can be thought of as settings, a
+      profile or a configuration that can be applied on a networking device.
+      Such settings-connections are exposed as D-Bus object and the
+      active-connection expresses this relationship between device and
+      settings-connection. At any time a settings-connection can only be
+      activated on one device and vice versa. However, during activation and
+      deactivation multiple active-connections can reference the same device or
+      settings-connection as they are waiting to be activated or to be
+      deactivated.
+</p>
 </div>
 <div class="refsect1">
 <a name="gdbus-signals-org.freedesktop.NetworkManager.Connection.Active"></a><h2>Signal Details</h2>
@@ -90,7 +104,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 Connection  readable   o
 </pre>
-<p>The path of the connection.</p>
+<p>        The path of the connection.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -98,7 +113,10 @@ Connection  readable   o
 <pre class="programlisting">
 SpecificObject  readable   o
 </pre>
-<p>A specific object associated with the active connection.  This property         reflects the specific object used during connection activation, and will         not change over the lifetime of the ActiveConnection once set.</p>
+<p>        A specific object associated with the active connection. This property
+        reflects the specific object used during connection activation, and will
+        not change over the lifetime of the ActiveConnection once set.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -106,7 +124,9 @@ SpecificObject  readable   o
 <pre class="programlisting">
 Id  readable   s
 </pre>
-<p>The ID of the connection, provided as a convenience so that clients         do not have to retrieve all connection details.</p>
+<p>        The ID of the connection, provided as a convenience so that clients do not
+        have to retrieve all connection details.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -114,7 +134,9 @@ Id  readable   s
 <pre class="programlisting">
 Uuid  readable   s
 </pre>
-<p>The UUID of the connection, provided as a convenience so that clients         do not have to retrieve all connection details.</p>
+<p>        The UUID of the connection, provided as a convenience so that clients do
+        not have to retrieve all connection details.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -122,7 +144,9 @@ Uuid  readable   s
 <pre class="programlisting">
 Type  readable   s
 </pre>
-<p>The type of the connection, provided as a convenience so that clients         do not have to retrieve all connection details.</p>
+<p>        The type of the connection, provided as a convenience so that clients do
+        not have to retrieve all connection details.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -130,7 +154,9 @@ Type  readable   s
 <pre class="programlisting">
 Devices  readable   ao
 </pre>
-<p>Array of object paths representing devices which are part of this active         connection.</p>
+<p>        Array of object paths representing devices which are part of this active
+        connection.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -138,7 +164,10 @@ Devices  readable   ao
 <pre class="programlisting">
 State  readable   u
 </pre>
-<p>The state of this active connection.</p>
+<p>        The state of this active connection.
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMActiveConnectionState">NMActiveConnectionState</a>
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -146,7 +175,9 @@ State  readable   u
 <pre class="programlisting">
 Default  readable   b
 </pre>
-<p>Whether this active connection is the default IPv4 connection, i.e.         whether it currently owns the default IPv4 route.</p>
+<p>        Whether this active connection is the default IPv4 connection, i.e.
+        whether it currently owns the default IPv4 route.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -154,7 +185,10 @@ Default  readable   b
 <pre class="programlisting">
 Ip4Config  readable   o
 </pre>
-<p>Object path of the Ip4Config object describing the configuration of the         connection. Only valid when the connection is in the         NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.</p>
+<p>        Object path of the Ip4Config object describing the configuration of the
+        connection. Only valid when the connection is in the
+        NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -162,7 +196,10 @@ Ip4Config  readable   o
 <pre class="programlisting">
 Dhcp4Config  readable   o
 </pre>
-<p>Object path of the Dhcp4Config object describing the DHCP options         returned by the DHCP server (assuming the connection used DHCP). Only         valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED         state.</p>
+<p>        Object path of the Dhcp4Config object describing the DHCP options returned
+        by the DHCP server (assuming the connection used DHCP). Only valid when
+        the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -170,7 +207,9 @@ Dhcp4Config  readable   o
 <pre class="programlisting">
 Default6  readable   b
 </pre>
-<p>Whether this active connection is the default IPv6 connection, i.e.         whether it currently owns the default IPv6 route.</p>
+<p>        Whether this active connection is the default IPv6 connection, i.e.
+        whether it currently owns the default IPv6 route.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -178,7 +217,10 @@ Default6  readable   b
 <pre class="programlisting">
 Ip6Config  readable   o
 </pre>
-<p>Object path of the Ip6Config object describing the configuration of the         connection. Only valid when the connection is in the         NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.</p>
+<p>        Object path of the Ip6Config object describing the configuration of the
+        connection. Only valid when the connection is in the
+        NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -186,7 +228,10 @@ Ip6Config  readable   o
 <pre class="programlisting">
 Dhcp6Config  readable   o
 </pre>
-<p>Object path of the Dhcp6Config object describing the DHCP options         returned by the DHCP server (assuming the connection used DHCP). Only         valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED         state.</p>
+<p>        Object path of the Dhcp6Config object describing the DHCP options returned
+        by the DHCP server (assuming the connection used DHCP). Only valid when
+        the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -194,7 +239,8 @@ Dhcp6Config  readable   o
 <pre class="programlisting">
 Vpn  readable   b
 </pre>
-<p>Whether this active connection is also a VPN connection.</p>
+<p>        Whether this active connection is also a VPN connection.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -202,7 +248,8 @@ Vpn  readable   b
 <pre class="programlisting">
 Master  readable   o
 </pre>
-<p>The path to the master device if the connection is a slave.</p>
+<p>        The path to the master device if the connection is a slave.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html
index 6f8fed9d..ea8eaa80 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html
@@ -47,7 +47,8 @@
 </div>
 <div class="refsect1">
 <a name="gdbus-interface-org-freedesktop-NetworkManager-DHCP4Config"></a><h2>Description</h2>
-<p>Options and configuration returned by the IPv4 DHCP server.</p>
+<p>      Options and configuration returned by the IPv4 DHCP server.
+</p>
 </div>
 <div class="refsect1">
 <a name="gdbus-signals-org.freedesktop.NetworkManager.DHCP4Config"></a><h2>Signal Details</h2>
@@ -76,7 +77,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 Options  readable   a{sv}
 </pre>
-<p>Configuration options returned by a DHCP server, if any.</p>
+<p>        Configuration options returned by a DHCP server, if any.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html
index e1cdb43e..8634c505 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html
@@ -47,7 +47,8 @@
 </div>
 <div class="refsect1">
 <a name="gdbus-interface-org-freedesktop-NetworkManager-DHCP6Config"></a><h2>Description</h2>
-<p>Options and configuration returned by the IPv6 DHCP server.</p>
+<p>      Options and configuration returned by the IPv6 DHCP server.
+</p>
 </div>
 <div class="refsect1">
 <a name="gdbus-signals-org.freedesktop.NetworkManager.DHCP6Config"></a><h2>Signal Details</h2>
@@ -76,7 +77,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 Options  readable   a{sv}
 </pre>
-<p>Configuration options returned by a DHCP server, if any.</p>
+<p>        Configuration options returned by a DHCP server, if any.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html
index 3c4c7c7e..85b8cca5 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html
@@ -76,7 +76,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 Carrier  readable   b
 </pre>
-<p>Indicates whether the physical carrier is found.</p>
+<p>        Indicates whether the physical carrier is found.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
index d9fc09cc..8aee9d96 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
@@ -78,7 +78,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>Bluetooth hardware address of the device.</p>
+<p>        Bluetooth hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -86,7 +87,8 @@ HwAddress  readable   s
 <pre class="programlisting">
 Name  readable   s
 </pre>
-<p>Bluetooth name of the device.</p>
+<p>        Bluetooth name of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -94,7 +96,10 @@ Name  readable   s
 <pre class="programlisting">
 BtCapabilities  readable   u
 </pre>
-<p>Bluetooth capabilities of the device (either DUN or NAP).</p>
+<p>        Bluetooth capabilities of the device (either DUN or NAP).
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMBluetoothCapabilities">NMBluetoothCapabilities</a>
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html
index 27bfc6f8..bb8000a3 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html
@@ -78,7 +78,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>Hardware address of the device.</p>
+<p>        Hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -86,7 +87,9 @@ HwAddress  readable   s
 <pre class="programlisting">
 Carrier  readable   b
 </pre>
-<p>Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).</p>
+<p>        Indicates whether the physical carrier is found (e.g. whether a cable is
+        plugged in or not).
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -94,7 +97,9 @@ Carrier  readable   b
 <pre class="programlisting">
 Slaves  readable   ao
 </pre>
-<p>Array of object paths representing devices which are currently  slaved to this device.</p>
+<p>        Array of object paths representing devices which are currently slaved to
+        this device.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html
index 83f25082..8c3c0df6 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html
@@ -78,7 +78,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>Hardware address of the device.</p>
+<p>        Hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -86,7 +87,9 @@ HwAddress  readable   s
 <pre class="programlisting">
 Carrier  readable   b
 </pre>
-<p>Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).</p>
+<p>        Indicates whether the physical carrier is found (e.g. whether a cable is
+        plugged in or not).
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -94,7 +97,9 @@ Carrier  readable   b
 <pre class="programlisting">
 Slaves  readable   ao
 </pre>
-<p>Array of object paths representing devices which are currently  slaved to this device.</p>
+<p>        Array of object paths representing devices which are currently slaved to
+        this device.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html
index 73fadb87..0ca0acc6 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html
@@ -77,7 +77,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>Hardware address of the device.</p>
+<p>        Hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -85,7 +86,8 @@ HwAddress  readable   s
 <pre class="programlisting">
 TypeDescription  readable   s
 </pre>
-<p>A (non-localized) description of the interface type, if known.</p>
+<p>        A (non-localized) description of the interface type, if known.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html
index ffc09320..8fc079b3 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html
@@ -86,7 +86,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 Mode  readable   u
 </pre>
-<p>The tunneling mode.</p>
+<p>        The tunneling mode.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -94,7 +95,8 @@ Mode  readable   u
 <pre class="programlisting">
 Parent  readable   o
 </pre>
-<p>The object path of the parent device.</p>
+<p>        The object path of the parent device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -102,7 +104,8 @@ Parent  readable   o
 <pre class="programlisting">
 Local  readable   s
 </pre>
-<p>The local endpoint of the tunnel.</p>
+<p>        The local endpoint of the tunnel.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -110,7 +113,8 @@ Local  readable   s
 <pre class="programlisting">
 Remote  readable   s
 </pre>
-<p>The remote endpoint of the tunnel.</p>
+<p>        The remote endpoint of the tunnel.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -118,7 +122,9 @@ Remote  readable   s
 <pre class="programlisting">
 Ttl  readable   y
 </pre>
-<p>The TTL assigned to tunneled packets. 0 is a special value         meaning that packets inherit the TTL value</p>
+<p>        The TTL assigned to tunneled packets. 0 is a special value meaning that
+        packets inherit the TTL value
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -126,7 +132,9 @@ Ttl  readable   y
 <pre class="programlisting">
 Tos  readable   y
 </pre>
-<p>The type of service (IPv4) or traffic class (IPv6) assigned to         tunneled packets.</p>
+<p>        The type of service (IPv4) or traffic class (IPv6) assigned to tunneled
+        packets.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -134,7 +142,8 @@ Tos  readable   y
 <pre class="programlisting">
 PathMtuDiscovery  readable   b
 </pre>
-<p>Whether path MTU discovery is enabled on this tunnel.</p>
+<p>        Whether path MTU discovery is enabled on this tunnel.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -142,7 +151,8 @@ PathMtuDiscovery  readable   b
 <pre class="programlisting">
 InputKey  readable   s
 </pre>
-<p>The key used for incoming packets.</p>
+<p>        The key used for incoming packets.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -150,7 +160,8 @@ InputKey  readable   s
 <pre class="programlisting">
 OutputKey  readable   s
 </pre>
-<p>The key used for outgoing packets.</p>
+<p>        The key used for outgoing packets.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -158,7 +169,9 @@ OutputKey  readable   s
 <pre class="programlisting">
 EncapsulationLimit  readable   y
 </pre>
-<p>How many additional levels of encapsulation are permitted to         be prepended to packets. This property applies only to IPv6         tunnels.</p>
+<p>        How many additional levels of encapsulation are permitted to be prepended
+        to packets. This property applies only to IPv6 tunnels.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -166,7 +179,9 @@ EncapsulationLimit  readable   y
 <pre class="programlisting">
 FlowLabel  readable   u
 </pre>
-<p>The flow label to assign to tunnel packets. This property         applies only to IPv6 tunnels.</p>
+<p>        The flow label to assign to tunnel packets. This property applies only to
+        IPv6 tunnels.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html
index 6ba8403e..0be326c1 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html
@@ -77,7 +77,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>Hardware address of the device.</p>
+<p>        Hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -85,7 +86,9 @@ HwAddress  readable   s
 <pre class="programlisting">
 Carrier  readable   b
 </pre>
-<p>Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).</p>
+<p>        Indicates whether the physical carrier is found (e.g. whether a cable is
+        plugged in or not).
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html
index ab240f49..1cd289ce 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html
@@ -79,7 +79,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 Parent  readable   o
 </pre>
-<p>The object path of the parent device.</p>
+<p>        The object path of the parent device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -87,7 +88,8 @@ Parent  readable   o
 <pre class="programlisting">
 Mode  readable   s
 </pre>
-<p>The macvlan mode, one of "private", "vepa", "bridge", or "passthru".</p>
+<p>        The macvlan mode, one of "private", "vepa", "bridge", or "passthru".
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -95,7 +97,8 @@ Mode  readable   s
 <pre class="programlisting">
 NoPromisc  readable   b
 </pre>
-<p>Whether the device is blocked from going into promiscuous mode.</p>
+<p>        Whether the device is blocked from going into promiscuous mode.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -103,7 +106,8 @@ NoPromisc  readable   b
 <pre class="programlisting">
 Tap  readable   b
 </pre>
-<p>Whether the device is a macvtap.</p>
+<p>        Whether the device is a macvtap.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
index a587a928..554ac256 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
@@ -77,7 +77,13 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 ModemCapabilities  readable   u
 </pre>
-<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>        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>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceModemCapabilities">NMDeviceModemCapabilities</a>
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -85,7 +91,11 @@ ModemCapabilities  readable   u
 <pre class="programlisting">
 CurrentCapabilities  readable   u
 </pre>
-<p>The generic family of access technologies the modem currently supports         without a firmware reload or reinitialization.</p>
+<p>        The generic family of access technologies the modem currently supports
+        without a firmware reload or reinitialization.
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceModemCapabilities">NMDeviceModemCapabilities</a>
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html
index 24d43344..24cd507e 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html
@@ -58,7 +58,8 @@
 <pre class="programlisting">
 PropertiesChanged (a{sv} properties);
 </pre>
-<p>Emitted when the wireless device's properties changed.</p>
+<p>        Emitted when the wireless device's properties changed.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -78,7 +79,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>The hardware address of the device.</p>
+<p>        The hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -86,7 +88,8 @@ HwAddress  readable   s
 <pre class="programlisting">
 Companion  readable   o
 </pre>
-<p>The object path of the companion device.</p>
+<p>        The object path of the companion device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -94,7 +97,8 @@ Companion  readable   o
 <pre class="programlisting">
 ActiveChannel  readable   u
 </pre>
-<p>The currently active channel.</p>
+<p>        The currently active channel.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html
index bda719d3..24f6d5c6 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html
@@ -78,7 +78,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>Hardware address of the device.</p>
+<p>        Hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -86,7 +87,9 @@ HwAddress  readable   s
 <pre class="programlisting">
 Carrier  readable   b
 </pre>
-<p>Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).</p>
+<p>        Indicates whether the physical carrier is found (e.g. whether a cable is
+        plugged in or not).
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -94,7 +97,9 @@ Carrier  readable   b
 <pre class="programlisting">
 Slaves  readable   ao
 </pre>
-<p>Array of object paths representing devices which are currently  slaved to this device.</p>
+<p>        Array of object paths representing devices which are currently slaved to
+        this device.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html
index 4815cf6e..fedfca40 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html
@@ -82,7 +82,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 Owner  readable   x
 </pre>
-<p>The uid of the tunnel owner, or -1 if it has no owner.</p>
+<p>        The uid of the tunnel owner, or -1 if it has no owner.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -90,7 +91,8 @@ Owner  readable   x
 <pre class="programlisting">
 Group  readable   x
 </pre>
-<p>The gid of the tunnel group, or -1 if it has no owner.</p>
+<p>        The gid of the tunnel group, or -1 if it has no owner.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -98,7 +100,8 @@ Group  readable   x
 <pre class="programlisting">
 Mode  readable   s
 </pre>
-<p>The tunnel mode, either "tun" or "tap".</p>
+<p>        The tunnel mode, either "tun" or "tap".
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -106,7 +109,9 @@ Mode  readable   s
 <pre class="programlisting">
 NoPi  readable   b
 </pre>
-<p>The tunnel's "TUN_NO_PI" flag; true if no protocol info is  prepended to the tunnel packets.</p>
+<p>        The tunnel's "TUN_NO_PI" flag; true if no protocol info is prepended to
+        the tunnel packets.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -114,7 +119,9 @@ NoPi  readable   b
 <pre class="programlisting">
 VnetHdr  readable   b
 </pre>
-<p>The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets  include a virtio network header.</p>
+<p>        The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets include a
+        virtio network header.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -122,7 +129,9 @@ VnetHdr  readable   b
 <pre class="programlisting">
 MultiQueue  readable   b
 </pre>
-<p>The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to         the tap device multiple times, for multiple send/receive         queues.</p>
+<p>        The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to the tap
+        device multiple times, for multiple send/receive queues.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -130,7 +139,8 @@ MultiQueue  readable   b
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>Hardware address of the device.</p>
+<p>        Hardware address of the device.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html
index 6bdc741f..c045a5ff 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html
@@ -76,7 +76,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 Peer  readable   o
 </pre>
-<p>The object path of the device's peer.</p>
+<p>        The object path of the device's peer.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html
index 75d564bb..9b8fea75 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html
@@ -79,7 +79,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>Hardware address of the device.</p>
+<p>        Hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -87,7 +88,9 @@ HwAddress  readable   s
 <pre class="programlisting">
 Carrier  readable   b
 </pre>
-<p>Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).</p>
+<p>        Indicates whether the physical carrier is found (e.g. whether a cable is
+        plugged in or not).
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -95,7 +98,8 @@ Carrier  readable   b
 <pre class="programlisting">
 Parent  readable   o
 </pre>
-<p>Object path of the parent device of this VLAN device.</p>
+<p>        Object path of the parent device of this VLAN device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -103,7 +107,8 @@ Parent  readable   o
 <pre class="programlisting">
 VlanId  readable   u
 </pre>
-<p>The VLAN ID of this VLAN interface.</p>
+<p>        The VLAN ID of this VLAN interface.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html
index ec4a48d4..4d227329 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html
@@ -92,7 +92,9 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 Parent  readable   o
 </pre>
-<p>The object path of the parent device (if the VXLAN is not  purely internal to this host).</p>
+<p>        The object path of the parent device (if the VXLAN is not purely internal
+        to this host).
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -100,7 +102,8 @@ Parent  readable   o
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>Hardware address of the device.</p>
+<p>        Hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -108,7 +111,8 @@ HwAddress  readable   s
 <pre class="programlisting">
 Id  readable   u
 </pre>
-<p>The VXLAN Network Identifier (VNI).</p>
+<p>        The VXLAN Network Identifier (VNI).
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -116,7 +120,9 @@ Id  readable   u
 <pre class="programlisting">
 Group  readable   s
 </pre>
-<p>The IP (v4 or v6) multicast group used to communicate with other physical  hosts on this VXLAN.</p>
+<p>        The IP (v4 or v6) multicast group used to communicate with other physical
+        hosts on this VXLAN.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -124,7 +130,9 @@ Group  readable   s
 <pre class="programlisting">
 Local  readable   s
 </pre>
-<p>The local IPv4 or IPv6 address to use when sending VXLAN packets to other  physical hosts.</p>
+<p>        The local IPv4 or IPv6 address to use when sending VXLAN packets to other
+        physical hosts.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -132,7 +140,9 @@ Local  readable   s
 <pre class="programlisting">
 Tos  readable   y
 </pre>
-<p>The value to use in the IP ToS field for VXLAN packets sent to  other physical hosts.</p>
+<p>        The value to use in the IP ToS field for VXLAN packets sent to other
+        physical hosts.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -140,7 +150,9 @@ Tos  readable   y
 <pre class="programlisting">
 Ttl  readable   y
 </pre>
-<p>The value to use in the IP TTL field for VXLAN packets sent to  other physical hosts.</p>
+<p>        The value to use in the IP TTL field for VXLAN packets sent to other
+        physical hosts.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -148,7 +160,8 @@ Ttl  readable   y
 <pre class="programlisting">
 Learning  readable   b
 </pre>
-<p>True if the VXLAN dynamically learns remote IP addresses.</p>
+<p>        True if the VXLAN dynamically learns remote IP addresses.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -156,7 +169,8 @@ Learning  readable   b
 <pre class="programlisting">
 Ageing  readable   u
 </pre>
-<p>The interval in seconds at which the kernel purges stale         cached addresses.</p>
+<p>        The interval in seconds at which the kernel purges stale cached addresses.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -164,7 +178,9 @@ Ageing  readable   u
 <pre class="programlisting">
 Limit  readable   u
 </pre>
-<p>The maximum number of entries that can be added to the VXLAN's  forwarding table.</p>
+<p>        The maximum number of entries that can be added to the VXLAN's forwarding
+        table.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -172,7 +188,8 @@ Limit  readable   u
 <pre class="programlisting">
 DstPort  readable   q
 </pre>
-<p>Destination port for outgoing VXLAN packets.</p>
+<p>        Destination port for outgoing VXLAN packets.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -180,7 +197,8 @@ DstPort  readable   q
 <pre class="programlisting">
 SrcPortMin  readable   q
 </pre>
-<p>The lowest source port number to use for outgoing VXLAN packets.</p>
+<p>        The lowest source port number to use for outgoing VXLAN packets.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -188,7 +206,8 @@ SrcPortMin  readable   q
 <pre class="programlisting">
 SrcPortMax  readable   q
 </pre>
-<p>The highest source port number to use for outgoing VXLAN packets.</p>
+<p>        The highest source port number to use for outgoing VXLAN packets.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -196,7 +215,8 @@ SrcPortMax  readable   q
 <pre class="programlisting">
 Proxy  readable   b
 </pre>
-<p>True if the VXLAN is implementing DOVE ARP proxying for remote         clients.</p>
+<p>        True if the VXLAN is implementing DOVE ARP proxying for remote clients.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -204,7 +224,9 @@ Proxy  readable   b
 <pre class="programlisting">
 Rsc  readable   b
 </pre>
-<p>True if the VXLAN is implementing DOVE route short-circuiting  of known remote IP addresses.</p>
+<p>        True if the VXLAN is implementing DOVE route short-circuiting of known
+        remote IP addresses.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -212,7 +234,8 @@ Rsc  readable   b
 <pre class="programlisting">
 L2miss  readable   b
 </pre>
-<p>True if the VXLAN will emit netlink notifications of L2 switch         misses.</p>
+<p>        True if the VXLAN will emit netlink notifications of L2 switch misses.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -220,7 +243,8 @@ L2miss  readable   b
 <pre class="programlisting">
 L3miss  readable   b
 </pre>
-<p>True if the VXLAN will emit netlink notifications of L3 switch         misses.</p>
+<p>        True if the VXLAN will emit netlink notifications of L3 switch misses.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html
index 3ef7947b..2bd82f0a 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html
@@ -67,11 +67,12 @@
 <div class="refsect1">
 <a name="gdbus-methods-org.freedesktop.NetworkManager.Device.WiMax"></a><h2>Method Details</h2>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Device-WiMax.GetNspList"></a><h3>The <code class="function">GetNspList()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Device-WiMax.GetNspList"></a><h3>The GetNspList() method</h3>
 <pre class="programlisting">
 GetNspList (OUT ao nsps);
 </pre>
-<p>Get the list of NSPs visible to this device.</p>
+<p>        Get the list of NSPs visible to this device.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -91,7 +92,8 @@ GetNspList (OUT ao nsps);
 <pre class="programlisting">
 PropertiesChanged (a{sv} properties);
 </pre>
-<p>Emitted when the WiMax device's properties changed.</p>
+<p>        Emitted when the WiMax device's properties changed.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -109,7 +111,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 NspAdded (o nsp);
 </pre>
-<p>Emitted when a new NSP is found by the device.</p>
+<p>        Emitted when a new NSP is found by the device.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -127,7 +130,8 @@ NspAdded (o nsp);
 <pre class="programlisting">
 NspRemoved (o nsp);
 </pre>
-<p>Emitted when an NSP disappears from view of the device.</p>
+<p>        Emitted when an NSP disappears from view of the device.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -147,7 +151,9 @@ NspRemoved (o nsp);
 <pre class="programlisting">
 Nsps  readable   ao
 </pre>
-<p>List of object paths of Network Service Providers (NSPs) visible to this         WiMAX device.</p>
+<p>        List of object paths of Network Service Providers (NSPs) visible to this
+        WiMAX device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -155,7 +161,8 @@ Nsps  readable   ao
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>Hardware address of the device.</p>
+<p>        Hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -163,7 +170,10 @@ HwAddress  readable   s
 <pre class="programlisting">
 CenterFrequency  readable   u
 </pre>
-<p>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>        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>
 </div>
 <hr>
 <div class="refsect2">
@@ -171,7 +181,11 @@ CenterFrequency  readable   u
 <pre class="programlisting">
 Rssi  readable   i
 </pre>
-<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>        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>
 </div>
 <hr>
 <div class="refsect2">
@@ -179,7 +193,10 @@ Rssi  readable   i
 <pre class="programlisting">
 Cinr  readable   i
 </pre>
-<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>        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>
 </div>
 <hr>
 <div class="refsect2">
@@ -187,7 +204,10 @@ Cinr  readable   i
 <pre class="programlisting">
 TxPower  readable   i
 </pre>
-<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>        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>
 </div>
 <hr>
 <div class="refsect2">
@@ -195,7 +215,9 @@ TxPower  readable   i
 <pre class="programlisting">
 Bsid  readable   s
 </pre>
-<p>The ID of the serving base station as received from the network.  Has         no meaning when the device is not connected.</p>
+<p>        The ID of the serving base station as received from the network. Has no
+        meaning when the device is not connected.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -203,7 +225,8 @@ Bsid  readable   s
 <pre class="programlisting">
 ActiveNsp  readable   o
 </pre>
-<p>Object path of the NSP currently used by the WiMax device.</p>
+<p>        Object path of the NSP currently used by the WiMax device.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html
index 09de05da..498b1e9b 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html
@@ -80,7 +80,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>Active hardware address of the device.</p>
+<p>        Active hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -88,7 +89,8 @@ HwAddress  readable   s
 <pre class="programlisting">
 PermHwAddress  readable   s
 </pre>
-<p>Permanent hardware address of the device.</p>
+<p>        Permanent hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -96,7 +98,8 @@ PermHwAddress  readable   s
 <pre class="programlisting">
 Speed  readable   u
 </pre>
-<p>Design speed of the device, in megabits/second (Mb/s).</p>
+<p>        Design speed of the device, in megabits/second (Mb/s).
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -104,7 +107,8 @@ Speed  readable   u
 <pre class="programlisting">
 S390Subchannels  readable   as
 </pre>
-<p>Array of S/390 subchannels for S/390 or z/Architecture devices.</p>
+<p>        Array of S/390 subchannels for S/390 or z/Architecture devices.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -112,7 +116,9 @@ S390Subchannels  readable   as
 <pre class="programlisting">
 Carrier  readable   b
 </pre>
-<p>Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).</p>
+<p>        Indicates whether the physical carrier is found (e.g. whether a cable is
+        plugged in or not).
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
index 3230bac7..6992176a 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
@@ -68,11 +68,15 @@
 <div class="refsect1">
 <a name="gdbus-methods-org.freedesktop.NetworkManager.Device.Wireless"></a><h2>Method Details</h2>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAccessPoints"></a><h3>The <code class="function">GetAccessPoints()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAccessPoints"></a><h3>The GetAccessPoints() method</h3>
 <pre class="programlisting">
 GetAccessPoints (OUT ao access_points);
 </pre>
-<p>DEPRECATED.  Get the list of access points visible to this device.  Note         that this list does not include access points which hide their SSID.  To         retrieve a list of all access points (including hidden ones) use the         <code class="function">GetAllAccessPoints()</code> method.</p>
+<p>        DEPRECATED. Get the list of access points visible to this device. Note
+        that this list does not include access points which hide their SSID. To
+        retrieve a list of all access points (including hidden ones) use the
+        GetAllAccessPoints() method.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -86,11 +90,13 @@ GetAccessPoints (OUT ao access_points);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAllAccessPoints"></a><h3>The <code class="function">GetAllAccessPoints()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAllAccessPoints"></a><h3>The GetAllAccessPoints() method</h3>
 <pre class="programlisting">
 GetAllAccessPoints (OUT ao access_points);
 </pre>
-<p>Get the list of all access points visible to this device, including         hidden ones for which the SSID is not yet known.</p>
+<p>        Get the list of all access points visible to this device, including hidden
+        ones for which the SSID is not yet known.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -104,11 +110,12 @@ GetAllAccessPoints (OUT ao access_points);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.RequestScan"></a><h3>The <code class="function">RequestScan()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.RequestScan"></a><h3>The RequestScan() method</h3>
 <pre class="programlisting">
 RequestScan (IN  a{sv} options);
 </pre>
-<p>Request the device to scan</p>
+<p>        Request the device to scan
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -116,7 +123,7 @@ RequestScan (IN  a{sv} options);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">IN a{sv} <em class="parameter"><code>options</code></em></code>:</span></p></td>
-<td><p>Options of scan.           Currently 'ssids' option with value of "aay" type is supported.</p></td>
+<td><p>Options of scan. Currently 'ssids' option with value of "aay" type is supported.</p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -128,7 +135,8 @@ RequestScan (IN  a{sv} options);
 <pre class="programlisting">
 PropertiesChanged (a{sv} properties);
 </pre>
-<p>Emitted when the wireless device's properties changed.</p>
+<p>        Emitted when the wireless device's properties changed.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -146,7 +154,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 AccessPointAdded (o access_point);
 </pre>
-<p>Emitted when a new access point is found by the device.</p>
+<p>        Emitted when a new access point is found by the device.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -164,7 +173,8 @@ AccessPointAdded (o access_point);
 <pre class="programlisting">
 AccessPointRemoved (o access_point);
 </pre>
-<p>Emitted when an access point disappears from view of the device.</p>
+<p>        Emitted when an access point disappears from view of the device.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -184,7 +194,8 @@ AccessPointRemoved (o access_point);
 <pre class="programlisting">
 HwAddress  readable   s
 </pre>
-<p>The active hardware address of the device.</p>
+<p>        The active hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -192,7 +203,8 @@ HwAddress  readable   s
 <pre class="programlisting">
 PermHwAddress  readable   s
 </pre>
-<p>The permanent hardware address of the device.</p>
+<p>        The permanent hardware address of the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -200,7 +212,10 @@ PermHwAddress  readable   s
 <pre class="programlisting">
 Mode  readable   u
 </pre>
-<p>The operating mode of the wireless device.</p>
+<p>        The operating mode of the wireless device.
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NM80211Mode">NM80211Mode</a>
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -208,7 +223,9 @@ Mode  readable   u
 <pre class="programlisting">
 Bitrate  readable   u
 </pre>
-<p>The bit rate currently used by the wireless device, in kilobits/second (Kb/s).</p>
+<p>        The bit rate currently used by the wireless device, in kilobits/second
+        (Kb/s).
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -216,7 +233,8 @@ Bitrate  readable   u
 <pre class="programlisting">
 AccessPoints  readable   ao
 </pre>
-<p>List of object paths of access point visible to this wireless device.</p>
+<p>        List of object paths of access point visible to this wireless device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -224,7 +242,8 @@ AccessPoints  readable   ao
 <pre class="programlisting">
 ActiveAccessPoint  readable   o
 </pre>
-<p>Object path of the access point currently used by the wireless device.</p>
+<p>        Object path of the access point currently used by the wireless device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -232,7 +251,10 @@ ActiveAccessPoint  readable   o
 <pre class="programlisting">
 WirelessCapabilities  readable   u
 </pre>
-<p>The capabilities of the wireless device.</p>
+<p>        The capabilities of the wireless device.
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceWifiCapabilities">NMDeviceWifiCapabilities</a>
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
index ee7203c5..03f74ce4 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
@@ -92,13 +92,33 @@
 <div class="refsect1">
 <a name="gdbus-methods-org.freedesktop.NetworkManager.Device"></a><h2>Method Details</h2>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Device.Reapply"></a><h3>The <code class="function">Reapply()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Device.Reapply"></a><h3>The Reapply() method</h3>
 <pre class="programlisting">
 Reapply (IN  a{sa{sv}} connection,
          IN  t         version_id,
          IN  u         flags);
 </pre>
-<p>Attempts to update the configuration of a device without deactivating it. NetworkManager         has the concept of connections, which are profiles that contain the configuration for         a networking device. Those connections are exposed via D-Bus as individual objects         that can be created, modified and deleted. When activating such a settings-connection         on a device, the settings-connection is cloned to become an applied-connection and used to         configure the device (see GetAppliedConnection). Subsequent modification of the         settings-connection don't propagate automatically to the device's applied-connection         (with exception of the firewall-zone and the metered property). For the changes to take         effect, you can either re-activate the settings-connection, or call Reapply.         The Reapply call allows you to directly update the applied-connection and reconfigure         the device.         Reapply can also be useful if the currently applied-connection is equal to the connection         that is about to be reapplied. This allows to reconfigure the device and revert external         changes like removing or adding an IP address (which NetworkManager doesn't revert         automatically because it is assumed that the user made these changes intentionally outside         of NetworkManager).         Reapply can make the applied-connection different from the settings-connection,         just like updating the settings-connection can make them different.</p>
+<p>        Attempts to update the configuration of a device without deactivating it.
+        NetworkManager has the concept of connections, which are profiles that
+        contain the configuration for a networking device. Those connections are
+        exposed via D-Bus as individual objects that can be created, modified and
+        deleted. When activating such a settings-connection on a device, the
+        settings-connection is cloned to become an applied-connection and used to
+        configure the device (see GetAppliedConnection). Subsequent modification
+        of the settings-connection don't propagate automatically to the device's
+        applied-connection (with exception of the firewall-zone and the metered
+        property). For the changes to take effect, you can either re-activate the
+        settings-connection, or call Reapply. The Reapply call allows you to
+        directly update the applied-connection and reconfigure the device. Reapply
+        can also be useful if the currently applied-connection is equal to the
+        connection that is about to be reapplied. This allows to reconfigure the
+        device and revert external changes like removing or adding an IP address
+        (which NetworkManager doesn't revert automatically because it is assumed
+        that the user made these changes intentionally outside of NetworkManager).
+        Reapply can make the applied-connection different from the
+        settings-connection, just like updating the settings-connection can make
+        them different.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -107,28 +127,35 @@ Reapply (IN  a{sa{sv}} connection,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">IN a{sa{sv}} <em class="parameter"><code>connection</code></em></code>:</span></p></td>
-<td><p>The optional connection settings that will be reapplied on the device. If empty, the           currently active settings-connection will be used. The connection cannot arbitrarly           differ from the current applied-connection otherwise the call will fail.           Only certain changes are supported, like adding or removing IP addresses.</p></td>
+<td><p>The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarly differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN t <em class="parameter"><code>version_id</code></em></code>:</span></p></td>
-<td><p>If non-zero, the current version id of the applied-connection must match.           The current version id can be retrieved via GetAppliedConnection.           This optional argument allows to catch concurrent modifications between           the GetAppliedConnection call and Reapply.</p></td>
+<td><p>If non-zero, the current version id of the applied-connection must match. The current version id can be retrieved via GetAppliedConnection. This optional argument allows to catch concurrent modifications between the GetAppliedConnection call and Reapply.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN u <em class="parameter"><code>flags</code></em></code>:</span></p></td>
-<td><p>Flags which would modify the behavior of the Reapply call.           There are no flags defined currently and the users should use the value of 0.</p></td>
+<td><p>Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0.</p></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Device.GetAppliedConnection"></a><h3>The <code class="function">GetAppliedConnection()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Device.GetAppliedConnection"></a><h3>The GetAppliedConnection() method</h3>
 <pre class="programlisting">
 GetAppliedConnection (IN  u         flags,
                       OUT a{sa{sv}} connection,
                       OUT t         version_id);
 </pre>
-<p>Get the currently applied connection on the device. This is a snapshot of the last activated         connection on the device, that is the configuration that is currently applied on the device.         Usually this is the same as GetSettings of the referenced settings connection. However, it         can differ if the settings connection was subsequently modified or the applied connection was         modified by Reapply. The applied connection is set when activating a device or when calling         Reapply.</p>
+<p>        Get the currently applied connection on the device. This is a snapshot of
+        the last activated connection on the device, that is the configuration
+        that is currently applied on the device. Usually this is the same as
+        GetSettings of the referenced settings connection. However, it can differ
+        if the settings connection was subsequently modified or the applied
+        connection was modified by Reapply. The applied connection is set when
+        activating a device or when calling Reapply.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -137,7 +164,7 @@ GetAppliedConnection (IN  u         flags,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">IN u <em class="parameter"><code>flags</code></em></code>:</span></p></td>
-<td><p>Flags which would modify the behavior of the GetAppliedConnection call.           There are no flags defined currently and the users should use the value of 0.</p></td>
+<td><p>Flags which would modify the behavior of the GetAppliedConnection call. There are no flags defined currently and the users should use the value of 0.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">OUT a{sa{sv}} <em class="parameter"><code>connection</code></em></code>:</span></p></td>
@@ -145,26 +172,31 @@ GetAppliedConnection (IN  u         flags,
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">OUT t <em class="parameter"><code>version_id</code></em></code>:</span></p></td>
-<td><p>The version-id of the currently applied connection. This can be specified during             Reapply to avoid races where you first fetch the applied connection, modify it             and try to reapply it. If the applied connection is modified in the meantime, the             version_id gets incremented and Reapply will fail.</p></td>
+<td><p>The version-id of the currently applied connection. This can be specified during Reapply to avoid races where you first fetch the applied connection, modify it and try to reapply it. If the applied connection is modified in the meantime, the version_id gets incremented and Reapply will fail.</p></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Device.Disconnect"></a><h3>The <code class="function">Disconnect()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Device.Disconnect"></a><h3>The Disconnect() method</h3>
 <pre class="programlisting">
 Disconnect ();
 </pre>
-<p>Disconnects a device and prevents the device from automatically activating further connections without user intervention.</p>
+<p>        Disconnects a device and prevents the device from automatically activating
+        further connections without user intervention.
+</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Device.Delete"></a><h3>The <code class="function">Delete()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Device.Delete"></a><h3>The Delete() method</h3>
 <pre class="programlisting">
 Delete ();
 </pre>
-<p>Deletes a software device from NetworkManager and removes the interface from the system.         The method returns an error when called for a hardware device.</p>
+<p>        Deletes a software device from NetworkManager and removes the interface
+        from the system. The method returns an error when called for a hardware
+        device.
+</p>
 </div>
 </div>
 <div class="refsect1">
@@ -185,15 +217,15 @@ StateChanged (u new_state,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>new_state</code></em></code>:</span></p></td>
-<td><p>The new state of the device.</p></td>
+<td><p>(<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a>) The new state of the device.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>old_state</code></em></code>:</span></p></td>
-<td><p>The previous state of the device.</p></td>
+<td><p>(<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a>) The previous state of the device.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>reason</code></em></code>:</span></p></td>
-<td><p>A reason for the state transition.</p></td>
+<td><p>(<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceStateReason">NMDeviceStateReason</a>) A reason for the state transition.</p></td>
 </tr>
 </tbody>
 </table></div>
@@ -206,7 +238,18 @@ StateChanged (u new_state,
 <pre class="programlisting">
 Udi  readable   s
 </pre>
-<p>Operating-system specific transient device hardware identifier.  This         is an opaque string representing the underlying hardware for the device,         and shouldn't be used to keep track of individual devices.  For some         device types (Bluetooth, Modems) it is an identifier used by the         hardware service (ie bluez or ModemManager) to refer to that device,         and client programs use it get additional information from those         services which NM does not provide.  The Udi is not guaranteed to be         consistent across reboots or hotplugs of the hardware. If you're looking         for a way to uniquely track each device in your application, use the         object path.  If you're looking for a way to track a specific piece of         hardware across reboot or hotplug, use a MAC address or USB serial         number.</p>
+<p>        Operating-system specific transient device hardware identifier. This is an
+        opaque string representing the underlying hardware for the device, and
+        shouldn't be used to keep track of individual devices. For some device
+        types (Bluetooth, Modems) it is an identifier used by the hardware service
+        (ie bluez or ModemManager) to refer to that device, and client programs
+        use it get additional information from those services which NM does not
+        provide. The Udi is not guaranteed to be consistent across reboots or
+        hotplugs of the hardware. If you're looking for a way to uniquely track
+        each device in your application, use the object path. If you're looking
+        for a way to track a specific piece of hardware across reboot or hotplug,
+        use a MAC address or USB serial number.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -214,7 +257,8 @@ Udi  readable   s
 <pre class="programlisting">
 Interface  readable   s
 </pre>
-<p>The name of the device's control (and often data) interface.</p>
+<p>        The name of the device's control (and often data) interface.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -222,7 +266,11 @@ Interface  readable   s
 <pre class="programlisting">
 IpInterface  readable   s
 </pre>
-<p>The name of the device's data interface when available.  This property         may not refer to the actual data interface until the device has         successfully established a data connection, indicated by the device's         State becoming ACTIVATED.</p>
+<p>        The name of the device's data interface when available. This property may
+        not refer to the actual data interface until the device has successfully
+        established a data connection, indicated by the device's State becoming
+        ACTIVATED.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -230,7 +278,8 @@ IpInterface  readable   s
 <pre class="programlisting">
 Driver  readable   s
 </pre>
-<p>The driver handling the device.</p>
+<p>        The driver handling the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -238,7 +287,8 @@ Driver  readable   s
 <pre class="programlisting">
 DriverVersion  readable   s
 </pre>
-<p>The version of the driver handling the device.</p>
+<p>        The version of the driver handling the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -246,7 +296,8 @@ DriverVersion  readable   s
 <pre class="programlisting">
 FirmwareVersion  readable   s
 </pre>
-<p>The firmware version for the device.</p>
+<p>        The firmware version for the device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -254,7 +305,10 @@ FirmwareVersion  readable   s
 <pre class="programlisting">
 Capabilities  readable   u
 </pre>
-<p>Flags describing the capabilities of the device.</p>
+<p>        Flags describing the capabilities of the device.
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceCapabilities">NMDeviceCapabilities</a>
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -262,7 +316,9 @@ Capabilities  readable   u
 <pre class="programlisting">
 Ip4Address  readable   u
 </pre>
-<p>DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object instead.</p>
+<p>        DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object
+        instead.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -270,7 +326,10 @@ Ip4Address  readable   u
 <pre class="programlisting">
 State  readable   u
 </pre>
-<p>The current state of the device.</p>
+<p>        The current state of the device.
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a>
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -278,7 +337,10 @@ State  readable   u
 <pre class="programlisting">
 StateReason  readable   (uu)
 </pre>
-<p>The current state and reason for changing to that state.</p>
+<p>        The current state and reason for changing to that state.
+</p>
+<p>        Returns: A tuple of  <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a> and  <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceStateReason">NMDeviceStateReason</a>.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -286,7 +348,11 @@ StateReason  readable   (uu)
 <pre class="programlisting">
 ActiveConnection  readable   o
 </pre>
-<p>Object path of an ActiveConnection object that "owns" this device during         activation.  The ActiveConnection object tracks the life-cycle of a         connection to a specific network and implements the         org.freedesktop.NetworkManager.Connection.Active D-Bus interface.</p>
+<p>        Object path of an ActiveConnection object that "owns" this device during
+        activation. The ActiveConnection object tracks the life-cycle of a
+        connection to a specific network and implements the
+        org.freedesktop.NetworkManager.Connection.Active D-Bus interface.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -294,7 +360,10 @@ ActiveConnection  readable   o
 <pre class="programlisting">
 Ip4Config  readable   o
 </pre>
-<p>Object path of the Ip4Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.</p>
+<p>        Object path of the Ip4Config object describing the configuration of the
+        device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED
+        state.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -302,7 +371,10 @@ Ip4Config  readable   o
 <pre class="programlisting">
 Dhcp4Config  readable   o
 </pre>
-<p>Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.</p>
+<p>        Object path of the Dhcp4Config object describing the DHCP options returned
+        by the DHCP server. Only valid when the device is in the
+        NM_DEVICE_STATE_ACTIVATED state.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -310,7 +382,10 @@ Dhcp4Config  readable   o
 <pre class="programlisting">
 Ip6Config  readable   o
 </pre>
-<p>Object path of the Ip6Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.</p>
+<p>        Object path of the Ip6Config object describing the configuration of the
+        device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED
+        state.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -318,7 +393,10 @@ Ip6Config  readable   o
 <pre class="programlisting">
 Dhcp6Config  readable   o
 </pre>
-<p>Object path of the Dhcp6Config object describing the DHCP options         returned by the DHCP server.  Only valid when the device is in the         NM_DEVICE_STATE_ACTIVATED state.</p>
+<p>        Object path of the Dhcp6Config object describing the DHCP options returned
+        by the DHCP server. Only valid when the device is in the
+        NM_DEVICE_STATE_ACTIVATED state.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -326,7 +404,11 @@ Dhcp6Config  readable   o
 <pre class="programlisting">
 Managed  readwrite  b
 </pre>
-<p>Whether or not this device is managed by NetworkManager. Setting this         property has a similar effect to configuring the device as unmanaged         via the keyfile.unmanaged-devices setting in NetworkManager.conf.         Changes to this value are not persistent and lost after NetworkManager         restart.</p>
+<p>        Whether or not this device is managed by NetworkManager. Setting this
+        property has a similar effect to configuring the device as unmanaged via
+        the keyfile.unmanaged-devices setting in NetworkManager.conf. Changes to
+        this value are not persistent and lost after NetworkManager restart.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -334,7 +416,12 @@ Managed  readwrite  b
 <pre class="programlisting">
 Autoconnect  readwrite  b
 </pre>
-<p>If TRUE, indicates the device is allowed to autoconnect.  If FALSE,         manual intervention is required before the device will automatically         connect to a known network, such as activating a connection using the         device, or setting this property to TRUE.  This property cannot be         set to TRUE for default-unmanaged devices, since they never autoconnect.</p>
+<p>        If TRUE, indicates the device is allowed to autoconnect. If FALSE, manual
+        intervention is required before the device will automatically connect to a
+        known network, such as activating a connection using the device, or
+        setting this property to TRUE. This property cannot be set to TRUE for
+        default-unmanaged devices, since they never autoconnect.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -342,7 +429,9 @@ Autoconnect  readwrite  b
 <pre class="programlisting">
 FirmwareMissing  readable   b
 </pre>
-<p>If TRUE, indicates the device is likely missing firmware necessary for         its operation.</p>
+<p>        If TRUE, indicates the device is likely missing firmware necessary for its
+        operation.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -350,7 +439,9 @@ FirmwareMissing  readable   b
 <pre class="programlisting">
 NmPluginMissing  readable   b
 </pre>
-<p>If TRUE, indicates the NetworkManager plugin for the device is likely         missing or misconfigured.</p>
+<p>        If TRUE, indicates the NetworkManager plugin for the device is likely
+        missing or misconfigured.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -358,7 +449,10 @@ NmPluginMissing  readable   b
 <pre class="programlisting">
 DeviceType  readable   u
 </pre>
-<p>The general type of the network device; ie Ethernet, WiFi, etc.</p>
+<p>        The general type of the network device; ie Ethernet, WiFi, etc.
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMDeviceType">NMDeviceType</a>
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -366,7 +460,9 @@ DeviceType  readable   u
 <pre class="programlisting">
 AvailableConnections  readable   ao
 </pre>
-<p>An array of object paths of every configured connection that is currently 'available' through this device.</p>
+<p>        An array of object paths of every configured connection that is currently
+        'available' through this device.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -374,7 +470,11 @@ AvailableConnections  readable   ao
 <pre class="programlisting">
 PhysicalPortId  readable   s
 </pre>
-<p>If non-empty, an (opaque) indicator of the physical network         port associated with the device. This can be used to recognize  when two seemingly-separate hardware devices are actually just  different virtual interfaces to the same physical port.</p>
+<p>        If non-empty, an (opaque) indicator of the physical network port
+        associated with the device. This can be used to recognize when two
+        seemingly-separate hardware devices are actually just different virtual
+        interfaces to the same physical port.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -382,7 +482,8 @@ PhysicalPortId  readable   s
 <pre class="programlisting">
 Mtu  readable   u
 </pre>
-<p>The device MTU (maximum transmission unit).</p>
+<p>        The device MTU (maximum transmission unit).
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -390,7 +491,11 @@ Mtu  readable   u
 <pre class="programlisting">
 Metered  readable   u
 </pre>
-<p>Whether the amount of traffic flowing through the device is         subject to limitations, for example set by service providers.</p>
+<p>        Whether the amount of traffic flowing through the device is subject to
+        limitations, for example set by service providers.
+</p>
+<p>        Returns: NMMetered
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -398,7 +503,9 @@ Metered  readable   u
 <pre class="programlisting">
 LldpNeighbors  readable   aa{sv}
 </pre>
-<p>Array of LLDP neighbors; each element is a dictionary mapping         LLDP TLV names to variant boxed values.</p>
+<p>        Array of LLDP neighbors; each element is a dictionary mapping LLDP TLV
+        names to variant boxed values.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -406,7 +513,10 @@ LldpNeighbors  readable   aa{sv}
 <pre class="programlisting">
 Real  readable   b
 </pre>
-<p>True if the device exists, or False for placeholder devices that         do not yet exist but could be automatically created by NetworkManager         if one of their AvailableConnections was activated.</p>
+<p>        True if the device exists, or False for placeholder devices that do not
+        yet exist but could be automatically created by NetworkManager if one of
+        their AvailableConnections was activated.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html
index 88aabf84..7405a23c 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html
@@ -85,7 +85,10 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 Addresses  readable   aau
 </pre>
-<p>Array of arrays of IPv4 address/prefix/gateway.  All 3  elements of each array are in network byte order.  Essentially:  [(addr, prefix, gateway), (addr, prefix, gateway), ...]   Deprecated: use AddressData and Gateway</p>
+<p>        Array of arrays of IPv4 address/prefix/gateway. All 3 elements of each
+        array are in network byte order. Essentially: [(addr, prefix, gateway),
+        (addr, prefix, gateway), ...] Deprecated: use AddressData and Gateway
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -93,7 +96,10 @@ Addresses  readable   aau
 <pre class="programlisting">
 AddressData  readable   aa{sv}
 </pre>
-<p>Array of IP address data objects. All addresses will include  "address" (an IP address string), and "prefix" (a uint). Some  addresses may include additional attributes.</p>
+<p>        Array of IP address data objects. All addresses will include "address" (an
+        IP address string), and "prefix" (a uint). Some addresses may include
+        additional attributes.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -101,7 +107,8 @@ AddressData  readable   aa{sv}
 <pre class="programlisting">
 Gateway  readable   s
 </pre>
-<p>The gateway in use.</p>
+<p>        The gateway in use.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -109,7 +116,12 @@ Gateway  readable   s
 <pre class="programlisting">
 Routes  readable   aau
 </pre>
-<p>Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of  each tuple are in network byte order. 'route' and 'next hop'  are IPv4 addresses, while prefix and metric are simple  unsigned integers. Essentially: [(route, prefix, next-hop,  metric), (route, prefix, next-hop, metric), ...]   Deprecated: use RouteData</p>
+<p>        Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of each tuple
+        are in network byte order. 'route' and 'next hop' are IPv4 addresses,
+        while prefix and metric are simple unsigned integers. Essentially:
+        [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric),
+        ...] Deprecated: use RouteData
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -117,7 +129,10 @@ Routes  readable   aau
 <pre class="programlisting">
 RouteData  readable   aa{sv}
 </pre>
-<p>Array of IP route data objects. All routes will include "dest"  (an IP address string) and "prefix" (a uint). Some routes may  include "next-hop" (an IP address string), "metric" (a uint),  and additional attributes.</p>
+<p>        Array of IP route data objects. All routes will include "dest" (an IP
+        address string) and "prefix" (a uint). Some routes may include "next-hop"
+        (an IP address string), "metric" (a uint), and additional attributes.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -125,7 +140,8 @@ RouteData  readable   aa{sv}
 <pre class="programlisting">
 Nameservers  readable   au
 </pre>
-<p>The nameservers in use.</p>
+<p>        The nameservers in use.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -133,7 +149,8 @@ Nameservers  readable   au
 <pre class="programlisting">
 Domains  readable   as
 </pre>
-<p>A list of domains this address belongs to.</p>
+<p>        A list of domains this address belongs to.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -141,7 +158,8 @@ Domains  readable   as
 <pre class="programlisting">
 Searches  readable   as
 </pre>
-<p>A list of dns searches.</p>
+<p>        A list of dns searches.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -149,7 +167,9 @@ Searches  readable   as
 <pre class="programlisting">
 DnsOptions  readable   as
 </pre>
-<p>A list of DNS options that modify the behavior of the DNS  resolver. See resolv.conf(5) manual page for the list of  supported options.</p>
+<p>        A list of DNS options that modify the behavior of the DNS resolver. See
+        resolv.conf(5) manual page for the list of supported options.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -157,7 +177,9 @@ DnsOptions  readable   as
 <pre class="programlisting">
 WinsServers  readable   au
 </pre>
-<p>The Windows Internet Name Service servers associated with the connection.  Each address is in network byte order.</p>
+<p>        The Windows Internet Name Service servers associated with the connection.
+        Each address is in network byte order.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
index b369e2ab..fba5de80 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
@@ -84,7 +84,9 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 Addresses  readable   a(ayuay)
 </pre>
-<p>Array of tuples of IPv6 address/prefix/gateway.   Deprecated: use AddressData and Gateway.</p>
+<p>        Array of tuples of IPv6 address/prefix/gateway. Deprecated: use
+        AddressData and Gateway.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -92,7 +94,10 @@ Addresses  readable   a(ayuay)
 <pre class="programlisting">
 AddressData  readable   aa{sv}
 </pre>
-<p>Array of IP address data objects. All addresses will include  "address" (an IP address string), and "prefix" (a uint). Some  addresses may include additional attributes.</p>
+<p>        Array of IP address data objects. All addresses will include "address" (an
+        IP address string), and "prefix" (a uint). Some addresses may include
+        additional attributes.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -100,7 +105,8 @@ AddressData  readable   aa{sv}
 <pre class="programlisting">
 Gateway  readable   s
 </pre>
-<p>The gateway in use.</p>
+<p>        The gateway in use.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -108,7 +114,8 @@ Gateway  readable   s
 <pre class="programlisting">
 Routes  readable   a(ayuayu)
 </pre>
-<p>Tuples of IPv6 route/prefix/next-hop/metric.   Deprecated: use RouteData</p>
+<p>        Tuples of IPv6 route/prefix/next-hop/metric. Deprecated: use RouteData
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -116,7 +123,10 @@ Routes  readable   a(ayuayu)
 <pre class="programlisting">
 RouteData  readable   aa{sv}
 </pre>
-<p>Array of IP route data objects. All routes will include "dest"  (an IP address string) and "prefix" (a uint). Some routes may  include "next-hop" (an IP address string), "metric" (a uint),  and additional attributes.</p>
+<p>        Array of IP route data objects. All routes will include "dest" (an IP
+        address string) and "prefix" (a uint). Some routes may include "next-hop"
+        (an IP address string), "metric" (a uint), and additional attributes.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -124,7 +134,8 @@ RouteData  readable   aa{sv}
 <pre class="programlisting">
 Nameservers  readable   aay
 </pre>
-<p>The nameservers in use.</p>
+<p>        The nameservers in use.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -132,7 +143,8 @@ Nameservers  readable   aay
 <pre class="programlisting">
 Domains  readable   as
 </pre>
-<p>A list of domains this address belongs to.</p>
+<p>        A list of domains this address belongs to.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -140,7 +152,8 @@ Domains  readable   as
 <pre class="programlisting">
 Searches  readable   as
 </pre>
-<p>A list of dns searches.</p>
+<p>        A list of dns searches.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -148,7 +161,9 @@ Searches  readable   as
 <pre class="programlisting">
 DnsOptions  readable   as
 </pre>
-<p>A list of DNS options that modify the behavior of the DNS  resolver. See resolv.conf(5) manual page for the list of  supported options.</p>
+<p>        A list of DNS options that modify the behavior of the DNS resolver. See
+        resolv.conf(5) manual page for the list of supported options.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html
index a8466a8e..40a183dc 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html
@@ -48,7 +48,7 @@
 <div class="refsect1">
 <a name="gdbus-methods-org.freedesktop.NetworkManager.PPP"></a><h2>Method Details</h2>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-PPP.NeedSecrets"></a><h3>The <code class="function">NeedSecrets()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-PPP.NeedSecrets"></a><h3>The NeedSecrets() method</h3>
 <pre class="programlisting">
 NeedSecrets (OUT s username,
              OUT s password);
@@ -73,7 +73,7 @@ NeedSecrets (OUT s username,
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp4Config"></a><h3>The <code class="function">SetIp4Config()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp4Config"></a><h3>The SetIp4Config() method</h3>
 <pre class="programlisting">
 SetIp4Config (IN  a{sv} config);
 </pre>
@@ -91,7 +91,7 @@ SetIp4Config (IN  a{sv} config);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp6Config"></a><h3>The <code class="function">SetIp6Config()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp6Config"></a><h3>The SetIp6Config() method</h3>
 <pre class="programlisting">
 SetIp6Config (IN  a{sv} config);
 </pre>
@@ -109,7 +109,7 @@ SetIp6Config (IN  a{sv} config);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-PPP.SetState"></a><h3>The <code class="function">SetState()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-PPP.SetState"></a><h3>The SetState() method</h3>
 <pre class="programlisting">
 SetState (IN  u state);
 </pre>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
index d160c1a1..7899f99b 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
@@ -50,12 +50,21 @@
 </div>
 <div class="refsect1">
 <a name="gdbus-interface-org-freedesktop-NetworkManager-SecretAgent"></a><h2>Description</h2>
-<p>Private D-Bus interface used by secret agents that store and provide             secrets to NetworkManager.  If an agent provides secrets to             NetworkManager as part of connection creation, and the some of those             secrets are "agent owned" the agent should store those secrets             itself and should not expect its <code class="function">SaveSecrets()</code> method to be called.             <code class="function">SaveSecrets()</code> will be called eg if some program other than the             agent itself (like a connection editor) changes the secrets out of             band.  The agent should implement this D-Bus interface on an object             with the path /org/freedesktop/NetworkManager/SecretAgent.</p>
+<p>      Private D-Bus interface used by secret agents that store and provide
+      secrets to NetworkManager. If an agent provides secrets to NetworkManager
+      as part of connection creation, and the some of those secrets are "agent
+      owned" the agent should store those secrets itself and should not expect
+      its SaveSecrets() method to be called. SaveSecrets() will be called eg if
+      some program other than the agent itself (like a connection editor)
+      changes the secrets out of band. The agent should implement this D-Bus
+      interface on an object with the path
+      /org/freedesktop/NetworkManager/SecretAgent.
+</p>
 </div>
 <div class="refsect1">
 <a name="gdbus-methods-org.freedesktop.NetworkManager.SecretAgent"></a><h2>Method Details</h2>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.GetSecrets"></a><h3>The <code class="function">GetSecrets()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.GetSecrets"></a><h3>The GetSecrets() method</h3>
 <pre class="programlisting">
 GetSecrets (IN  a{sa{sv}} connection,
             IN  o         connection_path,
@@ -64,7 +73,14 @@ GetSecrets (IN  a{sa{sv}} connection,
             IN  u         flags,
             OUT a{sa{sv}} secrets);
 </pre>
-<p>Retrieve and return stored secrets, if any, or request new                 secrets from the agent's user.  If user interaction is allowed                 and the user enters new secrets, the agent is expected to save                 the new secrets to persistent storage (if the secret's flags                 include AGENT_OWNED) as NetworkManager will not send these                 secrets back to the same agent via a <code class="function">SaveSecrets()</code> call.  If                 the user canceled any interaction, the agent should return the                 UserCanceled error (see below).</p>
+<p>        Retrieve and return stored secrets, if any, or request new secrets from
+        the agent's user. If user interaction is allowed and the user enters new
+        secrets, the agent is expected to save the new secrets to persistent
+        storage (if the secret's flags include AGENT_OWNED) as NetworkManager will
+        not send these secrets back to the same agent via a SaveSecrets() call. If
+        the user canceled any interaction, the agent should return the
+        UserCanceled error (see below).
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -73,11 +89,11 @@ GetSecrets (IN  a{sa{sv}} connection,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">IN a{sa{sv}} <em class="parameter"><code>connection</code></em></code>:</span></p></td>
-<td><p>Nested settings maps containing the connection for which                     secrets are being requested.  This may contain system-owned                     secrets if the agent has successfully authenticated to                     modify system network settings and the GetSecrets request                     flags allow user interaction.</p></td>
+<td><p>Nested settings maps containing the connection for which secrets are being requested. This may contain system-owned secrets if the agent has successfully authenticated to modify system network settings and the GetSecrets request flags allow user interaction.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN o <em class="parameter"><code>connection_path</code></em></code>:</span></p></td>
-<td><p>Object path of the connection for which secrets are being                     requested.</p></td>
+<td><p>Object path of the connection for which secrets are being requested.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN s <em class="parameter"><code>setting_name</code></em></code>:</span></p></td>
@@ -85,27 +101,30 @@ GetSecrets (IN  a{sa{sv}} connection,
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN as <em class="parameter"><code>hints</code></em></code>:</span></p></td>
-<td><p>Array of strings of key names in the requested setting for                     which NetworkManager thinks a secrets may be required,                     and/or well-known identifiers and data that may be useful                     to the client in processing the secrets request.  Note that                     it's not always possible to determine which secret is                     required, so in some cases no hints may be given.  The Agent                     should return any secrets it has, or that it thinks are                     required, regardless of what hints NetworkManager sends                     in this request.  Some hints have special prefixes that                     provide information to the agent; for example, VPN requests                     may send server-specific messages prefixed with                     "x-vpn-message:".</p></td>
+<td><p>Array of strings of key names in the requested setting for which NetworkManager thinks a secrets may be required, and/or well-known identifiers and data that may be useful to the client in processing the secrets request. Note that it's not always possible to determine which secret is required, so in some cases no hints may be given. The Agent should return any secrets it has, or that it thinks are required, regardless of what hints NetworkManager sends in this request. Some hints have special prefixes that provide information to the agent; for example, VPN requests may send server-specific messages prefixed with "x-vpn-message:".</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN u <em class="parameter"><code>flags</code></em></code>:</span></p></td>
-<td><p>Flags which modify the behavior of the secrets request.                     If true, new secrets are assumed to be invalid or incorrect,                     and the agent should ask the user for new secrets.  If false,                     existing secrets should be retrieved from storage and                      returned without interrupting the user.</p></td>
+<td><p>(<a href="https://developer.gnome.org/libnm-glib/0.9/NMSecretAgent.html#NMSecretAgentGetSecretsFlags">NMSecretAgentGetSecretsFlags</a>) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">OUT a{sa{sv}} <em class="parameter"><code>secrets</code></em></code>:</span></p></td>
-<td><p>Nested settings maps containing secrets.  Each setting MUST                     contain at least the 'name' field, containing the name of                     the setting, and one or more secrets.</p></td>
+<td><p>Nested settings maps containing secrets. Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets.</p></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.CancelGetSecrets"></a><h3>The <code class="function">CancelGetSecrets()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.CancelGetSecrets"></a><h3>The CancelGetSecrets() method</h3>
 <pre class="programlisting">
 CancelGetSecrets (IN  o connection_path,
                   IN  s setting_name);
 </pre>
-<p>Cancel a pending GetSecrets request for secrets of the given                 connection.  Any GetSecrets request with the same                 'connection_path' and 'setting_name' that are given in a                 CancelGetSecrets request should be canceled.</p>
+<p>        Cancel a pending GetSecrets request for secrets of the given connection.
+        Any GetSecrets request with the same 'connection_path' and 'setting_name'
+        that are given in a CancelGetSecrets request should be canceled.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -114,23 +133,24 @@ CancelGetSecrets (IN  o connection_path,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">IN o <em class="parameter"><code>connection_path</code></em></code>:</span></p></td>
-<td><p>Object path of the connection for which, if secrets for                     the given 'setting_name' are being requested, the request                     should be canceled.</p></td>
+<td><p>Object path of the connection for which, if secrets for the given 'setting_name' are being requested, the request should be canceled.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN s <em class="parameter"><code>setting_name</code></em></code>:</span></p></td>
-<td><p>Setting name for which secrets for this connection were                     originally being requested.</p></td>
+<td><p>Setting name for which secrets for this connection were originally being requested.</p></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.SaveSecrets"></a><h3>The <code class="function">SaveSecrets()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.SaveSecrets"></a><h3>The SaveSecrets() method</h3>
 <pre class="programlisting">
 SaveSecrets (IN  a{sa{sv}} connection,
              IN  o         connection_path);
 </pre>
-<p>Save given secrets to backing storage.</p>
+<p>        Save given secrets to backing storage.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -139,23 +159,24 @@ SaveSecrets (IN  a{sa{sv}} connection,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">IN a{sa{sv}} <em class="parameter"><code>connection</code></em></code>:</span></p></td>
-<td><p>Nested settings maps containing the entire connection                     (including secrets), for which the agent should save the                     secrets to backing storage.  This method will not be called                     when the agent itself is the process creating or updating                     a connection; in that case the agent is assumed to have                     already saved those secrets since it had them already.</p></td>
+<td><p>Nested settings maps containing the entire connection (including secrets), for which the agent should save the secrets to backing storage. This method will not be called when the agent itself is the process creating or updating a connection; in that case the agent is assumed to have already saved those secrets since it had them already.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN o <em class="parameter"><code>connection_path</code></em></code>:</span></p></td>
-<td><p>Object path of the connection for which the agent should                     save secrets to backing storage.</p></td>
+<td><p>Object path of the connection for which the agent should save secrets to backing storage.</p></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.DeleteSecrets"></a><h3>The <code class="function">DeleteSecrets()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.DeleteSecrets"></a><h3>The DeleteSecrets() method</h3>
 <pre class="programlisting">
 DeleteSecrets (IN  a{sa{sv}} connection,
                IN  o         connection_path);
 </pre>
-<p>Delete secrets from backing storage.</p>
+<p>        Delete secrets from backing storage.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -164,11 +185,11 @@ DeleteSecrets (IN  a{sa{sv}} connection,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">IN a{sa{sv}} <em class="parameter"><code>connection</code></em></code>:</span></p></td>
-<td><p>Nested settings maps containing the connection properties                     (sans secrets), for which the agent should delete the                     secrets from backing storage.</p></td>
+<td><p>Nested settings maps containing the connection properties (sans secrets), for which the agent should delete the secrets from backing storage.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN o <em class="parameter"><code>connection_path</code></em></code>:</span></p></td>
-<td><p>Object path of the connection for which the agent should                     delete secrets from backing storage.</p></td>
+<td><p>Object path of the connection for which the agent should delete secrets from backing storage.</p></td>
 </tr>
 </tbody>
 </table></div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html
index db2a7d57..b985416f 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html
@@ -62,16 +62,22 @@
 </div>
 <div class="refsect1">
 <a name="gdbus-interface-org-freedesktop-NetworkManager-Settings-Connection"></a><h2>Description</h2>
-<p>Represents a single network connection configuration.</p>
+<p>      Represents a single network connection configuration.
+</p>
 </div>
 <div class="refsect1">
 <a name="gdbus-methods-org.freedesktop.NetworkManager.Settings.Connection"></a><h2>Method Details</h2>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Update"></a><h3>The <code class="function">Update()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Update"></a><h3>The Update() method</h3>
 <pre class="programlisting">
 Update (IN  a{sa{sv}} properties);
 </pre>
-<p>Update the connection with new settings and properties (replacing             all previous settings and properties) and save the connection to             disk.  Secrets may be part of the update request, and will be either             stored in persistent storage or sent to a Secret Agent for storage,             depending on the flags associated with each secret.</p>
+<p>        Update the connection with new settings and properties (replacing all
+        previous settings and properties) and save the connection to disk. Secrets
+        may be part of the update request, and will be either stored in persistent
+        storage or sent to a Secret Agent for storage, depending on the flags
+        associated with each secret.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -85,11 +91,19 @@ Update (IN  a{sa{sv}} properties);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.UpdateUnsaved"></a><h3>The <code class="function">UpdateUnsaved()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.UpdateUnsaved"></a><h3>The UpdateUnsaved() method</h3>
 <pre class="programlisting">
 UpdateUnsaved (IN  a{sa{sv}} properties);
 </pre>
-<p>Update the connection with new settings and properties (replacing             all previous settings and properties) but do not immediately save             the connection to disk.  Secrets may be part of the update request             and may sent to a Secret Agent for storage, depending on the             flags associated with each secret.              Use the 'Save' method to save these changes to disk. Note             that unsaved changes will be lost if the connection is             reloaded from disk (either automatically on file change or             due to an explicit ReloadConnections call).</p>
+<p>        Update the connection with new settings and properties (replacing all
+        previous settings and properties) but do not immediately save the
+        connection to disk. Secrets may be part of the update request and may sent
+        to a Secret Agent for storage, depending on the flags associated with each
+        secret. Use the 'Save' method to save these changes to disk. Note that
+        unsaved changes will be lost if the connection is reloaded from disk
+        (either automatically on file change or due to an explicit
+        ReloadConnections call).
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -103,19 +117,24 @@ UpdateUnsaved (IN  a{sa{sv}} properties);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Delete"></a><h3>The <code class="function">Delete()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Delete"></a><h3>The Delete() method</h3>
 <pre class="programlisting">
 Delete ();
 </pre>
-<p>Delete the connection.</p>
+<p>        Delete the connection.
+</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSettings"></a><h3>The <code class="function">GetSettings()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSettings"></a><h3>The GetSettings() method</h3>
 <pre class="programlisting">
 GetSettings (OUT a{sa{sv}} settings);
 </pre>
-<p>Get the settings maps describing this network configuration.                 This will never include any secrets required for connection                 to the network, as those are often protected.  Secrets must                 be requested separately using the <code class="function">GetSecrets()</code> call.</p>
+<p>        Get the settings maps describing this network configuration. This will
+        never include any secrets required for connection to the network, as those
+        are often protected. Secrets must be requested separately using the
+        GetSecrets() call.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -129,12 +148,16 @@ GetSettings (OUT a{sa{sv}} settings);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSecrets"></a><h3>The <code class="function">GetSecrets()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSecrets"></a><h3>The GetSecrets() method</h3>
 <pre class="programlisting">
 GetSecrets (IN  s         setting_name,
             OUT a{sa{sv}} secrets);
 </pre>
-<p>Get the secrets belonging to this network configuration.  Only                 secrets from persistent storage or a Secret Agent running in                 the requestor's session will be returned.  The user will never                 be prompted for secrets as a result of this request.</p>
+<p>        Get the secrets belonging to this network configuration. Only secrets from
+        persistent storage or a Secret Agent running in the requestor's session
+        will be returned. The user will never be prompted for secrets as a result
+        of this request.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -143,7 +166,7 @@ GetSecrets (IN  s         setting_name,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">IN s <em class="parameter"><code>setting_name</code></em></code>:</span></p></td>
-<td><p>Name of the setting to return secrets for.  If empty, all                     all secrets will be returned.</p></td>
+<td><p>Name of the setting to return secrets for. If empty, all all secrets will be returned.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">OUT a{sa{sv}} <em class="parameter"><code>secrets</code></em></code>:</span></p></td>
@@ -154,19 +177,22 @@ GetSecrets (IN  s         setting_name,
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.ClearSecrets"></a><h3>The <code class="function">ClearSecrets()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.ClearSecrets"></a><h3>The ClearSecrets() method</h3>
 <pre class="programlisting">
 ClearSecrets ();
 </pre>
-<p>Clear the secrets belonging to this network connection profile.</p>
+<p>        Clear the secrets belonging to this network connection profile.
+</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Save"></a><h3>The <code class="function">Save()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Save"></a><h3>The Save() method</h3>
 <pre class="programlisting">
 Save ();
 </pre>
-<p>Saves a "dirty" connection (that had previously been                 updated with UpdateUnsaved) to persistent storage.</p>
+<p>        Saves a "dirty" connection (that had previously been updated with
+        UpdateUnsaved) to persistent storage.
+</p>
 </div>
 </div>
 <div class="refsect1">
@@ -176,7 +202,11 @@ Save ();
 <pre class="programlisting">
 Updated ();
 </pre>
-<p>Emitted when any settings or permissions change.  When handling                 this signal, clients should re-read the connection using the                 GetSettings method to get the changes and to ensure the client                 still has permission to access the connection.</p>
+<p>        Emitted when any settings or permissions change. When handling this
+        signal, clients should re-read the connection using the GetSettings method
+        to get the changes and to ensure the client still has permission to access
+        the connection.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -184,7 +214,11 @@ Updated ();
 <pre class="programlisting">
 Removed ();
 </pre>
-<p>Emitted when this connection is no longer available.  This                 happens when the connection is deleted or if it is no longer                 accessible by any of the system's logged-in users.  After                 receipt of this signal, the object no longer exists.  Also                 see the Settings.ConnectionRemoved signal.</p>
+<p>        Emitted when this connection is no longer available. This happens when the
+        connection is deleted or if it is no longer accessible by any of the
+        system's logged-in users. After receipt of this signal, the object no
+        longer exists. Also see the Settings.ConnectionRemoved signal.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -212,7 +246,11 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 Unsaved  readable   b
 </pre>
-<p>If set, indicates that the in-memory state of the                 connection does not match the on-disk state. This flag                 will be set when <code class="function">UpdateUnsaved()</code> is called or when any                 connection details change, and cleared when the connection                 is saved to disk via <code class="function">Save()</code> or from internal operations.</p>
+<p>        If set, indicates that the in-memory state of the connection does not
+        match the on-disk state. This flag will be set when UpdateUnsaved() is
+        called or when any connection details change, and cleared when the
+        connection is saved to disk via Save() or from internal operations.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html
index d4b243dc..e2064236 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html
@@ -68,16 +68,19 @@
 </div>
 <div class="refsect1">
 <a name="gdbus-interface-org-freedesktop-NetworkManager-Settings"></a><h2>Description</h2>
-<p>The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.</p>
+<p>      The Settings interface allows clients to view and administrate the
+      connections stored and used by NetworkManager.
+</p>
 </div>
 <div class="refsect1">
 <a name="gdbus-methods-org.freedesktop.NetworkManager.Settings"></a><h2>Method Details</h2>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.ListConnections"></a><h3>The <code class="function">ListConnections()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.ListConnections"></a><h3>The ListConnections() method</h3>
 <pre class="programlisting">
 ListConnections (OUT ao connections);
 </pre>
-<p>List the saved network connections known to NetworkManager.</p>
+<p>        List the saved network connections known to NetworkManager.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -91,12 +94,13 @@ ListConnections (OUT ao connections);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.GetConnectionByUuid"></a><h3>The <code class="function">GetConnectionByUuid()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.GetConnectionByUuid"></a><h3>The GetConnectionByUuid() method</h3>
 <pre class="programlisting">
 GetConnectionByUuid (IN  s uuid,
                      OUT o connection);
 </pre>
-<p>Retrieve the object path of a connection, given that connection's UUID.</p>
+<p>        Retrieve the object path of a connection, given that connection's UUID.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -116,12 +120,16 @@ GetConnectionByUuid (IN  s uuid,
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnection"></a><h3>The <code class="function">AddConnection()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnection"></a><h3>The AddConnection() method</h3>
 <pre class="programlisting">
 AddConnection (IN  a{sa{sv}} connection,
                OUT o         path);
 </pre>
-<p>Add new connection and save it to disk.  This operation does not start         the network connection unless (1) device is idle and able to connect to         the network described by the new connection, and (2) the connection         is allowed to be started automatically.</p>
+<p>        Add new connection and save it to disk. This operation does not start the
+        network connection unless (1) device is idle and able to connect to the
+        network described by the new connection, and (2) the connection is allowed
+        to be started automatically.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -141,12 +149,19 @@ AddConnection (IN  a{sa{sv}} connection,
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnectionUnsaved"></a><h3>The <code class="function">AddConnectionUnsaved()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnectionUnsaved"></a><h3>The AddConnectionUnsaved() method</h3>
 <pre class="programlisting">
 AddConnectionUnsaved (IN  a{sa{sv}} connection,
                       OUT o         path);
 </pre>
-<p>Add new connection but do not save it to disk immediately.  This         operation does not start the network connection unless (1) device is         idle and able to connect to the network described by the new connection,         and (2) the connection is allowed to be started automatically.          Use the 'Save' method on the connection to save these changes         to disk. Note that unsaved changes will be lost if the         connection is reloaded from disk (either automatically on file         change or due to an explicit ReloadConnections call).</p>
+<p>        Add new connection but do not save it to disk immediately. This operation
+        does not start the network connection unless (1) device is idle and able
+        to connect to the network described by the new connection, and (2) the
+        connection is allowed to be started automatically. Use the 'Save' method
+        on the connection to save these changes to disk. Note that unsaved changes
+        will be lost if the connection is reloaded from disk (either automatically
+        on file change or due to an explicit ReloadConnections call).
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -166,13 +181,19 @@ AddConnectionUnsaved (IN  a{sa{sv}} connection,
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.LoadConnections"></a><h3>The <code class="function">LoadConnections()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.LoadConnections"></a><h3>The LoadConnections() method</h3>
 <pre class="programlisting">
 LoadConnections (IN  as filenames,
                  OUT b  status,
                  OUT as failures);
 </pre>
-<p>Loads or reloads the indicated connections from disk. You         should call this after making changes directly to an on-disk         connection file to make sure that NetworkManager sees the         changes. (If "monitor-connection-files" in NetworkManager.conf         is "true", then this will have no real effect, but is         harmless.) As with <code class="function">AddConnection()</code>, this operation does not         necessarily start the network connection.</p>
+<p>        Loads or reloads the indicated connections from disk. You should call this
+        after making changes directly to an on-disk connection file to make sure
+        that NetworkManager sees the changes. (If "monitor-connection-files" in
+        NetworkManager.conf is "true", then this will have no real effect, but is
+        harmless.) As with AddConnection(), this operation does not necessarily
+        start the network connection.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -181,11 +202,11 @@ LoadConnections (IN  as filenames,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">IN as <em class="parameter"><code>filenames</code></em></code>:</span></p></td>
-<td><p>Array of paths to on-disk connection profiles in directories           monitored by NetworkManager.</p></td>
+<td><p>Array of paths to on-disk connection profiles in directories monitored by NetworkManager.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">OUT b <em class="parameter"><code>status</code></em></code>:</span></p></td>
-<td><p>Success or failure of the operation as a whole. True if           NetworkManager at least tried to load the indicated           connections, even if it did not succeed. False if an error           occurred before trying to load the connections (eg,           permission denied).</p></td>
+<td><p>Success or failure of the operation as a whole. True if NetworkManager at least tried to load the indicated connections, even if it did not succeed. False if an error occurred before trying to load the connections (eg, permission denied).</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">OUT as <em class="parameter"><code>failures</code></em></code>:</span></p></td>
@@ -196,11 +217,16 @@ LoadConnections (IN  as filenames,
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.ReloadConnections"></a><h3>The <code class="function">ReloadConnections()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.ReloadConnections"></a><h3>The ReloadConnections() method</h3>
 <pre class="programlisting">
 ReloadConnections (OUT b status);
 </pre>
-<p>Tells NetworkManager to reload all connection files from disk,         including noticing any added or deleted connection files. By         default, connections are re-read automatically any time they         change, so you only need to use this command if you have set         "monitor-connection-files=false" in NetworkManager.conf.</p>
+<p>        Tells NetworkManager to reload all connection files from disk, including
+        noticing any added or deleted connection files. By default, connections
+        are re-read automatically any time they change, so you only need to use
+        this command if you have set "monitor-connection-files=false" in
+        NetworkManager.conf.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -214,11 +240,12 @@ ReloadConnections (OUT b status);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.SaveHostname"></a><h3>The <code class="function">SaveHostname()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-Settings.SaveHostname"></a><h3>The SaveHostname() method</h3>
 <pre class="programlisting">
 SaveHostname (IN  s hostname);
 </pre>
-<p>Save the hostname to persistent configuration.</p>
+<p>        Save the hostname to persistent configuration.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -226,7 +253,7 @@ SaveHostname (IN  s hostname);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">IN s <em class="parameter"><code>hostname</code></em></code>:</span></p></td>
-<td><p>The hostname to save to persistent configuration.  If blank, the persistent hostname is cleared.</p></td>
+<td><p>The hostname to save to persistent configuration. If blank, the persistent hostname is cleared.</p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -256,7 +283,15 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 NewConnection (o connection);
 </pre>
-<p>Emitted when a new connection has been added after NetworkManager has         started up and initialized.  This signal is not emitted for connections         read while starting up, because NetworkManager's D-Bus service is only         available after all connections have been read, and to prevent spamming         listeners with too many signals at one time.  To retrieve the initial         connection list, call the <code class="function">ListConnections()</code> method once, and then listen         for individual Settings.NewConnection and Settings.Connection.Deleted         signals for further updates.</p>
+<p>        Emitted when a new connection has been added after NetworkManager has
+        started up and initialized. This signal is not emitted for connections
+        read while starting up, because NetworkManager's D-Bus service is only
+        available after all connections have been read, and to prevent spamming
+        listeners with too many signals at one time. To retrieve the initial
+        connection list, call the ListConnections() method once, and then listen
+        for individual Settings.NewConnection and Settings.Connection.Deleted
+        signals for further updates.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -274,7 +309,12 @@ NewConnection (o connection);
 <pre class="programlisting">
 ConnectionRemoved (o connection);
 </pre>
-<p>Emitted when a connection is no longer available.  This happens when         the connection is deleted or if it is no longer accessible by any of         the system's logged-in users.  After receipt of this signal, the         connection no longer exists and cannot be used.  Also see the         Settings.Connection.Removed signal.</p>
+<p>        Emitted when a connection is no longer available. This happens when the
+        connection is deleted or if it is no longer accessible by any of the
+        system's logged-in users. After receipt of this signal, the connection no
+        longer exists and cannot be used. Also see the Settings.Connection.Removed
+        signal.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -294,7 +334,8 @@ ConnectionRemoved (o connection);
 <pre class="programlisting">
 Connections  readable   ao
 </pre>
-<p>List of object paths of available network connection profiles.</p>
+<p>        List of object paths of available network connection profiles.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -302,7 +343,8 @@ Connections  readable   ao
 <pre class="programlisting">
 Hostname  readable   s
 </pre>
-<p>The machine hostname stored in persistent configuration.</p>
+<p>        The machine hostname stored in persistent configuration.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -310,7 +352,8 @@ Hostname  readable   s
 <pre class="programlisting">
 CanModify  readable   b
 </pre>
-<p>If true, adding and modifying connections is supported.</p>
+<p>        If true, adding and modifying connections is supported.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
index ea6bd031..331d3a5e 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
@@ -50,7 +50,8 @@
 </div>
 <div class="refsect1">
 <a name="gdbus-interface-org-freedesktop-NetworkManager-VPN-Connection"></a><h2>Description</h2>
-<p>Represents an active connection to a Virtual Private Network.</p>
+<p>      Represents an active connection to a Virtual Private Network.
+</p>
 </div>
 <div class="refsect1">
 <a name="gdbus-signals-org.freedesktop.NetworkManager.VPN.Connection"></a><h2>Signal Details</h2>
@@ -78,7 +79,8 @@ PropertiesChanged (a{sv} properties);
 VpnStateChanged (u state,
                  u reason);
 </pre>
-<p>Emitted when the state of the VPN connection has changed.</p>
+<p>        Emitted when the state of the VPN connection has changed.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -87,11 +89,11 @@ VpnStateChanged (u state,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>state</code></em></code>:</span></p></td>
-<td><p>The new state of the VPN connection.</p></td>
+<td><p>(NMVpnConnectionState) The new state of the VPN connection.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>reason</code></em></code>:</span></p></td>
-<td><p>Reason code describing the change to the new state.</p></td>
+<td><p>(NMVpnConnectionStateReason) Reason code describing the change to the new state.</p></td>
 </tr>
 </tbody>
 </table></div>
@@ -104,7 +106,10 @@ VpnStateChanged (u state,
 <pre class="programlisting">
 VpnState  readable   u
 </pre>
-<p>The VPN-specific state of the connection.</p>
+<p>        The VPN-specific state of the connection.
+</p>
+<p>        Returns: NMVpnConnectionState
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -112,7 +117,8 @@ VpnState  readable   u
 <pre class="programlisting">
 Banner  readable   s
 </pre>
-<p>The banner string of the VPN connection.</p>
+<p>        The banner string of the VPN connection.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
index 64517b2c..bc21c67c 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
@@ -70,16 +70,20 @@
 </div>
 <div class="refsect1">
 <a name="gdbus-interface-org-freedesktop-NetworkManager-VPN-Plugin"></a><h2>Description</h2>
-<p>This interface is provided by plugins providing VPN services to the NetworkManager daemon.</p>
+<p>      This interface is provided by plugins providing VPN services to the
+      NetworkManager daemon.
+</p>
 </div>
 <div class="refsect1">
 <a name="gdbus-methods-org.freedesktop.NetworkManager.VPN.Plugin"></a><h2>Method Details</h2>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Connect"></a><h3>The <code class="function">Connect()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Connect"></a><h3>The Connect() method</h3>
 <pre class="programlisting">
 Connect (IN  a{sa{sv}} connection);
 </pre>
-<p>Tells the plugin to connect.  Interactive secrets requests (eg, emitting         the SecretsRequired signal) are not allowed.</p>
+<p>        Tells the plugin to connect. Interactive secrets requests (eg, emitting
+        the SecretsRequired signal) are not allowed.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -93,12 +97,15 @@ Connect (IN  a{sa{sv}} connection);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.ConnectInteractive"></a><h3>The <code class="function">ConnectInteractive()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.ConnectInteractive"></a><h3>The ConnectInteractive() method</h3>
 <pre class="programlisting">
 ConnectInteractive (IN  a{sa{sv}} connection,
                     IN  a{sv}     details);
 </pre>
-<p>Tells the plugin to connect, allowing interactive secrets requests (eg         the plugin is allowed to emit the SecretsRequired signal if the VPN         service indicates that it needs additional secrets during the connect         process).</p>
+<p>        Tells the plugin to connect, allowing interactive secrets requests (eg the
+        plugin is allowed to emit the SecretsRequired signal if the VPN service
+        indicates that it needs additional secrets during the connect process).
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -118,12 +125,14 @@ ConnectInteractive (IN  a{sa{sv}} connection,
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NeedSecrets"></a><h3>The <code class="function">NeedSecrets()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NeedSecrets"></a><h3>The NeedSecrets() method</h3>
 <pre class="programlisting">
 NeedSecrets (IN  a{sa{sv}} settings,
              OUT s         setting_name);
 </pre>
-<p>Asks the plugin whether the provided connection will require secrets to connect successfully.</p>
+<p>        Asks the plugin whether the provided connection will require secrets to
+        connect successfully.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -143,19 +152,21 @@ NeedSecrets (IN  a{sa{sv}} settings,
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Disconnect"></a><h3>The <code class="function">Disconnect()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Disconnect"></a><h3>The Disconnect() method</h3>
 <pre class="programlisting">
 Disconnect ();
 </pre>
-<p>Disconnect the plugin.</p>
+<p>        Disconnect the plugin.
+</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetConfig"></a><h3>The <code class="function">SetConfig()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetConfig"></a><h3>The SetConfig() method</h3>
 <pre class="programlisting">
 SetConfig (IN  a{sv} config);
 </pre>
-<p>Set generic connection details on the connection.</p>
+<p>        Set generic connection details on the connection.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -169,11 +180,12 @@ SetConfig (IN  a{sv} config);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp4Config"></a><h3>The <code class="function">SetIp4Config()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp4Config"></a><h3>The SetIp4Config() method</h3>
 <pre class="programlisting">
 SetIp4Config (IN  a{sv} config);
 </pre>
-<p>Set IPv4 details on the connection.</p>
+<p>        Set IPv4 details on the connection.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -181,17 +193,18 @@ SetIp4Config (IN  a{sv} config);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">IN a{sv} <em class="parameter"><code>config</code></em></code>:</span></p></td>
-<td><p>Ip4Config details for the connection. You must call    <code class="function">SetConfig()</code> before calling this.</p></td>
+<td><p>Ip4Config details for the connection. You must call SetConfig() before calling this.</p></td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp6Config"></a><h3>The <code class="function">SetIp6Config()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp6Config"></a><h3>The SetIp6Config() method</h3>
 <pre class="programlisting">
 SetIp6Config (IN  a{sv} config);
 </pre>
-<p>Set IPv6 details on the connection.</p>
+<p>        Set IPv6 details on the connection.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -199,17 +212,18 @@ SetIp6Config (IN  a{sv} config);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">IN a{sv} <em class="parameter"><code>config</code></em></code>:</span></p></td>
-<td><p>Ip6Config details for the connection. You must call    <code class="function">SetConfig()</code> before calling this.</p></td>
+<td><p>Ip6Config details for the connection. You must call SetConfig() before calling this.</p></td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetFailure"></a><h3>The <code class="function">SetFailure()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetFailure"></a><h3>The SetFailure() method</h3>
 <pre class="programlisting">
 SetFailure (IN  s reason);
 </pre>
-<p>Indicate a failure to the plugin.</p>
+<p>        Indicate a failure to the plugin.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -223,11 +237,13 @@ SetFailure (IN  s reason);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NewSecrets"></a><h3>The <code class="function">NewSecrets()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NewSecrets"></a><h3>The NewSecrets() method</h3>
 <pre class="programlisting">
 NewSecrets (IN  a{sa{sv}} connection);
 </pre>
-<p>Called in response to a SecretsRequired signal to deliver updated secrets         or other information to the plugin.</p>
+<p>        Called in response to a SecretsRequired signal to deliver updated secrets
+        or other information to the plugin.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -247,7 +263,8 @@ NewSecrets (IN  a{sa{sv}} connection);
 <pre class="programlisting">
 StateChanged (u state);
 </pre>
-<p>Emitted when the plugin state changes.</p>
+<p>        Emitted when the plugin state changes.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -255,7 +272,7 @@ StateChanged (u state);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>state</code></em></code>:</span></p></td>
-<td><p>The new state of the plugin.</p></td>
+<td><p>(NMVpnServiceState) The new state of the plugin.</p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -266,7 +283,10 @@ StateChanged (u state);
 SecretsRequired (s  message,
                  as secrets);
 </pre>
-<p>Emitted during an ongoing <code class="function">ConnectInteractive()</code> request when the plugin         has determined that new secrets are required.  NetworkManager will then         call the <code class="function">NewSecrets()</code> method with a connection hash including the new         secrets.</p>
+<p>        Emitted during an ongoing ConnectInteractive() request when the plugin has
+        determined that new secrets are required. NetworkManager will then call
+        the NewSecrets() method with a connection hash including the new secrets.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -275,11 +295,11 @@ SecretsRequired (s  message,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">s <em class="parameter"><code>message</code></em></code>:</span></p></td>
-<td><p>Informational message, if any, about the request.  For example, if               a second PIN is required, could indicate to the user to wait for               the token code to change until entering the next PIN.</p></td>
+<td><p>Informational message, if any, about the request. For example, if a second PIN is required, could indicate to the user to wait for the token code to change until entering the next PIN.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">as <em class="parameter"><code>secrets</code></em></code>:</span></p></td>
-<td><p>Array of strings of VPN secret names which the plugin thinks               secrets may be required for, or other VPN-specific data to be               processed by the VPN's front-end.</p></td>
+<td><p>Array of strings of VPN secret names which the plugin thinks secrets may be required for, or other VPN-specific data to be processed by the VPN's front-end.</p></td>
 </tr>
 </tbody>
 </table></div>
@@ -290,7 +310,8 @@ SecretsRequired (s  message,
 <pre class="programlisting">
 Config (a{sv} config);
 </pre>
-<p>The plugin obtained generic configuration information.</p>
+<p>        The plugin obtained generic configuration information.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -308,7 +329,8 @@ Config (a{sv} config);
 <pre class="programlisting">
 Ip4Config (a{sv} ip4config);
 </pre>
-<p>The plugin obtained an IPv4 configuration.</p>
+<p>        The plugin obtained an IPv4 configuration.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -326,7 +348,8 @@ Ip4Config (a{sv} ip4config);
 <pre class="programlisting">
 Ip6Config (a{sv} ip6config);
 </pre>
-<p>The plugin obtained an IPv6 configuration.</p>
+<p>        The plugin obtained an IPv6 configuration.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -344,7 +367,8 @@ Ip6Config (a{sv} ip6config);
 <pre class="programlisting">
 LoginBanner (s banner);
 </pre>
-<p>Emitted when the plugin receives a login banner from the VPN service.</p>
+<p>        Emitted when the plugin receives a login banner from the VPN service.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -362,7 +386,8 @@ LoginBanner (s banner);
 <pre class="programlisting">
 Failure (u reason);
 </pre>
-<p>Emitted when a failure in the VPN plugin occurs.</p>
+<p>        Emitted when a failure in the VPN plugin occurs.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -370,7 +395,7 @@ Failure (u reason);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>reason</code></em></code>:</span></p></td>
-<td><p>Reason code for the failure.</p></td>
+<td><p>(NMVpnPluginFailure) Reason code for the failure.</p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -382,7 +407,10 @@ Failure (u reason);
 <pre class="programlisting">
 State  readable   u
 </pre>
-<p>The state of the plugin.</p>
+<p>        The state of the plugin.
+</p>
+<p>        Returns: NMVpnServiceState
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
index ec168881..d028c602 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
@@ -102,11 +102,12 @@
 <div class="refsect1">
 <a name="gdbus-methods-org.freedesktop.NetworkManager"></a><h2>Method Details</h2>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager.GetDevices"></a><h3>The <code class="function">GetDevices()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager.GetDevices"></a><h3>The GetDevices() method</h3>
 <pre class="programlisting">
 GetDevices (OUT ao devices);
 </pre>
-<p>Get the list of realized network devices.</p>
+<p>        Get the list of realized network devices.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -114,17 +115,18 @@ GetDevices (OUT ao devices);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">OUT ao <em class="parameter"><code>devices</code></em></code>:</span></p></td>
-<td><p>List of object paths of network devices known to the system.  This           list does not include device placeholders (see <code class="function">GetAllDevices()</code>).</p></td>
+<td><p>List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()).</p></td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager.GetAllDevices"></a><h3>The <code class="function">GetAllDevices()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager.GetAllDevices"></a><h3>The GetAllDevices() method</h3>
 <pre class="programlisting">
 GetAllDevices (OUT ao devices);
 </pre>
-<p>Get the list of all network devices.</p>
+<p>        Get the list of all network devices.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -132,18 +134,21 @@ GetAllDevices (OUT ao devices);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">OUT ao <em class="parameter"><code>devices</code></em></code>:</span></p></td>
-<td><p>List of object paths of network devices and device placeholders           (eg, devices that do not yet exist but which can be automatically           created by NetworkManager if one of their AvailableConnections           was activated).</p></td>
+<td><p>List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated).</p></td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager.GetDeviceByIpIface"></a><h3>The <code class="function">GetDeviceByIpIface()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager.GetDeviceByIpIface"></a><h3>The GetDeviceByIpIface() method</h3>
 <pre class="programlisting">
 GetDeviceByIpIface (IN  s iface,
                     OUT o device);
 </pre>
-<p>Return the object path of the network device referenced by its IP         interface name.  Note that some devices (usually modems) only have an         IP interface name when they are connected.</p>
+<p>        Return the object path of the network device referenced by its IP
+        interface name. Note that some devices (usually modems) only have an IP
+        interface name when they are connected.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -163,14 +168,15 @@ GetDeviceByIpIface (IN  s iface,
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager.ActivateConnection"></a><h3>The <code class="function">ActivateConnection()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager.ActivateConnection"></a><h3>The ActivateConnection() method</h3>
 <pre class="programlisting">
 ActivateConnection (IN  o connection,
                     IN  o device,
                     IN  o specific_object,
                     OUT o active_connection);
 </pre>
-<p>Activate a connection using the supplied device.</p>
+<p>        Activate a connection using the supplied device.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -179,15 +185,15 @@ ActivateConnection (IN  o connection,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">IN o <em class="parameter"><code>connection</code></em></code>:</span></p></td>
-<td><p>The connection to activate.  If "/" is given, a valid device path must           be given, and NetworkManager picks the best connection to activate for           the given device.  VPN connections must always pass a valid connection           path.</p></td>
+<td><p>The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN o <em class="parameter"><code>device</code></em></code>:</span></p></td>
-<td><p>The object path of device to be activated for physical connections.           This parameter is ignored for VPN connections, because the           specific_object (if provided) specifies the device to use.</p></td>
+<td><p>The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN o <em class="parameter"><code>specific_object</code></em></code>:</span></p></td>
-<td><p>The path of a connection-type-specific object this activation should use.            This parameter is currently ignored for wired and mobile broadband connections,           and the value of "/" should be used (ie, no specific object).  For WiFi           connections, pass the object path of a specific AP from the card's scan           list, or "/" to pick an AP automatically.  For VPN connections, pass           the object path of an ActiveConnection object that should serve as the           "base" connection (to which the VPN connections lifetime will be tied),           or pass "/" and NM will automatically use the current default device.</p></td>
+<td><p>The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">OUT o <em class="parameter"><code>active_connection</code></em></code>:</span></p></td>
@@ -198,7 +204,7 @@ ActivateConnection (IN  o connection,
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager.AddAndActivateConnection"></a><h3>The <code class="function">AddAndActivateConnection()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager.AddAndActivateConnection"></a><h3>The AddAndActivateConnection() method</h3>
 <pre class="programlisting">
 AddAndActivateConnection (IN  a{sa{sv}} connection,
                           IN  o         device,
@@ -206,7 +212,11 @@ AddAndActivateConnection (IN  a{sa{sv}} connection,
                           OUT o         path,
                           OUT o         active_connection);
 </pre>
-<p>Adds a new connection using the given details (if any) as a template         (automatically filling in missing settings with the capabilities of the         given device and specific object), then activate the new connection.         Cannot be used for VPN connections at this time.</p>
+<p>        Adds a new connection using the given details (if any) as a template
+        (automatically filling in missing settings with the capabilities of the
+        given device and specific object), then activate the new connection.
+        Cannot be used for VPN connections at this time.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -215,7 +225,7 @@ AddAndActivateConnection (IN  a{sa{sv}} connection,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">IN a{sa{sv}} <em class="parameter"><code>connection</code></em></code>:</span></p></td>
-<td><p>Connection settings and properties; if incomplete missing settings will           be automatically completed using the given device and specific object.</p></td>
+<td><p>Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN o <em class="parameter"><code>device</code></em></code>:</span></p></td>
@@ -223,7 +233,7 @@ AddAndActivateConnection (IN  a{sa{sv}} connection,
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN o <em class="parameter"><code>specific_object</code></em></code>:</span></p></td>
-<td><p>The path of a connection-type-specific object this activation should use.            This parameter is currently ignored for wired and mobile broadband connections,           and the value of "/" should be used (ie, no specific object).  For WiFi           connections, pass the object path of a specific AP from the card's scan           list, which will be used to complete the details of the newly added           connection.</p></td>
+<td><p>The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">OUT o <em class="parameter"><code>path</code></em></code>:</span></p></td>
@@ -238,11 +248,12 @@ AddAndActivateConnection (IN  a{sa{sv}} connection,
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager.DeactivateConnection"></a><h3>The <code class="function">DeactivateConnection()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager.DeactivateConnection"></a><h3>The DeactivateConnection() method</h3>
 <pre class="programlisting">
 DeactivateConnection (IN  o active_connection);
 </pre>
-<p>Deactivate an active connection.</p>
+<p>        Deactivate an active connection.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -256,11 +267,15 @@ DeactivateConnection (IN  o active_connection);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager.Sleep"></a><h3>The <code class="function">Sleep()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager.Sleep"></a><h3>The Sleep() method</h3>
 <pre class="programlisting">
 Sleep (IN  b sleep);
 </pre>
-<p>Control the NetworkManager daemon's sleep state.  When asleep, all         interfaces that it manages are deactivated.  When awake, devices are         available to be activated.  This command should not be called directly         by users or clients; it is intended for system suspend/resume tracking.</p>
+<p>        Control the NetworkManager daemon's sleep state. When asleep, all
+        interfaces that it manages are deactivated. When awake, devices are
+        available to be activated. This command should not be called directly by
+        users or clients; it is intended for system suspend/resume tracking.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -274,11 +289,16 @@ Sleep (IN  b sleep);
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager.Enable"></a><h3>The <code class="function">Enable()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager.Enable"></a><h3>The Enable() method</h3>
 <pre class="programlisting">
 Enable (IN  b enable);
 </pre>
-<p>Control whether overall networking is enabled or disabled.  When         disabled, all interfaces that NM manages are deactivated.  When enabled,         all managed interfaces are re-enabled and available to be activated.         This command should be used by clients that provide to users the ability         to enable/disable all networking.</p>
+<p>        Control whether overall networking is enabled or disabled. When disabled,
+        all interfaces that NM manages are deactivated. When enabled, all managed
+        interfaces are re-enabled and available to be activated. This command
+        should be used by clients that provide to users the ability to
+        enable/disable all networking.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -286,17 +306,20 @@ Enable (IN  b enable);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">IN b <em class="parameter"><code>enable</code></em></code>:</span></p></td>
-<td><p>If FALSE, indicates that all networking should be disabled.  If TRUE,           indicates that NetworkManager should begin managing network devices.</p></td>
+<td><p>If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices.</p></td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager.GetPermissions"></a><h3>The <code class="function">GetPermissions()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager.GetPermissions"></a><h3>The GetPermissions() method</h3>
 <pre class="programlisting">
 GetPermissions (OUT a{ss} permissions);
 </pre>
-<p>Returns the permissions a caller has for various authenticated operations         that NetworkManager provides, like Enable/Disable networking, changing         WiFi, WWAN, and WiMAX state, etc.</p>
+<p>        Returns the permissions a caller has for various authenticated operations
+        that NetworkManager provides, like Enable/Disable networking, changing
+        WiFi, WWAN, and WiMAX state, etc.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -304,18 +327,19 @@ GetPermissions (OUT a{ss} permissions);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">OUT a{ss} <em class="parameter"><code>permissions</code></em></code>:</span></p></td>
-<td><p>Dictionary of available permissions and results.  Each permission           is represented by a name (ie "org.freedesktop.NetworkManager.Foobar")           and each result is one of the following values: "yes" (the permission           is available), "auth" (the permission is available after a successful           authentication), or "no" (the permission is denied).  Clients may use           these values in the UI to indicate the ability to perform certain           operations.</p></td>
+<td><p>Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations.</p></td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager.SetLogging"></a><h3>The <code class="function">SetLogging()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager.SetLogging"></a><h3>The SetLogging() method</h3>
 <pre class="programlisting">
 SetLogging (IN  s level,
             IN  s domains);
 </pre>
-<p>Set logging verbosity and which operations are logged.</p>
+<p>        Set logging verbosity and which operations are logged.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -324,23 +348,24 @@ SetLogging (IN  s level,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">IN s <em class="parameter"><code>level</code></em></code>:</span></p></td>
-<td><p>One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP].           This level is applied to the domains as specified in the domains           argument. Except for the special level "KEEP", all unmentioned           domains are disabled entirely. "KEEP" is special and allows           not to change the current setting except for the specified           domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only           touch the platform domain.</p></td>
+<td><p>One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN s <em class="parameter"><code>domains</code></em></code>:</span></p></td>
-<td><p>A combination of logging domains separated by commas (','), or "NONE"           to disable logging.  Each domain enables logging for operations           related to that domain.  Available domains are: [PLATFORM, RFKILL, ETHER,           WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS,           VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE,           OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS,           TEAM, CONCHECK, DCB, DISPATCH, AUDIT].           In addition to these domains, the following special domains can be used:           [NONE, ALL, DEFAULT, DHCP, IP].  You can also specify that some domains           should log at a different level from the default by appending a colon (':')           and a log level (eg, 'WIFI:DEBUG').  If an empty string is given, the           log level is changed but the current set of log domains remains           unchanged.</p></td>
+<td><p>A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged.</p></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager.GetLogging"></a><h3>The <code class="function">GetLogging()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager.GetLogging"></a><h3>The GetLogging() method</h3>
 <pre class="programlisting">
 GetLogging (OUT s level,
             OUT s domains);
 </pre>
-<p>Get current logging verbosity level and operations domains.</p>
+<p>        Get current logging verbosity level and operations domains.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -353,18 +378,19 @@ GetLogging (OUT s level,
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">OUT s <em class="parameter"><code>domains</code></em></code>:</span></p></td>
-<td><p>For available domains see <code class="function">SetLogging()</code> call.</p></td>
+<td><p>For available domains see SetLogging() call.</p></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager.CheckConnectivity"></a><h3>The <code class="function">CheckConnectivity()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager.CheckConnectivity"></a><h3>The CheckConnectivity() method</h3>
 <pre class="programlisting">
 CheckConnectivity (OUT u connectivity);
 </pre>
-<p>Re-check the network connectivity state.</p>
+<p>        Re-check the network connectivity state.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -372,17 +398,19 @@ CheckConnectivity (OUT u connectivity);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">OUT u <em class="parameter"><code>connectivity</code></em></code>:</span></p></td>
-<td><p>The current connectivity state.</p></td>
+<td><p>(<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMConnectivityState">NMConnectivityState</a>) The current connectivity state.</p></td>
 </tr></tbody>
 </table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="gdbus-method-org-freedesktop-NetworkManager.state"></a><h3>The <code class="function">state()</code> method</h3>
+<a name="gdbus-method-org-freedesktop-NetworkManager.state"></a><h3>The state() method</h3>
 <pre class="programlisting">
 state (OUT u state);
 </pre>
-<p>The overall networking state as determined by the NetworkManager daemon,         based on the state of network devices under it's management.</p>
+<p>        The overall networking state as determined by the NetworkManager daemon,
+        based on the state of network devices under it's management.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -390,7 +418,7 @@ state (OUT u state);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">OUT u <em class="parameter"><code>state</code></em></code>:</span></p></td>
-<td><p></p></td>
+<td><p><a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMState">NMState</a></p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -402,7 +430,9 @@ state (OUT u state);
 <pre class="programlisting">
 CheckPermissions ();
 </pre>
-<p>Emitted when system authorization details change, indicating that         clients may wish to recheck permissions with GetPermissions.</p>
+<p>        Emitted when system authorization details change, indicating that clients
+        may wish to recheck permissions with GetPermissions.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -410,7 +440,8 @@ CheckPermissions ();
 <pre class="programlisting">
 StateChanged (u state);
 </pre>
-<p>NetworkManager's state changed.</p>
+<p>        NetworkManager's state changed.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -418,7 +449,7 @@ StateChanged (u state);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>state</code></em></code>:</span></p></td>
-<td><p>The new state of NetworkManager.</p></td>
+<td><p>(<a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMState">NMState</a>) The new state of NetworkManager.</p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -428,7 +459,8 @@ StateChanged (u state);
 <pre class="programlisting">
 PropertiesChanged (a{sv} properties);
 </pre>
-<p>NetworkManager's properties changed.</p>
+<p>        NetworkManager's properties changed.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -446,7 +478,8 @@ PropertiesChanged (a{sv} properties);
 <pre class="programlisting">
 DeviceAdded (o device_path);
 </pre>
-<p>A device was added to the system</p>
+<p>        A device was added to the system
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -464,7 +497,8 @@ DeviceAdded (o device_path);
 <pre class="programlisting">
 DeviceRemoved (o device_path);
 </pre>
-<p>A device was removed from the system, and is no longer available.</p>
+<p>        A device was removed from the system, and is no longer available.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -484,7 +518,10 @@ DeviceRemoved (o device_path);
 <pre class="programlisting">
 Devices  readable   ao
 </pre>
-<p>The list of realized network devices. Realized devices are those which         have backing resources (eg from the kernel or a management daemon like         ModemManager, teamd, etc).</p>
+<p>        The list of realized network devices. Realized devices are those which
+        have backing resources (eg from the kernel or a management daemon like
+        ModemManager, teamd, etc).
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -492,7 +529,10 @@ Devices  readable   ao
 <pre class="programlisting">
 AllDevices  readable   ao
 </pre>
-<p>The list of both realized and un-realized network devices. Un-realized         devices are software devices which do not yet have backing resources,         but for which backing resources can be created if the device is         activated.</p>
+<p>        The list of both realized and un-realized network devices. Un-realized
+        devices are software devices which do not yet have backing resources, but
+        for which backing resources can be created if the device is activated.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -500,7 +540,9 @@ AllDevices  readable   ao
 <pre class="programlisting">
 NetworkingEnabled  readable   b
 </pre>
-<p>Indicates if overall networking is currently enabled or not.  See the         <code class="function">Enable()</code> method.</p>
+<p>        Indicates if overall networking is currently enabled or not. See the
+        Enable() method.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -508,7 +550,8 @@ NetworkingEnabled  readable   b
 <pre class="programlisting">
 WirelessEnabled  readwrite  b
 </pre>
-<p>Indicates if wireless is currently enabled or not.</p>
+<p>        Indicates if wireless is currently enabled or not.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -516,7 +559,9 @@ WirelessEnabled  readwrite  b
 <pre class="programlisting">
 WirelessHardwareEnabled  readable   b
 </pre>
-<p>Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.</p>
+<p>        Indicates if the wireless hardware is currently enabled, i.e. the state of
+        the RF kill switch.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -524,7 +569,8 @@ WirelessHardwareEnabled  readable   b
 <pre class="programlisting">
 WwanEnabled  readwrite  b
 </pre>
-<p>Indicates if mobile broadband devices are currently enabled or not.</p>
+<p>        Indicates if mobile broadband devices are currently enabled or not.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -532,7 +578,9 @@ WwanEnabled  readwrite  b
 <pre class="programlisting">
 WwanHardwareEnabled  readable   b
 </pre>
-<p>Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch.</p>
+<p>        Indicates if the mobile broadband hardware is currently enabled, i.e. the
+        state of the RF kill switch.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -540,7 +588,8 @@ WwanHardwareEnabled  readable   b
 <pre class="programlisting">
 WimaxEnabled  readwrite  b
 </pre>
-<p>Indicates if WiMAX devices are currently enabled or not.</p>
+<p>        Indicates if WiMAX devices are currently enabled or not.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -548,7 +597,9 @@ WimaxEnabled  readwrite  b
 <pre class="programlisting">
 WimaxHardwareEnabled  readable   b
 </pre>
-<p>Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.</p>
+<p>        Indicates if the WiMAX hardware is currently enabled, i.e. the state of
+        the RF kill switch.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -556,7 +607,8 @@ WimaxHardwareEnabled  readable   b
 <pre class="programlisting">
 ActiveConnections  readable   ao
 </pre>
-<p>List of active connection object paths.</p>
+<p>        List of active connection object paths.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -564,7 +616,12 @@ ActiveConnections  readable   ao
 <pre class="programlisting">
 PrimaryConnection  readable   o
 </pre>
-<p>The object path of the "primary" active connection being used         to access the network. In particular, if there is no VPN         active, or the VPN does not have the default route, then this         indicates the connection that has the default route. If there         is a VPN active with the default route, then this indicates         the connection that contains the route to the VPN endpoint.</p>
+<p>        The object path of the "primary" active connection being used to access
+        the network. In particular, if there is no VPN active, or the VPN does not
+        have the default route, then this indicates the connection that has the
+        default route. If there is a VPN active with the default route, then this
+        indicates the connection that contains the route to the VPN endpoint.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -572,7 +629,10 @@ PrimaryConnection  readable   o
 <pre class="programlisting">
 PrimaryConnectionType  readable   s
 </pre>
-<p>The connection type of the "primary" active connection being         used to access the network. This is the same as the Type         property on the object indicated by PrimaryConnection.</p>
+<p>        The connection type of the "primary" active connection being used to
+        access the network. This is the same as the Type property on the object
+        indicated by PrimaryConnection.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -580,7 +640,11 @@ PrimaryConnectionType  readable   s
 <pre class="programlisting">
 Metered  readable   u
 </pre>
-<p>Indicates whether the connectivity is metered. This is equivalent         to the metered property of the device associated with the primary         connection.</p>
+<p>        Indicates whether the connectivity is metered. This is equivalent to the
+        metered property of the device associated with the primary connection.
+</p>
+<p>        Returns: NMMetered
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -588,7 +652,10 @@ Metered  readable   u
 <pre class="programlisting">
 ActivatingConnection  readable   o
 </pre>
-<p>The object path of an active connection that is currently         being activated and which is expected to become the new         PrimaryConnection when it finishes activating.</p>
+<p>        The object path of an active connection that is currently being activated
+        and which is expected to become the new PrimaryConnection when it finishes
+        activating.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -596,7 +663,10 @@ ActivatingConnection  readable   o
 <pre class="programlisting">
 Startup  readable   b
 </pre>
-<p>Indicates whether NM is still starting up; this becomes FALSE         when NM has finished attempting to activate every connection         that it might be able to activate at startup.</p>
+<p>        Indicates whether NM is still starting up; this becomes FALSE when NM has
+        finished attempting to activate every connection that it might be able to
+        activate at startup.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -604,7 +674,8 @@ Startup  readable   b
 <pre class="programlisting">
 Version  readable   s
 </pre>
-<p>NetworkManager version.</p>
+<p>        NetworkManager version.
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -612,7 +683,10 @@ Version  readable   s
 <pre class="programlisting">
 State  readable   u
 </pre>
-<p>The overall state of the NetworkManager daemon.</p>
+<p>        The overall state of the NetworkManager daemon.
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMState">NMState</a>
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -620,7 +694,10 @@ State  readable   u
 <pre class="programlisting">
 Connectivity  readable   u
 </pre>
-<p>The network connectivity state.</p>
+<p>        The network connectivity state.
+</p>
+<p>        Returns: <a href="https://developer.gnome.org/libnm-util/0.9/libnm-util-NetworkManager.html#NMConnectivityState">NMConnectivityState</a>
+</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -628,7 +705,15 @@ Connectivity  readable   u
 <pre class="programlisting">
 GlobalDnsConfiguration  readwrite  a{sv}
 </pre>
-<p>Dictionary of global DNS settings where the key is one of         "searches", "options" and "domains".  The values for the         "searches" and "options" keys are string arrays describing the         list of search domains and resolver options, respectively.         The value of the "domains" key is a second-level dictionary,         where each key is a domain name, and each key's value is a         third-level dictionary with the keys "servers" and         "options". "servers" is a string array of DNS servers,         "options" is a string array of domain-specific options.</p>
+<p>        Dictionary of global DNS settings where the key is one of "searches",
+        "options" and "domains". The values for the "searches" and "options" keys
+        are string arrays describing the list of search domains and resolver
+        options, respectively. The value of the "domains" key is a second-level
+        dictionary, where each key is a domain name, and each key's value is a
+        third-level dictionary with the keys "servers" and "options". "servers" is
+        a string array of DNS servers, "options" is a string array of
+        domain-specific options.
+</p>
 </div>
 </div>
 </div>
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index dccef7c9..79677afb 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -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 API Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">Version 1.1.92
+<div><p class="releaseinfo">Version 1.1.93
 </p></div>
 <div><p class="copyright">Copyright © 2012, 2016 The NetworkManager Authors</p></div>
 <div><div class="legalnotice">
@@ -156,6 +156,15 @@
 <dt><span class="chapter"><a href="manpages.html">UNIX Manual Pages</a></span></dt>
 <dd><dl>
 <dt>
+<span class="refentrytitle"><a href="nmcli.html">nmcli</a></span><span class="refpurpose"> — command-line tool for controlling NetworkManager</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="nmtui.html">nmtui</a></span><span class="refpurpose"> — Text User Interface for controlling NetworkManager</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="nm-online.html">nm-online</a></span><span class="refpurpose"> — ask NetworkManager whether the network is connected</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="NetworkManager.html">NetworkManager</a></span><span class="refpurpose"> — network management daemon</span>
 </dt>
 <dt>
diff --git a/docs/api/html/index.sgml b/docs/api/html/index.sgml
index dc84d959..583682f2 100644
--- a/docs/api/html/index.sgml
+++ b/docs/api/html/index.sgml
@@ -422,13 +422,55 @@
 <ANCHOR id="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.CancelGetSecrets" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.CancelGetSecrets">
 <ANCHOR id="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.SaveSecrets" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.SaveSecrets">
 <ANCHOR id="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.DeleteSecrets" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.DeleteSecrets">
+<ANCHOR id="nmcli" href="NetworkManager/nmcli.html">
+<ANCHOR id="synopsis" href="NetworkManager/nmcli.html#synopsis">
+<ANCHOR id="description" href="NetworkManager/nmcli.html#description">
+<ANCHOR id="options" href="NetworkManager/nmcli.html#options">
+<ANCHOR id="general" href="NetworkManager/nmcli.html#general">
+<ANCHOR id="networking" href="NetworkManager/nmcli.html#networking">
+<ANCHOR id="radio" href="NetworkManager/nmcli.html#radio">
+<ANCHOR id="monitor" href="NetworkManager/nmcli.html#monitor">
+<ANCHOR id="connection" href="NetworkManager/nmcli.html#connection">
+<ANCHOR id="device" href="NetworkManager/nmcli.html#device">
+<ANCHOR id="agent" href="NetworkManager/nmcli.html#agent">
+<ANCHOR id="environment_variables" href="NetworkManager/nmcli.html#environment_variables">
+<ANCHOR id="internationalization_notes" href="NetworkManager/nmcli.html#internationalization_notes">
+<ANCHOR id="exit_status" href="NetworkManager/nmcli.html#exit_status">
+<ANCHOR id="examples" href="NetworkManager/nmcli.html#examples">
+<ANCHOR id="notes" href="NetworkManager/nmcli.html#notes">
+<ANCHOR id="bugs" href="NetworkManager/nmcli.html#bugs">
+<ANCHOR id="see_also" href="NetworkManager/nmcli.html#see_also">
+<ANCHOR id="nmtui" href="NetworkManager/nmtui.html">
+<ANCHOR id="synopsis" href="NetworkManager/nmtui.html#synopsis">
+<ANCHOR id="description" href="NetworkManager/nmtui.html#description">
+<ANCHOR id="see_also" href="NetworkManager/nmtui.html#see_also">
+<ANCHOR id="nm-online" href="NetworkManager/nm-online.html">
+<ANCHOR id="synopsis" href="NetworkManager/nm-online.html#synopsis">
+<ANCHOR id="description" href="NetworkManager/nm-online.html#description">
+<ANCHOR id="options" href="NetworkManager/nm-online.html#options">
+<ANCHOR id="exit_status" href="NetworkManager/nm-online.html#exit_status">
+<ANCHOR id="see_also" href="NetworkManager/nm-online.html#see_also">
 <ANCHOR id="NetworkManager" href="NetworkManager/NetworkManager.html">
 <ANCHOR id="NetworkManager.conf" href="NetworkManager/NetworkManager.conf.html">
 <ANCHOR id="device-spec" href="NetworkManager/NetworkManager.conf.html#device-spec">
 <ANCHOR id="nmcli-examples" href="NetworkManager/nmcli-examples.html">
 <ANCHOR id="nm-settings" href="NetworkManager/nm-settings.html">
+<ANCHOR id="description" href="NetworkManager/nm-settings.html#description">
 <ANCHOR id="secrets-flags" href="NetworkManager/nm-settings.html#secrets-flags">
+<ANCHOR id="files" href="NetworkManager/nm-settings.html#files">
+<ANCHOR id="see_also" href="NetworkManager/nm-settings.html#see_also">
 <ANCHOR id="nm-settings-keyfile" href="NetworkManager/nm-settings-keyfile.html">
+<ANCHOR id="description" href="NetworkManager/nm-settings-keyfile.html#description">
+<ANCHOR id="file_format" href="NetworkManager/nm-settings-keyfile.html#file_format">
+<ANCHOR id="details" href="NetworkManager/nm-settings-keyfile.html#details">
 <ANCHOR id="secrets-flags" href="NetworkManager/nm-settings-keyfile.html#secrets-flags">
+<ANCHOR id="files" href="NetworkManager/nm-settings-keyfile.html#files">
+<ANCHOR id="see_also" href="NetworkManager/nm-settings-keyfile.html#see_also">
 <ANCHOR id="nm-settings-ifcfg-rh" href="NetworkManager/nm-settings-ifcfg-rh.html">
+<ANCHOR id="description" href="NetworkManager/nm-settings-ifcfg-rh.html#description">
+<ANCHOR id="file_format" href="NetworkManager/nm-settings-ifcfg-rh.html#file_format">
+<ANCHOR id="differences_against_initscripts" href="NetworkManager/nm-settings-ifcfg-rh.html#differences_against_initscripts">
+<ANCHOR id="details" href="NetworkManager/nm-settings-ifcfg-rh.html#details">
 <ANCHOR id="secrets-flags" href="NetworkManager/nm-settings-ifcfg-rh.html#secrets-flags">
+<ANCHOR id="files" href="NetworkManager/nm-settings-ifcfg-rh.html#files">
+<ANCHOR id="see_also" href="NetworkManager/nm-settings-ifcfg-rh.html#see_also">
diff --git a/docs/api/html/manpages.html b/docs/api/html/manpages.html
index 27015a54..36b8e931 100644
--- a/docs/api/html/manpages.html
+++ b/docs/api/html/manpages.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="NetworkManager D-Bus API Reference Manual">
 <link rel="up" href="index.html" title="NetworkManager D-Bus API Reference Manual">
 <link rel="prev" href="secrets-flags.html" title="Secret flag types">
-<link rel="next" href="NetworkManager.html" title="NetworkManager">
+<link rel="next" href="nmcli.html" title="nmcli">
 <meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -17,13 +17,22 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
 <td><a accesskey="p" href="secrets-flags.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NetworkManager.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="nmcli.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h1 class="title">
 <a name="manpages"></a>UNIX Manual Pages</h1></div></div></div>
 <div class="toc"><dl class="toc">
 <dt>
+<span class="refentrytitle"><a href="nmcli.html">nmcli</a></span><span class="refpurpose"> — command-line tool for controlling NetworkManager</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="nmtui.html">nmtui</a></span><span class="refpurpose"> — Text User Interface for controlling NetworkManager</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="nm-online.html">nm-online</a></span><span class="refpurpose"> — ask NetworkManager whether the network is connected</span>
+</dt>
+<dt>
 <span class="refentrytitle"><a href="NetworkManager.html">NetworkManager</a></span><span class="refpurpose"> — network management daemon</span>
 </dt>
 <dt>
diff --git a/docs/api/html/nm-online.html b/docs/api/html/nm-online.html
new file mode 100644
index 00000000..90d3ecb5
--- /dev/null
+++ b/docs/api/html/nm-online.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nm-online: NetworkManager D-Bus API Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="NetworkManager D-Bus API Reference Manual">
+<link rel="up" href="manpages.html" title="UNIX Manual Pages">
+<link rel="prev" href="nmtui.html" title="nmtui">
+<link rel="next" href="NetworkManager.html" title="NetworkManager">
+<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">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="manpages.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="nmtui.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="NetworkManager.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="nm-online"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle">nm-online</span></h2>
+<p>nm-online — ask NetworkManager whether the network is connected</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv">
+<a name="synopsis"></a><h2>Synopsis</h2>
+<div class="cmdsynopsis"><p><code class="command">nm-online</code>  [<em class="replaceable"><code>OPTIONS</code></em>...]</p></div>
+</div>
+<div class="refsect1">
+<a name="description"></a><h2>Description</h2>
+<p><span class="command"><strong>nm-online</strong></span> is a utility to find out whether we are
+    online. It is done by asking NetworkManager about its status. When run,
+    <span class="command"><strong>nm-online</strong></span> waits until NetworkManager reports an active
+    connection, or specified timeout expires. On exit, the returned status code
+    should be checked (see the return codes below).</p>
+<p>By default NetworkManager waits for IPv4 dynamic addressing to complete
+    but does not wait for the <code class="literal">auto</code> IPv6 dynamic addressing. To
+    wait for IPv6 addressing to complete, either (1) change the network
+    connection's IPv6 <code class="literal">may-fail</code> setting to <code class="literal">no</code>,
+    and/or (2) change the IPv6 addressing method to <code class="literal">manual</code> or
+    <code class="literal">dhcp</code>, to indicate that IPv6 connectivity is expected.</p>
+</div>
+<div class="refsect1">
+<a name="options"></a><h2>Options</h2>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term">
+            <code class="option">-t</code>  |   <code class="option">--timeout</code>  
+            <em class="replaceable"><code>seconds</code></em> 
+        </span></p></td>
+<td><p>Time to wait for a connection, in seconds. If the option is not provided,
+          the default timeout is 30 seconds.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">  <code class="option">-x</code>  |   <code class="option">--exit</code>  </span></p></td>
+<td><p>Exit immediately if NetworkManager is not running or connecting.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">  <code class="option">-q</code>  |   <code class="option">--quiet</code>  </span></p></td>
+<td><p>Don't print anything.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">  <code class="option">-s</code>  |   <code class="option">--wait-for-startup</code>  </span></p></td>
+<td><p>Wait for NetworkManager startup to complete, rather than waiting for
+          network connectivity specifically. Startup is considered complete once
+          NetworkManager has activated (or attempted to activate) every auto-activate
+          connection which is available given the current network state. (This is
+          generally only useful at boot time; after startup has completed,
+          <span class="command"><strong>nm-online -s</strong></span> will just return immediately, regardless of the
+          current network state.)</p></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="exit_status"></a><h2>Exit Status</h2>
+<p><span class="command"><strong>nm-online</strong></span> exits with status 0 if it succeeds, a value
+    greater than 0 is returned if an error occurs.</p>
+<div class="variablelist"><table border="0" class="variablelist compact">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><span class="errorcode">0</span></span></p></td>
+<td><p>Success – already online or connection established within given timeout.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="errorcode">1</span></span></p></td>
+<td><p>Offline or not online within given timeout.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="errorcode">2</span></span></p></td>
+<td><p>Unknown or unspecified error.</p></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="see_also"></a><h2>See Also</h2>
+<p><span class="citerefentry"><span class="refentrytitle">nmcli</span>(1)</span>,
+    <span class="citerefentry"><span class="refentrytitle">NetworkManager</span>(8)</span>.</p>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.24</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html
index 7a92c0f9..7323d808 100644
--- a/docs/api/html/nm-settings-ifcfg-rh.html
+++ b/docs/api/html/nm-settings-ifcfg-rh.html
@@ -29,7 +29,7 @@
 <td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1">
-<a name="id-1.4.7.4"></a><h2>DESCRIPTION</h2>
+<a name="description"></a><h2>Description</h2>
 <p>
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span> for details). The profiles can be
@@ -53,7 +53,7 @@
         </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.7.5"></a><h2>File Format</h2>
+<a name="file_format"></a><h2>File Format</h2>
 <p>
           The <span class="emphasis"><em>ifcfg-rh</em></span> config format is a simple text file containing
           VARIABLE="value" lines. The format is described in <code class="filename">sysconfig.txt</code>
@@ -178,7 +178,7 @@ DEVICETYPE=TeamPort
           </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.7.6"></a><h2>Differences against initscripts</h2>
+<a name="differences_against_initscripts"></a><h2>Differences against initscripts</h2>
 <p>
           The main differences of NetworkManager ifcfg-rh plugin and traditional
           initscripts are:
@@ -240,16 +240,16 @@ DEVICETYPE=TeamPort
 <p>
           See the next section for detailed mapping of NetworkManager properties and
           <span class="emphasis"><em>ifcfg-rh</em></span> variables. Variable names, format and usage
-          differences in NetworkManager and initscripts are documented in the tables bellow.
+          differences in NetworkManager and initscripts are documented in the tables below.
         </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.7.7"></a><h2>DETAILS</h2>
+<a name="details"></a><h2>Details</h2>
 <p><span class="emphasis"><em>ifcfg-rh</em></span> plugin variables marked with <span class="emphasis"><em>(+)</em></span>
           are NetworkManager specific extensions not understood by traditional initscripts.
         </p>
 <div class="table">
-<a name="id-1.4.7.7.3"></a><p class="title"><b>Table 69. 802-1x setting</b></p>
+<a name="id-1.4.10.7.3"></a><p class="title"><b>Table 69. 802-1x setting</b></p>
 <div class="table-contents"><table summary="802-1x setting" border="1">
 <colgroup>
 <col>
@@ -524,7 +524,7 @@ Example: </strong></span>IEEE_8021X_PRIVATE_KEY=/home/joe/mykey.p12</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.4"></a><p class="title"><b>Table 70. bond setting</b></p>
+<a name="id-1.4.10.7.4"></a><p class="title"><b>Table 70. bond setting</b></p>
 <div class="table-contents"><table summary="bond setting" border="1">
 <colgroup>
 <col>
@@ -549,7 +549,7 @@ Example: </strong></span>BONDING_OPTS="miimon=100 mode=broadcast"</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.5"></a><p class="title"><b>Table 71. bridge-port setting</b></p>
+<a name="id-1.4.10.7.5"></a><p class="title"><b>Table 71. bridge-port setting</b></p>
 <div class="table-contents"><table summary="bridge-port setting" border="1">
 <colgroup>
 <col>
@@ -590,7 +590,7 @@ Allowed values: </strong></span>1 - 65535</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.6"></a><p class="title"><b>Table 72. bridge setting</b></p>
+<a name="id-1.4.10.7.6"></a><p class="title"><b>Table 72. bridge setting</b></p>
 <div class="table-contents"><table summary="bridge setting" border="1">
 <colgroup>
 <col>
@@ -670,7 +670,7 @@ Allowed values: </strong></span>0 or 1</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.7"></a><p class="title"><b>Table 73. connection setting</b></p>
+<a name="id-1.4.10.7.7"></a><p class="title"><b>Table 73. connection setting</b></p>
 <div class="table-contents"><table summary="connection setting" border="1">
 <colgroup>
 <col>
@@ -809,7 +809,7 @@ Allowed values: </strong></span>boolean value or 'rx'</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.8"></a><p class="title"><b>Table 74. dcb setting</b></p>
+<a name="id-1.4.10.7.8"></a><p class="title"><b>Table 74. dcb setting</b></p>
 <div class="table-contents"><table summary="dcb setting" border="1">
 <colgroup>
 <col>
@@ -944,7 +944,7 @@ Example: </strong></span>DCB_PG_UP2TC=01623701</td>
           used explicitly to enable DCB so that the rest of the DCB_* variables can apply.
         </p>
 <div class="table">
-<a name="id-1.4.7.7.10"></a><p class="title"><b>Table 75. infiniband setting</b></p>
+<a name="id-1.4.10.7.10"></a><p class="title"><b>Table 75. infiniband setting</b></p>
 <div class="table-contents"><table summary="infiniband setting" border="1">
 <colgroup>
 <col>
@@ -999,7 +999,7 @@ Example: </strong></span>PHYSDEV=ib0</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.11"></a><p class="title"><b>Table 76. ip-tunnel setting</b></p>
+<a name="id-1.4.10.7.11"></a><p class="title"><b>Table 76. ip-tunnel setting</b></p>
 <div class="table-contents"><table summary="ip-tunnel setting" border="1">
 <colgroup>
 <col>
@@ -1017,7 +1017,7 @@ Example: </strong></span>PHYSDEV=ib0</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.12"></a><p class="title"><b>Table 77. ipv4 setting</b></p>
+<a name="id-1.4.10.7.12"></a><p class="title"><b>Table 77. ipv4 setting</b></p>
 <div class="table-contents"><table summary="ipv4 setting" border="1">
 <colgroup>
 <col>
@@ -1160,7 +1160,7 @@ Example: </strong></span>DHCP_FQDN=foo.bar.com</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.13"></a><p class="title"><b>Table 78. ipv6 setting</b></p>
+<a name="id-1.4.10.7.13"></a><p class="title"><b>Table 78. ipv6 setting</b></p>
 <div class="table-contents"><table summary="ipv6 setting" border="1">
 <colgroup>
 <col>
@@ -1280,7 +1280,7 @@ Allowed values: </strong></span>IPV6_ADDR_GEN_MODE: eui64, stable-privacy</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.14"></a><p class="title"><b>Table 79. macvlan setting</b></p>
+<a name="id-1.4.10.7.14"></a><p class="title"><b>Table 79. macvlan setting</b></p>
 <div class="table-contents"><table summary="macvlan setting" border="1">
 <colgroup>
 <col>
@@ -1298,7 +1298,7 @@ Allowed values: </strong></span>IPV6_ADDR_GEN_MODE: eui64, stable-privacy</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.15"></a><p class="title"><b>Table 80. team-port setting</b></p>
+<a name="id-1.4.10.7.15"></a><p class="title"><b>Table 80. team-port setting</b></p>
 <div class="table-contents"><table summary="team-port setting" border="1">
 <colgroup>
 <col>
@@ -1321,7 +1321,7 @@ Allowed values: </strong></span>IPV6_ADDR_GEN_MODE: eui64, stable-privacy</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.16"></a><p class="title"><b>Table 81. team setting</b></p>
+<a name="id-1.4.10.7.16"></a><p class="title"><b>Table 81. team setting</b></p>
 <div class="table-contents"><table summary="team setting" border="1">
 <colgroup>
 <col>
@@ -1344,7 +1344,7 @@ Allowed values: </strong></span>IPV6_ADDR_GEN_MODE: eui64, stable-privacy</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.17"></a><p class="title"><b>Table 82. tun setting</b></p>
+<a name="id-1.4.10.7.17"></a><p class="title"><b>Table 82. tun setting</b></p>
 <div class="table-contents"><table summary="tun setting" border="1">
 <colgroup>
 <col>
@@ -1362,7 +1362,7 @@ Allowed values: </strong></span>IPV6_ADDR_GEN_MODE: eui64, stable-privacy</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.18"></a><p class="title"><b>Table 83. vlan setting</b></p>
+<a name="id-1.4.10.7.18"></a><p class="title"><b>Table 83. vlan setting</b></p>
 <div class="table-contents"><table summary="vlan setting" border="1">
 <colgroup>
 <col>
@@ -1425,7 +1425,7 @@ Example: </strong></span>PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.19"></a><p class="title"><b>Table 84. vxlan setting</b></p>
+<a name="id-1.4.10.7.19"></a><p class="title"><b>Table 84. vxlan setting</b></p>
 <div class="table-contents"><table summary="vxlan setting" border="1">
 <colgroup>
 <col>
@@ -1443,7 +1443,7 @@ Example: </strong></span>PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.20"></a><p class="title"><b>Table 85. 802-3-ethernet setting</b></p>
+<a name="id-1.4.10.7.20"></a><p class="title"><b>Table 85. 802-3-ethernet setting</b></p>
 <div class="table-contents"><table summary="802-3-ethernet setting" border="1">
 <colgroup>
 <col>
@@ -1537,7 +1537,7 @@ Allowed values: </strong></span>"qeth", "lcs" or "ctc"</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.21"></a><p class="title"><b>Table 86. 802-11-wireless-security setting</b></p>
+<a name="id-1.4.10.7.21"></a><p class="title"><b>Table 86. 802-11-wireless-security setting</b></p>
 <div class="table-contents"><table summary="802-11-wireless-security setting" border="1">
 <colgroup>
 <col>
@@ -1689,7 +1689,7 @@ Example: </strong></span>KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysuperse
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.7.7.22"></a><p class="title"><b>Table 87. 802-11-wireless setting</b></p>
+<a name="id-1.4.10.7.22"></a><p class="title"><b>Table 87. 802-11-wireless setting</b></p>
 <div class="table-contents"><table summary="802-11-wireless setting" border="1">
 <colgroup>
 <col>
@@ -1853,11 +1853,7 @@ Allowed values: </strong></span>default, never, always</td>
 </div>
 </div>
 <div class="refsect1">
-<a name="id-1.4.7.8"></a><h2>AUTHOR</h2>
-<p><span class="author"><span class="firstname">NetworkManager developers</span></span></p>
-</div>
-<div class="refsect1">
-<a name="id-1.4.7.9"></a><h2>FILES</h2>
+<a name="files"></a><h2>Files</h2>
 <p><code class="filename">/etc/sysconfig/network-scripts/ifcfg-*</code></p>
 <p><code class="filename">/etc/sysconfig/network-scripts/keys-*</code></p>
 <p><code class="filename">/etc/sysconfig/network-scripts/route-*</code></p>
@@ -1865,9 +1861,13 @@ Allowed values: </strong></span>default, never, always</td>
 <p><code class="filename">/usr/share/doc/initscripts/sysconfig.txt</code></p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.7.10"></a><h2>SEE ALSO</h2>
-<p>https://developer.gnome.org/NetworkManager/unstable/ref-settings.html</p>
-<p>nm-settings(5), nm-settings-keyfile(5), NetworkManager(8), NetworkManager.conf(5), nmcli(1), nmcli-examples(5)</p>
+<a name="see_also"></a><h2>See Also</h2>
+<p><span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span>,
+        <span class="citerefentry"><span class="refentrytitle">nm-settings-keyfile</span>(5)</span>,
+        <span class="citerefentry"><span class="refentrytitle">NetworkManager</span>(8)</span>,
+        <span class="citerefentry"><span class="refentrytitle">NetworkManager.conf</span>(5)</span>,
+        <span class="citerefentry"><span class="refentrytitle">nmcli</span>(1)</span>,
+        <span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(7)</span></p>
 </div>
 </div>
 <div class="footer">
diff --git a/docs/api/html/nm-settings-keyfile.html b/docs/api/html/nm-settings-keyfile.html
index 35135634..428f8bd2 100644
--- a/docs/api/html/nm-settings-keyfile.html
+++ b/docs/api/html/nm-settings-keyfile.html
@@ -29,7 +29,7 @@
 <td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1">
-<a name="id-1.4.6.4"></a><h2>DESCRIPTION</h2>
+<a name="description"></a><h2>Description</h2>
 <p>
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span> for details). The profiles can be
@@ -48,7 +48,7 @@
         </p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.6.5"></a><h2>File Format</h2>
+<a name="file_format"></a><h2>File Format</h2>
 <p>
           The <span class="emphasis"><em>keyfile</em></span> config format is a simple .ini-style
           format. It consists of sections (groups) of key-value pairs. Each section
@@ -58,7 +58,7 @@
           specification. The majority of properties of the specification is written
           in the same format into the <span class="emphasis"><em>keyfile</em></span> too. However
           some values are inconvenient for people to use. These are stored in the
-          files in more readable ways. These properties are described bellow.
+          files in more readable ways. These properties are described below.
           An example could be IP addresses that are not written as integer arrays,
           but more reasonably as "1.2.3.4/12 1.2.3.254".
           More information of the generic key file format can be found at
@@ -167,13 +167,13 @@ id=4
             </pre>
 </div>
 <div class="refsect1">
-<a name="id-1.4.6.6"></a><h2>DETAILS</h2>
+<a name="details"></a><h2>Details</h2>
 <p><span class="emphasis"><em>keyfile</em></span> plugin variables for the majority of NetworkManager
           properties have one-to-one mapping. It means a NetworkManager property is stored
           in the keyfile as a variable of the same name and in the same format.
           There are several exceptions to this rule, mainly for making keyfile syntax easier
           for humans. The exceptions handled specially by <span class="emphasis"><em>keyfile</em></span>
-          plugin are listed bellow. Refer to
+          plugin are listed below. Refer to
           <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span>
           for all available settings and properties and their description.
         </p>
@@ -188,7 +188,7 @@ id=4
 <tr><td>802-11-wireless-security  =  wifi-security</td></tr>
 </table>
 <div class="table">
-<a name="id-1.4.6.6.4"></a><p class="title"><b>Table 61. bridge setting (section)</b></p>
+<a name="id-1.4.9.6.4"></a><p class="title"><b>Table 61. bridge setting (section)</b></p>
 <div class="table-contents"><table summary="bridge setting (section)" border="1">
 <colgroup>
 <col>
@@ -205,7 +205,7 @@ id=4
 <tbody><tr>
 <td align="left">mac-address</td>
 <td align="left">mac-address</td>
-<td align="left">ususal hex-digits-and-colons notation</td>
+<td align="left">usual hex-digits-and-colons notation</td>
 <td align="left">MAC address in traditional hex-digits-and-colons notation, or semicolon separated list of 6 decimal bytes (obsolete)<span class="bold"><strong>
 
 Example: </strong></span>mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;121;162;</td>
@@ -213,7 +213,7 @@ Example: </strong></span>mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;1
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.6.6.5"></a><p class="title"><b>Table 62. infiniband setting (section)</b></p>
+<a name="id-1.4.9.6.5"></a><p class="title"><b>Table 62. infiniband setting (section)</b></p>
 <div class="table-contents"><table summary="infiniband setting (section)" border="1">
 <colgroup>
 <col>
@@ -230,7 +230,7 @@ Example: </strong></span>mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;1
 <tbody><tr>
 <td align="left">mac-address</td>
 <td align="left">mac-address</td>
-<td align="left">ususal hex-digits-and-colons notation</td>
+<td align="left">usual hex-digits-and-colons notation</td>
 <td align="left">MAC address in traditional hex-digits-and-colons notation, or or semicolon separated list of 20 decimal bytes (obsolete)<span class="bold"><strong>
 
 Example: </strong></span>mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01</td>
@@ -238,7 +238,7 @@ Example: </strong></span>mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.6.6.6"></a><p class="title"><b>Table 63. ipv4 setting (section)</b></p>
+<a name="id-1.4.9.6.6"></a><p class="title"><b>Table 63. ipv4 setting (section)</b></p>
 <div class="table-contents"><table summary="ipv4 setting (section)" border="1">
 <colgroup>
 <col>
@@ -289,7 +289,7 @@ Example: </strong></span>route1=8.8.8.0/24,10.1.1.1,77 route2=7.7.0.0/16</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.6.6.7"></a><p class="title"><b>Table 64. ipv6 setting (section)</b></p>
+<a name="id-1.4.9.6.7"></a><p class="title"><b>Table 64. ipv6 setting (section)</b></p>
 <div class="table-contents"><table summary="ipv6 setting (section)" border="1">
 <colgroup>
 <col>
@@ -340,7 +340,7 @@ Example: </strong></span>route1=2001:4860:4860::/64,2620:52:0:2219:222:68ff:fe11
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.6.6.8"></a><p class="title"><b>Table 65. serial setting (section)</b></p>
+<a name="id-1.4.9.6.8"></a><p class="title"><b>Table 65. serial setting (section)</b></p>
 <div class="table-contents"><table summary="serial setting (section)" border="1">
 <colgroup>
 <col>
@@ -365,7 +365,7 @@ Example: </strong></span>parity=n</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.6.6.9"></a><p class="title"><b>Table 66. vpn setting (section)</b></p>
+<a name="id-1.4.9.6.9"></a><p class="title"><b>Table 66. vpn setting (section)</b></p>
 <div class="table-contents"><table summary="vpn setting (section)" border="1">
 <colgroup>
 <col>
@@ -400,7 +400,7 @@ Example: </strong></span>password=Popocatepetl</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.6.6.10"></a><p class="title"><b>Table 67. 802-3-ethernet setting (section)</b></p>
+<a name="id-1.4.9.6.10"></a><p class="title"><b>Table 67. 802-3-ethernet setting (section)</b></p>
 <div class="table-contents"><table summary="802-3-ethernet setting (section)" border="1">
 <colgroup>
 <col>
@@ -418,13 +418,13 @@ Example: </strong></span>password=Popocatepetl</td>
 <tr>
 <td align="left">mac-address</td>
 <td align="left">mac-address</td>
-<td align="left">ususal hex-digits-and-colons notation</td>
+<td align="left">usual hex-digits-and-colons notation</td>
 <td align="left">MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162)</td>
 </tr>
 <tr>
 <td align="left">cloned-mac-address</td>
 <td align="left">cloned-mac-address</td>
-<td align="left">ususal hex-digits-and-colons notation</td>
+<td align="left">usual hex-digits-and-colons notation</td>
 <td align="left">Cloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).</td>
 </tr>
 <tr>
@@ -439,7 +439,7 @@ Example: </strong></span>mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.6.6.11"></a><p class="title"><b>Table 68. 802-11-wireless setting (section)</b></p>
+<a name="id-1.4.9.6.11"></a><p class="title"><b>Table 68. 802-11-wireless setting (section)</b></p>
 <div class="table-contents"><table summary="802-11-wireless setting (section)" border="1">
 <colgroup>
 <col>
@@ -465,13 +465,13 @@ Example: </strong></span>ssid=Quick Net</td>
 <tr>
 <td align="left">mac-address</td>
 <td align="left">mac-address</td>
-<td align="left">ususal hex-digits-and-colons notation</td>
+<td align="left">usual hex-digits-and-colons notation</td>
 <td align="left">MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162).</td>
 </tr>
 <tr>
 <td align="left">cloned-mac-address</td>
 <td align="left">cloned-mac-address</td>
-<td align="left">ususal hex-digits-and-colons notation</td>
+<td align="left">usual hex-digits-and-colons notation</td>
 <td align="left">Cloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).</td>
 </tr>
 <tr>
@@ -506,17 +506,17 @@ Example: </strong></span>mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79
 </div>
 </div>
 <div class="refsect1">
-<a name="id-1.4.6.7"></a><h2>AUTHOR</h2>
-<p><span class="author"><span class="firstname">NetworkManager developers</span></span></p>
-</div>
-<div class="refsect1">
-<a name="id-1.4.6.8"></a><h2>FILES</h2>
+<a name="files"></a><h2>Files</h2>
 <p><code class="filename">/etc/NetworkManager/system-connections/*</code></p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.6.9"></a><h2>SEE ALSO</h2>
-<p>https://developer.gnome.org/NetworkManager/unstable/ref-settings.html</p>
-<p>nm-settings(5), nm-settings-ifcfg-rh(5), NetworkManager(8), NetworkManager.conf(5), nmcli(1), nmcli-examples(5)</p>
+<a name="see_also"></a><h2>See Also</h2>
+<p><span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span>,
+        <span class="citerefentry"><span class="refentrytitle">nm-settings-ifcfg-rh</span>(5)</span>,
+        <span class="citerefentry"><span class="refentrytitle">NetworkManager</span>(8)</span>,
+        <span class="citerefentry"><span class="refentrytitle">NetworkManager.conf</span>(5)</span>,
+        <span class="citerefentry"><span class="refentrytitle">nmcli</span>(1)</span>,
+        <span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(7)</span></p>
 </div>
 </div>
 <div class="footer">
diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html
index 7a9b75e9..3a540262 100644
--- a/docs/api/html/nm-settings.html
+++ b/docs/api/html/nm-settings.html
@@ -29,7 +29,7 @@
 <td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1">
-<a name="id-1.4.5.4"></a><h2>DESCRIPTION</h2>
+<a name="description"></a><h2>Description</h2>
 <p>
           NetworkManager is based on a concept of connection profiles, sometimes referred to as
           connections only. These connection profiles contain a network configuration. When
@@ -94,7 +94,7 @@
 </table>
 </div>
 <div class="table">
-<a name="id-1.4.5.4.3"></a><p class="title"><b>Table 31. 802-1x setting</b></p>
+<a name="id-1.4.8.4.3"></a><p class="title"><b>Table 31. 802-1x setting</b></p>
 <div class="table-contents"><table summary="802-1x setting" border="1">
 <colgroup>
 <col>
@@ -257,13 +257,13 @@
 <td align="left">phase2-private-key</td>
 <td align="left">byte array</td>
 <td align="left"> </td>
-<td>Contains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". 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<span class="type">12</span> format private keys and the blob scheme, this property should be set to the PKCS<span class="type">12</span> data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS<span class="type">12</span> certificate and key. When using PKCS<span class="type">12</span> 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 "phase2-private-key-password" property must be set to the password used to decode the PKCS<span class="type">12</span> private key and certificate.</td>
+<td>Contains the "phase 2" inner private key when the "phase2-auth" or "phase2-autheap" property is set to "tls". 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 "phase2-private-key-password" 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 "phase2-private-key-password" property must be set to the password used to decode the PKCS#12 private key and certificate.</td>
 </tr>
 <tr>
 <td align="left">phase2-private-key-password</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td>The password used to decrypt the "phase 2" private key specified in the "phase2-private-key" property when the private key either uses the path scheme, or is a PKCS<span class="type">12</span> format key.</td>
+<td>The password used to decrypt the "phase 2" private key specified in the "phase2-private-key" property when the private key either uses the path scheme, or is a PKCS#12 format key.</td>
 </tr>
 <tr>
 <td align="left">phase2-private-key-password-flags</td>
@@ -293,13 +293,13 @@
 <td align="left">private-key</td>
 <td align="left">byte array</td>
 <td align="left"> </td>
-<td>Contains the private key when the "eap" property is set to "tls". 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<span class="type">12</span> format private keys and the blob scheme, this property should be set to the PKCS<span class="type">12</span> data and the "private-key-password" property must be set to password used to decrypt the PKCS<span class="type">12</span> certificate and key. When using PKCS<span class="type">12</span> 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<span class="type">12</span> private key and certificate. WARNING: "private-key" 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.</td>
+<td>Contains the private key when the "eap" property is set to "tls". 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 "private-key-password" 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. WARNING: "private-key" 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.</td>
 </tr>
 <tr>
 <td align="left">private-key-password</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td>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<span class="type">12</span> format key.</td>
+<td>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.</td>
 </tr>
 <tr>
 <td align="left">private-key-password-flags</td>
@@ -323,7 +323,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.4"></a><p class="title"><b>Table 32. adsl setting</b></p>
+<a name="id-1.4.8.4.4"></a><p class="title"><b>Table 32. adsl setting</b></p>
 <div class="table-contents"><table summary="adsl setting" border="1">
 <colgroup>
 <col>
@@ -390,7 +390,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.5"></a><p class="title"><b>Table 33. bluetooth setting</b></p>
+<a name="id-1.4.8.4.5"></a><p class="title"><b>Table 33. bluetooth setting</b></p>
 <div class="table-contents"><table summary="bluetooth setting" border="1">
 <colgroup>
 <col>
@@ -427,7 +427,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.6"></a><p class="title"><b>Table 34. bond setting</b></p>
+<a name="id-1.4.8.4.6"></a><p class="title"><b>Table 34. bond setting</b></p>
 <div class="table-contents"><table summary="bond setting" border="1">
 <colgroup>
 <col>
@@ -464,7 +464,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.7"></a><p class="title"><b>Table 35. bridge setting</b></p>
+<a name="id-1.4.8.4.7"></a><p class="title"><b>Table 35. bridge setting</b></p>
 <div class="table-contents"><table summary="bridge setting" border="1">
 <colgroup>
 <col>
@@ -543,7 +543,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.8"></a><p class="title"><b>Table 36. bridge-port setting</b></p>
+<a name="id-1.4.8.4.8"></a><p class="title"><b>Table 36. bridge-port setting</b></p>
 <div class="table-contents"><table summary="bridge-port setting" border="1">
 <colgroup>
 <col>
@@ -586,7 +586,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.9"></a><p class="title"><b>Table 37. cdma setting</b></p>
+<a name="id-1.4.8.4.9"></a><p class="title"><b>Table 37. cdma setting</b></p>
 <div class="table-contents"><table summary="cdma setting" border="1">
 <colgroup>
 <col>
@@ -611,7 +611,7 @@
 <td align="left">number</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td>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.</td>
+<td>The number to dial to establish the connection to the CDMA-based mobile broadband network, if any.  If not specified, the default number (#777) is used when required.</td>
 </tr>
 <tr>
 <td align="left">password</td>
@@ -635,7 +635,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.10"></a><p class="title"><b>Table 38. connection setting</b></p>
+<a name="id-1.4.8.4.10"></a><p class="title"><b>Table 38. connection setting</b></p>
 <div class="table-contents"><table summary="connection setting" border="1">
 <colgroup>
 <col>
@@ -762,7 +762,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.11"></a><p class="title"><b>Table 39. dcb setting</b></p>
+<a name="id-1.4.8.4.11"></a><p class="title"><b>Table 39. dcb setting</b></p>
 <div class="table-contents"><table summary="dcb setting" border="1">
 <colgroup>
 <col>
@@ -877,7 +877,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.12"></a><p class="title"><b>Table 40. generic setting</b></p>
+<a name="id-1.4.8.4.12"></a><p class="title"><b>Table 40. generic setting</b></p>
 <div class="table-contents"><table summary="generic setting" border="1">
 <colgroup>
 <col>
@@ -900,7 +900,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.13"></a><p class="title"><b>Table 41. gsm setting</b></p>
+<a name="id-1.4.8.4.13"></a><p class="title"><b>Table 41. gsm setting</b></p>
 <div class="table-contents"><table summary="gsm setting" border="1">
 <colgroup>
 <col>
@@ -997,7 +997,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.14"></a><p class="title"><b>Table 42. infiniband setting</b></p>
+<a name="id-1.4.8.4.14"></a><p class="title"><b>Table 42. infiniband setting</b></p>
 <div class="table-contents"><table summary="infiniband setting" border="1">
 <colgroup>
 <col>
@@ -1052,7 +1052,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.15"></a><p class="title"><b>Table 43. ipv4 setting</b></p>
+<a name="id-1.4.8.4.15"></a><p class="title"><b>Table 43. ipv4 setting</b></p>
 <div class="table-contents"><table summary="ipv4 setting" border="1">
 <colgroup>
 <col>
@@ -1197,7 +1197,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.16"></a><p class="title"><b>Table 44. ipv6 setting</b></p>
+<a name="id-1.4.8.4.16"></a><p class="title"><b>Table 44. ipv6 setting</b></p>
 <div class="table-contents"><table summary="ipv6 setting" border="1">
 <colgroup>
 <col>
@@ -1342,7 +1342,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.17"></a><p class="title"><b>Table 45. ip-tunnel setting</b></p>
+<a name="id-1.4.8.4.17"></a><p class="title"><b>Table 45. ip-tunnel setting</b></p>
 <div class="table-contents"><table summary="ip-tunnel setting" border="1">
 <colgroup>
 <col>
@@ -1439,7 +1439,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.18"></a><p class="title"><b>Table 46. macvlan setting</b></p>
+<a name="id-1.4.8.4.18"></a><p class="title"><b>Table 46. macvlan setting</b></p>
 <div class="table-contents"><table summary="macvlan setting" border="1">
 <colgroup>
 <col>
@@ -1488,7 +1488,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.19"></a><p class="title"><b>Table 47. 802-11-olpc-mesh setting</b></p>
+<a name="id-1.4.8.4.19"></a><p class="title"><b>Table 47. 802-11-olpc-mesh setting</b></p>
 <div class="table-contents"><table summary="802-11-olpc-mesh setting" border="1">
 <colgroup>
 <col>
@@ -1531,7 +1531,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.20"></a><p class="title"><b>Table 48. ppp setting</b></p>
+<a name="id-1.4.8.4.20"></a><p class="title"><b>Table 48. ppp setting</b></p>
 <div class="table-contents"><table summary="ppp setting" border="1">
 <colgroup>
 <col>
@@ -1664,7 +1664,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.21"></a><p class="title"><b>Table 49. pppoe setting</b></p>
+<a name="id-1.4.8.4.21"></a><p class="title"><b>Table 49. pppoe setting</b></p>
 <div class="table-contents"><table summary="pppoe setting" border="1">
 <colgroup>
 <col>
@@ -1713,7 +1713,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.22"></a><p class="title"><b>Table 50. serial setting</b></p>
+<a name="id-1.4.8.4.22"></a><p class="title"><b>Table 50. serial setting</b></p>
 <div class="table-contents"><table summary="serial setting" border="1">
 <colgroup>
 <col>
@@ -1768,7 +1768,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.23"></a><p class="title"><b>Table 51. team setting</b></p>
+<a name="id-1.4.8.4.23"></a><p class="title"><b>Table 51. team setting</b></p>
 <div class="table-contents"><table summary="team setting" border="1">
 <colgroup>
 <col>
@@ -1805,7 +1805,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.24"></a><p class="title"><b>Table 52. team-port setting</b></p>
+<a name="id-1.4.8.4.24"></a><p class="title"><b>Table 52. team-port setting</b></p>
 <div class="table-contents"><table summary="team-port setting" border="1">
 <colgroup>
 <col>
@@ -1836,7 +1836,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.25"></a><p class="title"><b>Table 53. tun setting</b></p>
+<a name="id-1.4.8.4.25"></a><p class="title"><b>Table 53. tun setting</b></p>
 <div class="table-contents"><table summary="tun setting" border="1">
 <colgroup>
 <col>
@@ -1897,7 +1897,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.26"></a><p class="title"><b>Table 54. vlan setting</b></p>
+<a name="id-1.4.8.4.26"></a><p class="title"><b>Table 54. vlan setting</b></p>
 <div class="table-contents"><table summary="vlan setting" border="1">
 <colgroup>
 <col>
@@ -1958,7 +1958,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.27"></a><p class="title"><b>Table 55. vpn setting</b></p>
+<a name="id-1.4.8.4.27"></a><p class="title"><b>Table 55. vpn setting</b></p>
 <div class="table-contents"><table summary="vpn setting" border="1">
 <colgroup>
 <col>
@@ -2019,7 +2019,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.28"></a><p class="title"><b>Table 56. vxlan setting</b></p>
+<a name="id-1.4.8.4.28"></a><p class="title"><b>Table 56. vxlan setting</b></p>
 <div class="table-contents"><table summary="vxlan setting" border="1">
 <colgroup>
 <col>
@@ -2140,7 +2140,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.29"></a><p class="title"><b>Table 57. wimax setting</b></p>
+<a name="id-1.4.8.4.29"></a><p class="title"><b>Table 57. wimax setting</b></p>
 <div class="table-contents"><table summary="wimax setting" border="1">
 <colgroup>
 <col>
@@ -2177,7 +2177,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.30"></a><p class="title"><b>Table 58. 802-3-ethernet setting</b></p>
+<a name="id-1.4.8.4.30"></a><p class="title"><b>Table 58. 802-3-ethernet setting</b></p>
 <div class="table-contents"><table summary="802-3-ethernet setting" border="1">
 <colgroup>
 <col>
@@ -2280,7 +2280,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.31"></a><p class="title"><b>Table 59. 802-11-wireless setting</b></p>
+<a name="id-1.4.8.4.31"></a><p class="title"><b>Table 59. 802-11-wireless setting</b></p>
 <div class="table-contents"><table summary="802-11-wireless setting" border="1">
 <colgroup>
 <col>
@@ -2401,7 +2401,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.4.5.4.32"></a><p class="title"><b>Table 60. 802-11-wireless-security setting</b></p>
+<a name="id-1.4.8.4.32"></a><p class="title"><b>Table 60. 802-11-wireless-security setting</b></p>
 <div class="table-contents"><table summary="802-11-wireless-security setting" border="1">
 <colgroup>
 <col>
@@ -2547,18 +2547,15 @@
 </div>
 </div>
 <div class="refsect1">
-<a name="id-1.4.5.5"></a><h2>AUTHOR</h2>
-<p><span class="author"><span class="firstname">NetworkManager developers</span></span></p>
+<a name="files"></a><h2>Files</h2>
+<p><code class="filename">/etc/NetworkManager/system-connections</code> or distro plugin-specific location</p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.5.6"></a><h2>FILES</h2>
-<p>/etc/NetworkManager/system-connections</p>
-<p>or distro plugin-specific location</p>
-</div>
-<div class="refsect1">
-<a name="id-1.4.5.7"></a><h2>SEE ALSO</h2>
-<p>https://wiki.gnome.org/Projects/NetworkManager/ConfigurationSpecification</p>
-<p>NetworkManager(8), nmcli(1), nmcli-examples(5), NetworkManager.conf(5)</p>
+<a name="see_also"></a><h2>See Also</h2>
+<p><span class="citerefentry"><span class="refentrytitle">NetworkManager</span>(8)</span>,
+        <span class="citerefentry"><span class="refentrytitle">nmcli</span>(1)</span>,
+        <span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(7)</span>,
+        <span class="citerefentry"><span class="refentrytitle">NetworkManager.conf</span>(5)</span></p>
 </div>
 </div>
 <div class="footer">
diff --git a/docs/api/html/nmcli-examples.html b/docs/api/html/nmcli-examples.html
index e7ac079b..e903cd68 100644
--- a/docs/api/html/nmcli-examples.html
+++ b/docs/api/html/nmcli-examples.html
@@ -33,7 +33,7 @@
 <div class="cmdsynopsis"><p><code class="command">nmcli [OPTIONS...]</code> </p></div>
 </div>
 <div class="refsect1">
-<a name="id-1.4.4.5"></a><h2>Description</h2>
+<a name="id-1.4.7.5"></a><h2>Description</h2>
 <p>
       <span class="emphasis"><em>nmcli</em></span> is a command-line client for NetworkManager. It
       allows controlling NetworkManager and reporting its status. For more information
@@ -47,14 +47,11 @@
 <p>Note: this page has "work-in-progress" status.</p>
 </div>
 <div class="refsect1">
-<a name="id-1.4.4.6"></a><h2>Examples</h2>
+<a name="id-1.4.7.6"></a><h2>Examples</h2>
 <div class="example">
-<a name="id-1.4.4.6.2"></a><p class="title"><b>Example 1. Listing available Wi-Fi APs</b></p>
+<a name="id-1.4.7.6.2"></a><p class="title"><b>Example 1. Listing available Wi-Fi APs</b></p>
 <div class="example-contents">
-<pre class="synopsis"><span class="bold"><strong>
-$ nmcli device wifi list
-      </strong></span></pre>
-<pre class="screen">
+<pre class="screen"><strong class="userinput"><code>$ nmcli device wifi list</code></strong>
 *  SSID               MODE    CHAN  RATE       SIGNAL  BARS  SECURITY
    netdatacomm_local  Infra   6     54 Mbit/s  37      ▂▄__  WEP
 *  F1                 Infra   11    54 Mbit/s  98      ▂▄▆█  WPA1
@@ -66,67 +63,60 @@ $ nmcli device wifi list
    MARTINA            Infra   4     54 Mbit/s  32      ▂▄__  WPA2
    N24PU1             Infra   7     11 Mbit/s  22      ▂___  --
    alfa               Infra   1     54 Mbit/s  67      ▂▄▆_  WPA2
-   bertnet            Infra   5     54 Mbit/s  20      ▂___  WPA1 WPA2
-      </pre>
+   bertnet            Infra   5     54 Mbit/s  20      ▂___  WPA1 WPA2</pre>
+<p>
+        This command shows how to list available Wi-Fi networks (APs). You can also use
+        <span class="emphasis"><em>--fields</em></span> option for displaying different columns.
+        <span class="bold"><strong>nmcli -f all dev wifi list</strong></span> will show all of them.
+      </p>
 </div>
 </div>
-<br class="example-break"><p>
-      This command shows how to list available Wi-Fi networks (APs). You can also use
-      <span class="emphasis"><em>--fields</em></span> option for displaying different columns.
-      <span class="bold"><strong>nmcli -f all dev wifi list</strong></span> will show all of them.
-    </p>
-<div class="example">
-<a name="id-1.4.4.6.4"></a><p class="title"><b>Example 2. Showing general information and properties for a Wi-Fi interface</b></p>
+<br class="example-break"><div class="example">
+<a name="id-1.4.7.6.3"></a><p class="title"><b>Example 2. Showing general information and properties for a Wi-Fi interface</b></p>
 <div class="example-contents">
-<pre class="synopsis"><span class="bold"><strong>
-$ nmcli -p -f general,wifi-properties device show wlan0
-      </strong></span></pre>
-<pre class="screen">
-===============================================================================
-                            Device details (wlan0)
-===============================================================================
-GENERAL.DEVICE:                         wlan0
-GENERAL.TYPE:                           wifi
-GENERAL.VENDOR:                         Intel Corporation
-GENERAL.PRODUCT:                        PRO/Wireless 5100 AGN [Shiloh] Network Connection
-GENERAL.DRIVER:                         iwlwifi
-GENERAL.DRIVER-VERSION:                 3.8.13-100.fc17.x86_64
-GENERAL.FIRMWARE-VERSION:               8.83.5.1 build 33692
-GENERAL.HWADDR:                         00:1E:65:37:A1:D3
-GENERAL.MTU:                            1500
-GENERAL.STATE:                          100 (connected)
-GENERAL.REASON:                         0 (No reason given)
-GENERAL.UDI:                            /sys/devices/pci0000:00/0000:00:1c.1/0000:03:00.0/net/wlan0
-GENERAL.IP-IFACE:                       wlan0
-GENERAL.IS-SOFTWARE:                    no
-GENERAL.NM-MANAGED:                     yes
-GENERAL.AUTOCONNECT:                    yes
-GENERAL.FIRMWARE-MISSING:               no
-GENERAL.CONNECTION:                     My Alfa WiFi
-GENERAL.CON-UUID:                       85194f4c-d496-4eec-bae0-d880b4cbcf26
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/10
--------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP:                    yes
-WIFI-PROPERTIES.WPA:                    yes
-WIFI-PROPERTIES.WPA2:                   yes
-WIFI-PROPERTIES.TKIP:                   yes
-WIFI-PROPERTIES.CCMP:                   yes
-WIFI-PROPERTIES.AP:                     no
-WIFI-PROPERTIES.ADHOC:                  yes
--------------------------------------------------------------------------------
-      </pre>
+<pre class="screen"><strong class="userinput"><code>$ nmcli -p -f general,wifi-properties device show wlan0</code></strong>
+===========================================================================
+                        Device details (wlan0)
+===========================================================================
+GENERAL.DEVICE:           wlan0
+GENERAL.TYPE:             wifi
+GENERAL.VENDOR:           Intel Corporation
+GENERAL.PRODUCT:          PRO/Wireless 5100 AGN [Shiloh] Network Connection
+GENERAL.DRIVER:           iwlwifi
+GENERAL.DRIVER-VERSION:   3.8.13-100.fc17.x86_64
+GENERAL.FIRMWARE-VERSION: 8.83.5.1 build 33692
+GENERAL.HWADDR:           00:1E:65:37:A1:D3
+GENERAL.MTU:              1500
+GENERAL.STATE:            100 (connected)
+GENERAL.REASON:           0 (No reason given)
+GENERAL.UDI:              /sys/devices/pci0000:00/0000:00:1c.1/net/wlan0
+GENERAL.IP-IFACE:         wlan0
+GENERAL.IS-SOFTWARE:      no
+GENERAL.NM-MANAGED:       yes
+GENERAL.AUTOCONNECT:      yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.CONNECTION:       My Alfa WiFi
+GENERAL.CON-UUID:         85194f4c-d496-4eec-bae0-d880b4cbcf26
+GENERAL.CON-PATH:         /org/freedesktop/NetworkManager/ActiveConnection/
+10
+---------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP:      yes
+WIFI-PROPERTIES.WPA:      yes
+WIFI-PROPERTIES.WPA2:     yes
+WIFI-PROPERTIES.TKIP:     yes
+WIFI-PROPERTIES.CCMP:     yes
+WIFI-PROPERTIES.AP:       no
+WIFI-PROPERTIES.ADHOC:    yes
+---------------------------------------------------------------------------</pre>
+<p>
+        This command shows information about a Wi-Fi device.
+      </p>
 </div>
 </div>
-<br class="example-break"><p>
-      This command shows information about a Wi-Fi device.
-    </p>
-<div class="example">
-<a name="id-1.4.4.6.6"></a><p class="title"><b>Example 3. Listing NetworkManager polkit permissions</b></p>
+<br class="example-break"><div class="example">
+<a name="id-1.4.7.6.4"></a><p class="title"><b>Example 3. Listing NetworkManager polkit permissions</b></p>
 <div class="example-contents">
-<pre class="synopsis"><span class="bold"><strong>
-$ nmcli general permissions
-      </strong></span></pre>
-<pre class="screen">
+<pre class="screen"><strong class="userinput"><code>$ nmcli general permissions</code></strong>
 PERMISSION                                                VALUE
 org.freedesktop.NetworkManager.enable-disable-network     yes
 org.freedesktop.NetworkManager.enable-disable-wifi        yes
@@ -138,229 +128,192 @@ org.freedesktop.NetworkManager.wifi.share.protected       yes
 org.freedesktop.NetworkManager.wifi.share.open            yes
 org.freedesktop.NetworkManager.settings.modify.system     yes
 org.freedesktop.NetworkManager.settings.modify.own        yes
-org.freedesktop.NetworkManager.settings.modify.hostname   auth
-      </pre>
-</div>
-</div>
-<br class="example-break"><p>
-      This command shows configured polkit permissions for various NetworkManager
-      operations. These permissions or actions (using polkit language) are configured
-      by a system administrator and are not meant to be changed by users. The usual
-      place for the polkit configuration is /usr/share/polkit-1/actions/org.freedesktop.NetworkManager.policy.
-      <span class="emphasis"><em>pkaction</em></span> command can display description for polkit actions.
-      </p>
+org.freedesktop.NetworkManager.settings.modify.hostname   auth</pre>
+<p>
+        This command shows configured polkit permissions for various NetworkManager
+        operations. These permissions or actions (using polkit language) are configured
+        by a system administrator and are not meant to be changed by users. The usual
+        place for the polkit configuration is /usr/share/polkit-1/actions/org.freedesktop.NetworkManager.policy.
+        <span class="emphasis"><em>pkaction</em></span> command can display description for polkit actions.
+        </p>
 <pre class="synopsis"><span class="command"><strong>
-pkaction --action-id org.freedesktop.NetworkManager.network-control --verbose
-      </strong></span></pre>
+  pkaction --action-id org.freedesktop.NetworkManager.network-control --verbose
+        </strong></span></pre>
 <p>
-      More information about polkit can be found at http://www.freedesktop.org/wiki/Software/polkit.
-    </p>
-<div class="example">
-<a name="id-1.4.4.6.8"></a><p class="title"><b>Example 4. Listing NetworkManager log level and domains</b></p>
+        More information about polkit can be found at http://www.freedesktop.org/wiki/Software/polkit.
+      </p>
+</div>
+</div>
+<br class="example-break"><div class="example">
+<a name="id-1.4.7.6.5"></a><p class="title"><b>Example 4. Listing NetworkManager log level and domains</b></p>
 <div class="example-contents">
-<pre class="synopsis"><span class="bold"><strong>
-$ nmcli general logging
-      </strong></span></pre>
-<pre class="screen">
+<pre class="screen"><strong class="userinput"><code>$ nmcli general logging</code></strong>
 LEVEL  DOMAINS
-INFO   PLATFORM,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,INFINIBAND,FIREWALL,ADSL,BOND,VLAN,BRIDGE,DBUS_PROPS,TEAM,CONCHECK,DCB,DISPATCH
-      </pre>
+INFO   PLATFORM,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,WIFI_SCAN,IP4,IP6,A
+UTOIP4,DNS,VPN,SHARING,SUPPLICANT,AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,
+WIMAX,INFINIBAND,FIREWALL,ADSL,BOND,VLAN,BRIDGE,DBUS_PROPS,TEAM,CONCHECK,DC
+B,DISPATCH</pre>
+<p>
+        This command shows current NetworkManager logging status.
+      </p>
 </div>
 </div>
-<br class="example-break"><p>
-      This command shows current NetworkManager logging status.
-    </p>
-<div class="example">
-<a name="id-1.4.4.6.10"></a><p class="title"><b>Example 5. Changing NetworkManager logging</b></p>
-<div class="example-contents"><pre class="synopsis"><span class="bold"><strong>
-$ nmcli g log level DEBUG domains CORE,ETHER,IP
-$ nmcli g log level INFO domains DEFAULT
-      </strong></span></pre></div>
+<br class="example-break"><div class="example">
+<a name="id-1.4.7.6.6"></a><p class="title"><b>Example 5. Changing NetworkManager logging</b></p>
+<div class="example-contents">
+<pre class="screen"><strong class="userinput"><code>$ nmcli g log level DEBUG domains CORE,ETHER,IP</code></strong>
+<strong class="userinput"><code>$ nmcli g log level INFO domains DEFAULT</code></strong></pre>
+<p>
+        The first command makes NetworkManager log in DEBUG level, and only for CORE, ETHER and
+        IP domains. The second command restores the default logging state. Please refer to the
+        <span class="citerefentry"><span class="refentrytitle">NetworkManager.conf</span>(5)</span> manual page
+        for available logging levels and domains.
+      </p>
 </div>
-<br class="example-break"><p>
-      The first command makes NetworkManager log in DEBUG level, and only for CORE, ETHER and
-      IP domains. The second command restores the default logging state. Please refer to the
-      <span class="citerefentry"><span class="refentrytitle">NetworkManager.conf</span>(5)</span> manual page
-      for available logging levels and domains.
-    </p>
-<div class="example">
-<a name="id-1.4.4.6.12"></a><p class="title"><b>Example 6. Adding a bonding master and two slave connection profiles</b></p>
-<div class="example-contents"><pre class="synopsis"><span class="bold"><strong>
-$ nmcli con add type bond ifname mybond0 mode active-backup
-$ nmcli con add type ethernet ifname eth1 master mybond0
-$ nmcli con add type ethernet ifname eth2 master mybond0
-      </strong></span></pre></div>
 </div>
-<br class="example-break"><p>
-      This example demonstrates adding a bond master connection and two slaves. The
-      first command adds a master bond connection, naming the bonding interface
-      <span class="emphasis"><em>mybond0</em></span> and using <span class="emphasis"><em>active-backup</em></span> mode.
-      The next two commands add slaves connections, both enslaved to <span class="emphasis"><em>mybond0</em></span>.
-      The first slave will be bound to <span class="emphasis"><em>eth1</em></span> interface, the second to
-      <span class="emphasis"><em>eth2</em></span>. 
-    </p>
-<div class="example">
-<a name="id-1.4.4.6.14"></a><p class="title"><b>Example 7. Adding a team master and two slave connection profiles</b></p>
-<div class="example-contents"><pre class="synopsis"><span class="bold"><strong>
-$ nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf
-$ nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1
-$ nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1
-      </strong></span></pre></div>
+<br class="example-break"><div class="example">
+<a name="id-1.4.7.6.7"></a><p class="title"><b>Example 6. Adding a bonding master and two slave connection profiles</b></p>
+<div class="example-contents">
+<pre class="screen"><strong class="userinput"><code>$ nmcli con add type bond ifname mybond0 mode active-backup</code></strong>
+<strong class="userinput"><code>$ nmcli con add type ethernet ifname eth1 master mybond0</code></strong>
+<strong class="userinput"><code>$ nmcli con add type ethernet ifname eth2 master mybond0</code></strong></pre>
+<p>
+        This example demonstrates adding a bond master connection and two slaves. The
+        first command adds a master bond connection, naming the bonding interface
+        <span class="emphasis"><em>mybond0</em></span> and using <span class="emphasis"><em>active-backup</em></span> mode.
+        The next two commands add slaves connections, both enslaved to <span class="emphasis"><em>mybond0</em></span>.
+        The first slave will be bound to <span class="emphasis"><em>eth1</em></span> interface, the second to
+        <span class="emphasis"><em>eth2</em></span>.
+      </p>
 </div>
-<br class="example-break"><p>
-      This example demonstrates adding a team master connection profile and two slaves. It is
-      very similar to the bonding example. The first command adds a master team profile, naming
-      the team interface and the profile <span class="emphasis"><em>Team1</em></span>. The team configuration
-      for the master is read from <span class="emphasis"><em>team1-master-json.conf</em></span> file. Later, you can
-      change the configuration with <span class="emphasis"><em>modify</em></span> command
-      (<span class="bold"><strong>nmcli con modify Team1 team.config team1-master-another-json.conf</strong></span>).
-      The last two commands add slaves profiles, both enslaved to <span class="emphasis"><em>Team1</em></span>.
-      The first slave will be bound to <span class="emphasis"><em>em1</em></span> interface, the second to
-      <span class="emphasis"><em>em2</em></span>. The slaves don't specify <span class="emphasis"><em>config</em></span> and thus
-      <span class="emphasis"><em>teamd</em></span> will use its default configuration. You will activate the whole setup
-      by activating both slaves:
+</div>
+<br class="example-break"><div class="example">
+<a name="id-1.4.7.6.8"></a><p class="title"><b>Example 7. Adding a team master and two slave connection profiles</b></p>
+<div class="example-contents">
+<pre class="screen"><strong class="userinput"><code>$ nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf</code></strong>
+<strong class="userinput"><code>$ nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1</code></strong>
+<strong class="userinput"><code>$ nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1</code></strong></pre>
+<p>
+        This example demonstrates adding a team master connection profile and two slaves. It is
+        very similar to the bonding example. The first command adds a master team profile, naming
+        the team interface and the profile <span class="emphasis"><em>Team1</em></span>. The team configuration
+        for the master is read from <span class="emphasis"><em>team1-master-json.conf</em></span> file. Later, you can
+        change the configuration with <span class="emphasis"><em>modify</em></span> command
+        (<span class="bold"><strong>nmcli con modify Team1 team.config team1-master-another-json.conf</strong></span>).
+        The last two commands add slaves profiles, both enslaved to <span class="emphasis"><em>Team1</em></span>.
+        The first slave will be bound to <span class="emphasis"><em>em1</em></span> interface, the second to
+        <span class="emphasis"><em>em2</em></span>. The slaves don't specify <span class="emphasis"><em>config</em></span> and thus
+        <span class="emphasis"><em>teamd</em></span> will use its default configuration. You will activate the whole setup
+        by activating both slaves:
+</p>
+<pre class="screen">  <strong class="userinput"><code>$ nmcli con up Team1-slave1</code></strong>
+  <strong class="userinput"><code>$ nmcli con up Team1-slave2</code></strong></pre>
+<p>
+        By default, the created profiles are marked for auto-activation. But if another
+        connection has been activated on the device, the new profile won't activate
+        automatically and you need to activate it manually.
       </p>
-<pre class="synopsis"><span class="bold"><strong>
-$ nmcli con up Team1-slave1
-$ nmcli con up Team1-slave2
-      </strong></span></pre>
+</div>
+</div>
+<br class="example-break"><div class="example">
+<a name="id-1.4.7.6.9"></a><p class="title"><b>Example 8. Adding a bridge and two slave profiles</b></p>
+<div class="example-contents">
+<pre class="screen"><strong class="userinput"><code>$ nmcli con add type bridge con-name TowerBridge ifname TowerBridge</code></strong>
+<strong class="userinput"><code>$ nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge</code></strong>
+<strong class="userinput"><code>$ nmcli con add type ethernet con-name br-slave-2 ifname ens4 master TowerBridge</code></strong>
+<strong class="userinput"><code>$ nmcli con modify TowerBridge bridge.stp no</code></strong></pre>
 <p>
-      By default, the created profiles are marked for auto-activation. But if another
-      connection has been activated on the device, the new profile won't activate
-      automatically and you need to activate it manually.
-    </p>
-<div class="example">
-<a name="id-1.4.4.6.16"></a><p class="title"><b>Example 8. Adding a bridge and two slave profiles</b></p>
-<div class="example-contents"><pre class="synopsis"><span class="bold"><strong>
-$ nmcli con add type bridge con-name TowerBridge ifname TowerBridge
-$ nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge
-$ nmcli con add type ethernet con-name br-slave-2 ifname ens4 master TowerBridge
-$ nmcli con modify TowerBridge bridge.stp no
-      </strong></span></pre></div>
+        This example demonstrates adding a bridge master connection and two slaves. The
+        first command adds a master bridge connection, naming the bridge interface and
+        the profile as <span class="emphasis"><em>TowerBridge</em></span>.
+        The next two commands add slaves profiles, both will be enslaved to
+        <span class="emphasis"><em>TowerBridge</em></span>.
+        The first slave will be tied to <span class="emphasis"><em>ens3</em></span> interface, the second to
+        <span class="emphasis"><em>ens4</em></span>.
+        The last command will disable 802.1D STP for the TowerBridge profile.
+      </p>
 </div>
-<br class="example-break"><p>
-      This example demonstrates adding a bridge master connection and two slaves. The
-      first command adds a master bridge connection, naming the bridge interface and
-      the profile as <span class="emphasis"><em>TowerBridge</em></span>.
-      The next two commands add slaves profiles, both will be enslaved to
-      <span class="emphasis"><em>TowerBridge</em></span>.
-      The first slave will be tied to <span class="emphasis"><em>ens3</em></span> interface, the second to
-      <span class="emphasis"><em>ens4</em></span>. 
-      The last command will disable 802.1D STP for the TowerBridge profile.
-    </p>
-<div class="example">
-<a name="id-1.4.4.6.18"></a><p class="title"><b>Example 9. Adding an ethernet connection profile with manual IP configuration</b></p>
-<div class="example-contents"><pre class="synopsis">
-        <span class="bold"><strong>
-$ nmcli con add con-name my-con-em1 ifname em1 type ethernet ip4 192.168.100.100/24 gw4 192.168.100.1 ip4 1.2.3.4 ip6 abbe::cafe
-$ nmcli con mod my-con-em1 ipv4.dns "8.8.8.8 8.8.4.4"
-$ nmcli con mod my-con-em1 +ipv4.dns 1.2.3.4
-$ nmcli con mod my-con-em1 ipv6.dns "2001:4860:4860::8888 2001:4860:4860::8844"
-$ nmcli -p con show my-con-em1
-        </strong></span>
-      </pre></div>
 </div>
-<br class="example-break"><p>
-      The first command adds an Ethernet connection profile named <span class="emphasis"><em>my-con-em1</em></span>
-      that is bound to interface name <span class="emphasis"><em>em1</em></span>. The profile is configured
-      with static IP addresses. Three addresses are added, two IPv4 addresses and one IPv6.
-      The first IP 192.168.100.100 has a prefix of 24 (netmask equivalent of 255.255.255.0).
-      Gateway entry will become the default route if this profile is activated on em1 interface
-      (and there is no connection with higher priority). The next two addresses do not
-      specify a prefix, so a default prefix will be used, i.e. 32 for IPv4 and 128 for IPv6.
-      The second, third and fourth commands modify DNS parameters of the new connection profile.
-      The last <span class="emphasis"><em>con show</em></span> command displays the profile so that all
-      parameters can be reviewed.
-    </p>
-<div class="example">
-<a name="id-1.4.4.6.20"></a><p class="title"><b>Example 10. Escaping colon characters in tabular mode</b></p>
+<br class="example-break"><div class="example">
+<a name="id-1.4.7.6.10"></a><p class="title"><b>Example 9. Adding an ethernet connection profile with manual IP configuration</b></p>
 <div class="example-contents">
-<pre class="synopsis">
-        <span class="bold"><strong>
-$ nmcli -t -f general -e yes -m tab dev show eth0
-        </strong></span>
-      </pre>
-<pre class="screen">
-GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:e1000e:2.1.4-k:1.8-3:00\:22\:68\:15\:29\:21:1500:100 (connected):0 (No reason given):/sys/devices/pci0000\:00/0000\:00\:19.0/net/eth0:eth0:yes:yes:no:ethernet-13:89cbcbc6-dc85-456c-9c8b-bd828fee3917:/org/freedesktop/NetworkManager/ActiveConnection/9
-      </pre>
+<pre class="screen"><strong class="userinput"><code>$ nmcli con add con-name my-con-em1 ifname em1 type ethernet \
+  ip4 192.168.100.100/24 gw4 192.168.100.1 ip4 1.2.3.4 ip6 abbe::cafe</code></strong>
+<strong class="userinput"><code>$ nmcli con mod my-con-em1 ipv4.dns "8.8.8.8 8.8.4.4"</code></strong>
+<strong class="userinput"><code>$ nmcli con mod my-con-em1 +ipv4.dns 1.2.3.4</code></strong>
+<strong class="userinput"><code>$ nmcli con mod my-con-em1 ipv6.dns "2001:4860:4860::8888 2001:4860:4860::8844"</code></strong>
+<strong class="userinput"><code>$ nmcli -p con show my-con-em1</code></strong></pre>
+<p>
+        The first command adds an Ethernet connection profile named <span class="emphasis"><em>my-con-em1</em></span>
+        that is bound to interface name <span class="emphasis"><em>em1</em></span>. The profile is configured
+        with static IP addresses. Three addresses are added, two IPv4 addresses and one IPv6.
+        The first IP 192.168.100.100 has a prefix of 24 (netmask equivalent of 255.255.255.0).
+        Gateway entry will become the default route if this profile is activated on em1 interface
+        (and there is no connection with higher priority). The next two addresses do not
+        specify a prefix, so a default prefix will be used, i.e. 32 for IPv4 and 128 for IPv6.
+        The second, third and fourth commands modify DNS parameters of the new connection profile.
+        The last <span class="emphasis"><em>con show</em></span> command displays the profile so that all
+        parameters can be reviewed.
+      </p>
 </div>
 </div>
-<br class="example-break"><p>
-      This example shows escaping colon characters in tabular mode. It may be
-      useful for script processing, because ':' is used as a field separator.
-    </p>
-<div class="example">
-<a name="id-1.4.4.6.22"></a><p class="title"><b>Example 11. nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive</b></p>
+<br class="example-break"><div class="example">
+<a name="id-1.4.7.6.11"></a><p class="title"><b>Example 10. Escaping colon characters in tabular mode</b></p>
 <div class="example-contents">
-  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
-    <tbody>
-      <tr>
-        <td class="listing_lines" align="right"><pre>1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="preproc">#</span><span class="symbol">!/</span><span class="normal">bin</span><span class="symbol">/</span><span class="normal">bash</span>
-<span class="usertype">export</span><span class="normal"> LC_ALL</span><span class="symbol">=</span><span class="normal">C</span>
+<pre class="screen"><strong class="userinput"><code>$ nmcli -t -f general -e yes -m tab dev show eth0</code></strong>
+GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:
+e1000e:2.1.4-k:1.8-3:00\:22\:68\:15\:29\:21:1500:100 (connected):0 (No reas
+on given):/sys/devices/pci0000\:00/0000\:00\:19.0/net/eth0:eth0:yes:yes:no:
+ethernet-13:89cbcbc6-dc85-456c-9c8b-bd828fee3917:/org/freedesktop/NetworkMa
+nager/ActiveConnection/9</pre>
+<p>
+        This example shows escaping colon characters in tabular mode. It may be
+        useful for script processing, because ':' is used as a field separator.
+      </p>
+</div>
+</div>
+<br class="example-break"><div class="example">
+<a name="id-1.4.7.6.12"></a><p class="title"><b>Example 11. nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive</b></p>
+<div class="example-contents">
+<pre class="programlisting">
+#!/bin/bash
+export LC_ALL=C
 
-<span class="function">enable_disable_wifi</span><span class="normal"> </span><span class="symbol">()</span>
-<span class="cbracket">{</span>
-<span class="normal">    result</span><span class="symbol">=</span><span class="normal">$</span><span class="symbol">(</span><span class="usertype">nmcli</span><span class="normal"> dev </span><span class="symbol">|</span><span class="normal"> grep </span><span class="string">"ethernet"</span><span class="normal"> </span><span class="symbol">|</span><span class="normal"> grep </span><span class="symbol">-</span><span class="normal">w </span><span class="string">"connected"</span><span class="symbol">)</span>
-<span class="normal">    </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">[</span><span class="normal"> </span><span class="symbol">-</span><span class="normal">n </span><span class="string">"$result"</span><span class="normal"> </span><span class="symbol">];</span><span class="normal"> then</span>
-<span class="normal">        nmcli radio wifi off</span>
-<span class="normal">    </span><span class="keyword">else</span>
-<span class="normal">        nmcli radio wifi on</span>
-<span class="normal">    fi</span>
-<span class="cbracket">}</span>
+enable_disable_wifi ()
+{
+    result=$(nmcli dev | grep "ethernet" | grep -w "connected")
+    if [ -n "$result" ]; then
+        nmcli radio wifi off
+    else
+        nmcli radio wifi on
+    fi
+}
 
-<span class="keyword">if</span><span class="normal"> </span><span class="symbol">[</span><span class="normal"> </span><span class="string">"$2"</span><span class="normal"> </span><span class="symbol">=</span><span class="normal"> </span><span class="string">"up"</span><span class="normal"> </span><span class="symbol">];</span><span class="normal"> then</span>
-<span class="normal">    enable_disable_wifi</span>
-<span class="normal">fi</span>
+if [ "$2" = "up" ]; then
+    enable_disable_wifi
+fi
 
-<span class="keyword">if</span><span class="normal"> </span><span class="symbol">[</span><span class="normal"> </span><span class="string">"$2"</span><span class="normal"> </span><span class="symbol">=</span><span class="normal"> </span><span class="string">"down"</span><span class="normal"> </span><span class="symbol">];</span><span class="normal"> then</span>
-<span class="normal">    enable_disable_wifi</span>
-<span class="normal">fi</span></pre></td>
-      </tr>
-    </tbody>
-  </table>
+if [ "$2" = "down" ]; then
+    enable_disable_wifi
+fi
+      </pre>
+<p>
+        This dispatcher script makes Wi-Fi mutually exclusive with wired
+        networking. When a wired interface is connected, Wi-Fi will be set
+        to airplane mode (rfkilled). When the wired interface is disconnected,
+        Wi-Fi will be turned back on.
+        Name this script e.g. 70-wifi-wired-exclusive.sh and put it into /etc/NetworkManager/dispatcher.d/
+        directory.
+        See <span class="citerefentry"><span class="refentrytitle">NetworkManager</span>(8)</span>
+        manual page for more information about NetworkManager dispatcher scripts.
+      </p>
 </div>
-
 </div>
-<br class="example-break"><p>
-      This dispatcher script makes Wi-Fi mutually exclusive with wired
-      networking. When a wired interface is connected, Wi-Fi will be set
-      to airplane mode (rfkilled). When the wired interface is disconnected,
-      Wi-Fi will be turned back on.
-      Name this script e.g. 70-wifi-wired-exclusive.sh and put it into /etc/NetworkManager/dispatcher.d/
-      directory.
-      See <span class="citerefentry"><span class="refentrytitle">NetworkManager</span>(8)</span>
-      manual page for more information about NetworkManager dispatcher scripts.
-    </p>
-<p><span class="bold"><strong>Example sessions of interactive connection editor</strong></span></p>
+<br class="example-break"><p><span class="bold"><strong>Example sessions of interactive connection editor</strong></span></p>
 <div class="example">
-<a name="id-1.4.4.6.25"></a><p class="title"><b>Example 12. Adding an ethernet connection profile in interactive editor (a)</b></p>
+<a name="id-1.4.7.6.14"></a><p class="title"><b>Example 12. Adding an ethernet connection profile in interactive editor (a)</b></p>
 <div class="example-contents">
-<pre class="synopsis">
-        <span class="bold"><strong>
-$ nmcli connection edit type ethernet
-        </strong></span>
-      </pre>
-<pre class="screen">
+<pre class="screen"><strong class="userinput"><code>$ nmcli connection edit type ethernet</code></strong>
 
 ===| nmcli interactive connection editor |===
 
@@ -369,72 +322,75 @@ Adding a new '802-3-ethernet' connection
 Type 'help' or '?' for available commands.
 Type 'describe [&lt;setting&gt;.&lt;prop&gt;]' for detailed property description.
 
-You may edit the following settings: connection, 802-3-ethernet (ethernet), 802-1x, ipv4, ipv6, dcb
-nmcli&gt; print
-===============================================================================
-                              Connection details
-===============================================================================
-connection.id:                          ethernet-4
-connection.uuid:                        de89cdeb-a3e1-4d53-8fa0-c22546c775f4
-connection.interface-name:              --
-connection.type:                        802-3-ethernet
-connection.autoconnect:                 yes
-connection.autoconnect-priority:        0
-connection.timestamp:                   0
-connection.read-only:                   no
-connection.permissions:                 
-connection.zone:                        --
-connection.master:                      --
-connection.slave-type:                  --
-connection.secondaries:                 
-connection.gateway-ping-timeout:        0
--------------------------------------------------------------------------------
-802-3-ethernet.port:                    --
-802-3-ethernet.speed:                   0
-802-3-ethernet.duplex:                  --
-802-3-ethernet.auto-negotiate:          yes
-802-3-ethernet.mac-address:             --
-802-3-ethernet.cloned-mac-address:      --
-802-3-ethernet.mac-address-blacklist:   
-802-3-ethernet.mtu:                     auto
-802-3-ethernet.s390-subchannels:        
-802-3-ethernet.s390-nettype:            --
-802-3-ethernet.s390-options:            
--------------------------------------------------------------------------------
-ipv4.method:                            auto
-ipv4.dns:                               
-ipv4.dns-search:                        
-ipv4.addresses:                         
-ipv4.gateway:                           --
-ipv4.routes:                            
-ipv4.route-metric:                      -1
-ipv4.ignore-auto-routes:                no
-ipv4.ignore-auto-dns:                   no
-ipv4.dhcp-client-id:                    --
-ipv4.dhcp-send-hostname:                yes
-ipv4.dhcp-hostname:                     --
-ipv4.never-default:                     no
-ipv4.may-fail:                          yes
--------------------------------------------------------------------------------
-ipv6.method:                            auto
-ipv6.dns:                               
-ipv6.dns-search:                        
-ipv6.addresses:                         
-ipv6.gateway:                           --
-ipv6.routes:                            
-ipv6.route-metric:                      -1
-ipv6.ignore-auto-routes:                no
-ipv6.ignore-auto-dns:                   no
-ipv6.never-default:                     no
-ipv6.may-fail:                          yes
-ipv6.ip6-privacy:                       -1 (unknown)
-ipv6.dhcp-hostname:                     --
--------------------------------------------------------------------------------
-nmcli&gt; goto ethernet
-You may edit the following properties: port, speed, duplex, auto-negotiate, mac-address, cloned-mac-address, mac-address-blacklist, mtu, s390-subchannels, s390-nettype, s390-options
+You may edit the following settings: connection, 802-3-ethernet (ethernet),
+802-1x, ipv4, ipv6, dcb
+nmcli&gt; <strong class="userinput"><code>print</code></strong>
+===========================================================================
+                          Connection details
+===========================================================================
+connection.id:                      ethernet-4
+connection.uuid:                    de89cdeb-a3e1-4d53-8fa0-c22546c775f4
+connection.interface-name:          --
+connection.type:                    802-3-ethernet
+connection.autoconnect:             yes
+connection.autoconnect-priority:    0
+connection.timestamp:               0
+connection.read-only:               no
+connection.permissions:
+connection.zone:                    --
+connection.master:                  --
+connection.slave-type:              --
+connection.secondaries:
+connection.gateway-ping-timeout:    0
+---------------------------------------------------------------------------
+802-3-ethernet.port:                --
+802-3-ethernet.speed:               0
+802-3-ethernet.duplex:              --
+802-3-ethernet.auto-negotiate:      yes
+802-3-ethernet.mac-address:         --
+802-3-ethernet.cloned-mac-address:  --
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:                 auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:        --
+802-3-ethernet.s390-options:
+---------------------------------------------------------------------------
+ipv4.method:                        auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.addresses:
+ipv4.gateway:                       --
+ipv4.routes:
+ipv4.route-metric:                  -1
+ipv4.ignore-auto-routes:            no
+ipv4.ignore-auto-dns:               no
+ipv4.dhcp-client-id:                --
+ipv4.dhcp-send-hostname:            yes
+ipv4.dhcp-hostname:                 --
+ipv4.never-default:                 no
+ipv4.may-fail:                      yes
+---------------------------------------------------------------------------
+ipv6.method:                        auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.addresses:
+ipv6.gateway:                       --
+ipv6.routes:
+ipv6.route-metric:                  -1
+ipv6.ignore-auto-routes:            no
+ipv6.ignore-auto-dns:               no
+ipv6.never-default:                 no
+ipv6.may-fail:                      yes
+ipv6.ip6-privacy:                   -1 (unknown)
+ipv6.dhcp-hostname:                 --
+---------------------------------------------------------------------------
+nmcli&gt; <strong class="userinput"><code>goto ethernet</code></strong>
+You may edit the following properties: port, speed, duplex, auto-negotiate,
+ mac-address, cloned-mac-address, mac-address-blacklist, mtu, s390-subchann
+els, s390-nettype, s390-options
 nmcli 802-3-ethernet&gt; set mtu 1492
 nmcli 802-3-ethernet&gt; b
-nmcli&gt; goto ipv4.addresses
+nmcli&gt; <strong class="userinput"><code>goto ipv4.addresses</code></strong>
 nmcli ipv4.addresses&gt; desc
 
 === [addresses] ===
@@ -455,144 +411,145 @@ nmcli ipv4.addresses&gt; print
 addresses: 192.168.1.100/24
 nmcli ipv4.addresses&gt; back
 nmcli ipv4&gt; b
-nmcli&gt; set ipv4.gateway 192.168.1.1
-nmcli&gt; verify
+nmcli&gt; <strong class="userinput"><code>set ipv4.gateway 192.168.1.1</code></strong>
+nmcli&gt; <strong class="userinput"><code>verify</code></strong>
 Verify connection: OK
-nmcli&gt; print
-===============================================================================
-                              Connection details
-===============================================================================
-connection.id:                          ethernet-4
-connection.uuid:                        de89cdeb-a3e1-4d53-8fa0-c22546c775f4
-connection.interface-name:              --
-connection.type:                        802-3-ethernet
-connection.autoconnect:                 yes
-connection.autoconnect-priority:        0
-connection.timestamp:                   0
-connection.read-only:                   no
-connection.permissions:                 
-connection.zone:                        --
-connection.master:                      --
-connection.slave-type:                  --
-connection.secondaries:                 
-connection.gateway-ping-timeout:        0
--------------------------------------------------------------------------------
-802-3-ethernet.port:                    --
-802-3-ethernet.speed:                   0
-802-3-ethernet.duplex:                  --
-802-3-ethernet.auto-negotiate:          yes
-802-3-ethernet.mac-address:             --
-802-3-ethernet.cloned-mac-address:      --
-802-3-ethernet.mac-address-blacklist:   
-802-3-ethernet.mtu:                     1492
-802-3-ethernet.s390-subchannels:        
-802-3-ethernet.s390-nettype:            --
-802-3-ethernet.s390-options:            
--------------------------------------------------------------------------------
-ipv4.method:                            manual
-ipv4.dns:                               
-ipv4.dns-search:                        
-ipv4.addresses:                         192.168.1.100/24
-ipv4.gateway:                           192.168.1.1
-ipv4.routes:                            
-ipv4.route-metric:                      -1
-ipv4.ignore-auto-routes:                no
-ipv4.ignore-auto-dns:                   no
-ipv4.dhcp-client-id:                    --
-ipv4.dhcp-send-hostname:                yes
-ipv4.dhcp-hostname:                     --
-ipv4.never-default:                     no
-ipv4.may-fail:                          yes
--------------------------------------------------------------------------------
-ipv6.method:                            auto
-ipv6.dns:                               
-ipv6.dns-search:                        
-ipv6.addresses:                         
-ipv6.routes:                            
-ipv6.route-metric:                      -1
-ipv6.ignore-auto-routes:                no
-ipv6.ignore-auto-dns:                   no
-ipv6.never-default:                     no
-ipv6.may-fail:                          yes
-ipv6.ip6-privacy:                       -1 (unknown)
-ipv6.dhcp-hostname:                     --
--------------------------------------------------------------------------------
-nmcli&gt; set ipv4.dns 8.8.8.8 8.8.4.4
-nmcli&gt; print
-===============================================================================
-                              Connection details
-===============================================================================
-connection.id:                          ethernet-4
-connection.uuid:                        de89cdeb-a3e1-4d53-8fa0-c22546c775f4
-connection.interface-name:              --
-connection.type:                        802-3-ethernet
-connection.autoconnect:                 yes
-connection.autoconnect-priority:        0
-connection.timestamp:                   0
-connection.read-only:                   no
-connection.permissions:                 
-connection.zone:                        --
-connection.master:                      --
-connection.slave-type:                  --
-connection.secondaries:                 
-connection.gateway-ping-timeout:        0
--------------------------------------------------------------------------------
-802-3-ethernet.port:                    --
-802-3-ethernet.speed:                   0
-802-3-ethernet.duplex:                  --
-802-3-ethernet.auto-negotiate:          yes
-802-3-ethernet.mac-address:             --
-802-3-ethernet.cloned-mac-address:      --
-802-3-ethernet.mac-address-blacklist:   
-802-3-ethernet.mtu:                     1492
-802-3-ethernet.s390-subchannels:        
-802-3-ethernet.s390-nettype:            --
-802-3-ethernet.s390-options:            
--------------------------------------------------------------------------------
-ipv4.method:                            manual
-ipv4.dns:                               8.8.8.8,8.8.4.4
-ipv4.dns-search:                        
-ipv4.addresses:                         192.168.1.100/24
-ipv4.gateway:                           192.168.1.1
-ipv4.routes:                            
-ipv4.route-metric:                      -1
-ipv4.ignore-auto-routes:                no
-ipv4.ignore-auto-dns:                   no
-ipv4.dhcp-client-id:                    --
-ipv4.dhcp-send-hostname:                yes
-ipv4.dhcp-hostname:                     --
-ipv4.never-default:                     no
-ipv4.may-fail:                          yes
--------------------------------------------------------------------------------
-ipv6.method:                            auto
-ipv6.dns:                               
-ipv6.dns-search:                        
-ipv6.addresses:                         
-ipv6.gateway:                           --
-ipv6.routes:                            
-ipv6.route-metric:                      -1
-ipv6.ignore-auto-routes:                no
-ipv6.ignore-auto-dns:                   no
-ipv6.never-default:                     no
-ipv6.may-fail:                          yes
-ipv6.ip6-privacy:                       -1 (unknown)
-ipv6.dhcp-hostname:                     --
--------------------------------------------------------------------------------
-nmcli&gt; verify
+nmcli&gt; <strong class="userinput"><code>print</code></strong>
+===========================================================================
+                          Connection details
+===========================================================================
+connection.id:                      ethernet-4
+connection.uuid:                    de89cdeb-a3e1-4d53-8fa0-c22546c775f4
+connection.interface-name:          --
+connection.type:                    802-3-ethernet
+connection.autoconnect:             yes
+connection.autoconnect-priority:    0
+connection.timestamp:               0
+connection.read-only:               no
+connection.permissions:
+connection.zone:                    --
+connection.master:                  --
+connection.slave-type:              --
+connection.secondaries:
+connection.gateway-ping-timeout:    0
+---------------------------------------------------------------------------
+802-3-ethernet.port:                --
+802-3-ethernet.speed:               0
+802-3-ethernet.duplex:              --
+802-3-ethernet.auto-negotiate:      yes
+802-3-ethernet.mac-address:         --
+802-3-ethernet.cloned-mac-address:  --
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:                 1492
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:        --
+802-3-ethernet.s390-options:
+---------------------------------------------------------------------------
+ipv4.method:                        manual
+ipv4.dns:
+ipv4.dns-search:
+ipv4.addresses:                     192.168.1.100/24
+ipv4.gateway:                       192.168.1.1
+ipv4.routes:
+ipv4.route-metric:                  -1
+ipv4.ignore-auto-routes:            no
+ipv4.ignore-auto-dns:               no
+ipv4.dhcp-client-id:                --
+ipv4.dhcp-send-hostname:            yes
+ipv4.dhcp-hostname:                 --
+ipv4.never-default:                 no
+ipv4.may-fail:                      yes
+---------------------------------------------------------------------------
+ipv6.method:                        auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.addresses:
+ipv6.routes:
+ipv6.route-metric:                  -1
+ipv6.ignore-auto-routes:            no
+ipv6.ignore-auto-dns:               no
+ipv6.never-default:                 no
+ipv6.may-fail:                      yes
+ipv6.ip6-privacy:                   -1 (unknown)
+ipv6.dhcp-hostname:                 --
+---------------------------------------------------------------------------
+nmcli&gt; <strong class="userinput"><code>set ipv4.dns 8.8.8.8 8.8.4.4</code></strong>
+nmcli&gt; <strong class="userinput"><code>print</code></strong>
+===========================================================================
+                          Connection details
+===========================================================================
+connection.id:                      ethernet-4
+connection.uuid:                    de89cdeb-a3e1-4d53-8fa0-c22546c775f4
+connection.interface-name:          --
+connection.type:                    802-3-ethernet
+connection.autoconnect:             yes
+connection.autoconnect-priority:    0
+connection.timestamp:               0
+connection.read-only:               no
+connection.permissions:
+connection.zone:                    --
+connection.master:                  --
+connection.slave-type:              --
+connection.secondaries:
+connection.gateway-ping-timeout:    0
+---------------------------------------------------------------------------
+802-3-ethernet.port:                --
+802-3-ethernet.speed:               0
+802-3-ethernet.duplex:              --
+802-3-ethernet.auto-negotiate:      yes
+802-3-ethernet.mac-address:         --
+802-3-ethernet.cloned-mac-address:  --
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:                 1492
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:        --
+802-3-ethernet.s390-options:
+---------------------------------------------------------------------------
+ipv4.method:                        manual
+ipv4.dns:                           8.8.8.8,8.8.4.4
+ipv4.dns-search:
+ipv4.addresses:                     192.168.1.100/24
+ipv4.gateway:                       192.168.1.1
+ipv4.routes:
+ipv4.route-metric:                  -1
+ipv4.ignore-auto-routes:            no
+ipv4.ignore-auto-dns:               no
+ipv4.dhcp-client-id:                --
+ipv4.dhcp-send-hostname:            yes
+ipv4.dhcp-hostname:                 --
+ipv4.never-default:                 no
+ipv4.may-fail:                      yes
+---------------------------------------------------------------------------
+ipv6.method:                        auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.addresses:
+ipv6.gateway:                       --
+ipv6.routes:
+ipv6.route-metric:                  -1
+ipv6.ignore-auto-routes:            no
+ipv6.ignore-auto-dns:               no
+ipv6.never-default:                 no
+ipv6.may-fail:                      yes
+ipv6.ip6-privacy:                   -1 (unknown)
+ipv6.dhcp-hostname:                 --
+---------------------------------------------------------------------------
+nmcli&gt; <strong class="userinput"><code>verify</code></strong>
 Verify connection: OK
-nmcli&gt; save
-Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully saved.
-nmcli&gt; quit
-      </pre>
+nmcli&gt; <strong class="userinput"><code>save</code></strong>
+Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully
+ saved.
+nmcli&gt; <strong class="userinput"><code>quit</code></strong></pre>
+<p>
+        Example session in the nmcli interactive connection editor.
+        The scenario creates an Ethernet connection profile with static addressing (IPs and DNS).
+      </p>
 </div>
 </div>
-<br class="example-break"><p>
-      Example session in the nmcli interactive connection editor.
-      The scenario creates an Ethernet connection profile with static addressing (IPs and DNS).
-    </p>
+<br class="example-break">
 </div>
 <div class="refsect1">
-<a name="id-1.4.4.7"></a><h2>See Also</h2>
+<a name="id-1.4.7.7"></a><h2>See Also</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">nmcli</span>(1)</span>,
       <span class="citerefentry"><span class="refentrytitle">NetworkManager</span>(8)</span>,
diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html
new file mode 100644
index 00000000..ef756f49
--- /dev/null
+++ b/docs/api/html/nmcli.html
@@ -0,0 +1,2282 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nmcli: NetworkManager D-Bus API Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="NetworkManager D-Bus API Reference Manual">
+<link rel="up" href="manpages.html" title="UNIX Manual Pages">
+<link rel="prev" href="manpages.html" title="UNIX Manual Pages">
+<link rel="next" href="nmtui.html" title="nmtui">
+<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">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="manpages.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="manpages.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="nmtui.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="nmcli"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle">nmcli</span></h2>
+<p>nmcli — command-line tool for controlling NetworkManager</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv">
+<a name="synopsis"></a><h2>Synopsis</h2>
+<div class="cmdsynopsis"><p><code class="command">nmcli</code>  [<em class="replaceable"><code>OPTIONS</code></em>...] { <code class="option">help</code>  |   <code class="option">general</code>  |   <code class="option">networking</code>  |   <code class="option">radio</code>  |   <code class="option">connection</code>  |   <code class="option">device</code>  |   <code class="option">agent</code>  |   <code class="option">monitor</code> } [<em class="replaceable"><code>COMMAND</code></em>] [<em class="replaceable"><code>ARGUMENTS</code></em>...]</p></div>
+</div>
+<div class="refsect1">
+<a name="description"></a><h2>Description</h2>
+<p><span class="command"><strong>nmcli</strong></span> is a command-line tool for controlling
+    NetworkManager and reporting network status. It can be utilized as a
+    replacement for <span class="command"><strong>nm-applet</strong></span> or other graphical clients.
+    <span class="command"><strong>nmcli</strong></span> is used to create, display, edit, delete, activate,
+    and deactivate network connections, as well as control and display network
+    device status.</p>
+<p>Typical uses include:</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p>Scripts: Utilize NetworkManager via <span class="command"><strong>nmcli</strong></span> instead of
+        managing network connections manually. <span class="command"><strong>nmcli</strong></span> supports a
+        terse output format which is better suited for script processing. Note that
+        NetworkManager can also execute scripts, called "dispatcher scripts", in
+        response to network events. See
+        <span class="citerefentry"><span class="refentrytitle">NetworkManager</span>(8)</span>
+        for details about these dispatcher scripts.</p></li>
+<li class="listitem"><p>Servers, headless machines, and terminals: <span class="command"><strong>nmcli</strong></span> can
+        be used to control NetworkManager without a GUI, including creating, editing,
+        starting and stopping network connections and viewing network status.</p></li>
+</ul></div>
+</div>
+<div class="refsect1">
+<a name="options"></a><h2>Options</h2>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term">  <code class="option">-t</code>  |   <code class="option">--terse</code>  </span></p></td>
+<td><p>Output is terse. This mode is designed and suitable for computer (script)
+          processing.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">  <code class="option">-p</code>  |   <code class="option">--pretty</code>  </span></p></td>
+<td><p>Output is pretty. This causes <span class="command"><strong>nmcli</strong></span> to produce easily
+          readable outputs for humans, i.e. values are aligned, headers are printed,
+          etc.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">  <code class="option">-m</code>  |   <code class="option">--mode</code>  { tabular  |   multiline } </span></p></td>
+<td>
+<p>Switch between tabular and multiline output:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"> tabular </span></p></td>
+<td><p>Output is a table where each line describes a single entry.
+                Columns define particular properties of the entry.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"> multiline </span></p></td>
+<td><p>Each entry comprises multiple lines, each property on its
+                own line. The values are prefixed with the property name.</p></td>
+</tr>
+</tbody>
+</table></div>
+<p>If omitted, default is <code class="literal">tabular</code> for most commands.
+          For the commands producing more structured information, that cannot be
+          displayed on a single line, default is <code class="literal">multiline</code>.
+          Currently, they are:</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p><code class="literal">nmcli connection show <em class="replaceable"><code>ID</code></em></code></p></li>
+<li class="listitem"><p><code class="literal">nmcli device show</code></p></li>
+</ul></div>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">  <code class="option">-c</code>  |   <code class="option">--colors</code>  { yes  |   no  |   auto } </span></p></td>
+<td><p>This option controls color output (using terminal escape sequences).
+          <code class="literal">yes</code> enables colors, <code class="literal">no</code> disables them,
+          <code class="literal">auto</code> only produces colors when standard output is directed
+          to a terminal. The default value is <code class="literal">auto</code>.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">  <code class="option">-f</code>  |   <code class="option">--fields</code>  {[<em class="replaceable"><code>field</code></em>...] |   all  |   common } </span></p></td>
+<td>
+<p>This option is used to specify what fields (column names) should be
+          printed. Valid field names differ for specific commands. List available fields
+          by providing an invalid value to the <code class="option">--fields</code> option.
+          <code class="literal">all</code> is used to print all valid field values of the
+          command. <code class="literal">common</code> is used to print common field values of
+          the command.</p>
+<p>If omitted, default is <code class="literal">common</code>. The option is
+          mandatory when <code class="option">--terse</code> is used. In this case, generic values
+          <code class="literal">all</code> and <code class="literal">common</code> cannot be used. This
+          is to maintain compatibility when new fields are added in the future.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">  <code class="option">-e</code>  |   <code class="option">--escape</code>  { yes  |   no } </span></p></td>
+<td>
+<p>Whether to escape <code class="literal">:</code> and <code class="literal">\</code> characters in terse tabular mode. The
+          escape character is <code class="literal">\</code>.</p>
+<p>If omitted, default is <code class="literal">yes</code>.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">  <code class="option">-n</code>  |   <code class="option">--nocheck</code>  </span></p></td>
+<td><p>This option can be used to force <span class="command"><strong>nmcli</strong></span> to skip
+          checking <span class="command"><strong>nmcli</strong></span> and <span class="command"><strong>NetworkManager</strong></span>
+          version compatibility. Use it with care, because using incompatible versions
+          may produce incorrect results.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">  <code class="option">-a</code>  |   <code class="option">--ask</code>  </span></p></td>
+<td><p>When using this option <span class="command"><strong>nmcli</strong></span> will stop and ask for any
+          missing required arguments, so do not use this option for non-interactive
+          purposes like scripts. This option controls, for example, whether you will be
+          prompted for a password if it is required for connecting to a network.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">  <code class="option">-s</code>  |   <code class="option">--show-secrets</code>  </span></p></td>
+<td><p>When using this option <span class="command"><strong>nmcli</strong></span> will display passwords
+          and secrets that might be present in an output of an operation. This option
+          also influences echoing passwords typed by user as an input.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">[
+            <code class="option">-w</code>  |   <code class="option">--wait</code>  
+            <em class="replaceable"><code>seconds</code></em>... 
+        ]</span></p></td>
+<td>
+<p>This option sets a timeout period for which <span class="command"><strong>nmcli</strong></span> will
+          wait for NetworkManager to finish operations. It is
+          especially useful for commands that may take a longer time to complete, e.g.
+          connection activation.</p>
+<p>Specifying a value of <code class="literal">0</code> instructs
+          <span class="command"><strong>nmcli</strong></span> not to wait but to exit immediately with a status of
+          success. The default value depends on the executed command.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">  <code class="option">-v</code>  |   <code class="option">--version</code>  </span></p></td>
+<td><p>Show <span class="command"><strong>nmcli</strong></span> version.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">  <code class="option">-h</code>  |   <code class="option">--help</code>  </span></p></td>
+<td><p>Print help information.</p></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="general"></a><h2>General Commands</h2>
+<div class="cmdsynopsis"><p><code class="command">nmcli general</code>  { <span class="command"><strong>status</strong></span>  |   <span class="command"><strong>hostname</strong></span>  |   <span class="command"><strong>permissions</strong></span>  |   <span class="command"><strong>logging</strong></span> } [<em class="replaceable"><code>ARGUMENTS</code></em>...]</p></div>
+<p>Use this command to show NetworkManager status and permissions. You can also get
+    and change system hostname, as well as NetworkManager logging level and domains.</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><span class="command"><strong>status</strong></span></span></p></td>
+<td><p>Show overall status of NetworkManager. This is the default action, when
+          no additional command is provided for <span class="command"><strong>nmcli general</strong></span>.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>hostname</strong></span>
+           [<em class="replaceable"><code>hostname</code></em>]
+        </span></p></td>
+<td>
+<p>Get and change system hostname. With no arguments, this prints currently
+          configured hostname. When you pass a hostname, it will be handed over to
+          NetworkManager to be set as a new system hostname.</p>
+<p>Note that the term "system" hostname may also be referred to as
+          "persistent" or "static" by other programs or tools. The hostname is stored
+          in <code class="filename">/etc/hostname</code> file in most distributions. For example,
+          systemd-hostnamed service uses the term "static" hostname and it only reads
+          the <code class="filename">/etc/hostname</code> file when it starts.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="command"><strong>permissions</strong></span></span></p></td>
+<td><p>Show the permissions a caller has for various authenticated operations
+          that NetworkManager provides, like enable and disable networking, changing
+          Wi-Fi and WWAN state, modifying connections, etc.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>logging</strong></span>
+           [<code class="option">level</code> <em class="replaceable"><code>level</code></em>]
+           [<code class="option">domain</code> <em class="replaceable"><code>domains</code></em>...]
+        </span></p></td>
+<td><p>Get and change NetworkManager logging level and
+          domains. Without any argument current logging level and domains are shown. In
+          order to change logging state, provide <code class="option">level</code> and, or,
+          <code class="option">domain</code> parameters. See
+          <span class="citerefentry"><span class="refentrytitle">NetworkManager.conf</span>(5)</span>
+          for available level and domain values.</p></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="networking"></a><h2>Networking Control Commands</h2>
+<div class="cmdsynopsis"><p><code class="command">nmcli networking</code>  { <span class="command"><strong>on</strong></span>  |   <span class="command"><strong>off</strong></span>  |   <span class="command"><strong>connectivity</strong></span> } [<em class="replaceable"><code>ARGUMENTS</code></em>...]</p></div>
+<p>Query NetworkManager networking status, enable and disable networking.
+    </p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><span class="command"><strong>on</strong></span>, </span><span class="term"><span class="command"><strong>off</strong></span></span></p></td>
+<td><p>Enable enable or disable networking control by NetworkManager.
+          All interfaces managed by NetworkManager are deactivated when networking
+          is disabled.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>connectivity</strong></span>
+           [check]
+        </span></p></td>
+<td>
+<p>Get network connectivity state. The optional <code class="option">check</code>
+          argument tells NetworkManager to re-check the connectivity, else the most
+          recent known connectivity state is displayed without re-checking.</p>
+<p>Possible states are:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"> none </span></p></td>
+<td><p>the host is not connected to any network.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"> portal </span></p></td>
+<td><p>the host is behind a captive portal and cannot reach the full Internet.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"> limited </span></p></td>
+<td><p>the host is connected to a network, but it has no access to the Internet.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"> full </span></p></td>
+<td><p>the host is connected to a network and has full access to the Internet.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"> unknown </span></p></td>
+<td><p>the connectivity status cannot be found out.</p></td>
+</tr>
+</tbody>
+</table></div>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="radio"></a><h2>Radio Transmission Control Commands</h2>
+<div class="cmdsynopsis"><p><code class="command">nmcli radio</code>  { <span class="command"><strong>all</strong></span>  |   <span class="command"><strong>wifi</strong></span>  |   <span class="command"><strong>wwan</strong></span> } [<em class="replaceable"><code>ARGUMENTS</code></em>...]</p></div>
+<p>Show radio switches status, or enable and disable the switches.</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>wifi</strong></span>
+           [ on  |   off ]
+        </span></p></td>
+<td><p>Show or set status of Wi-Fi in NetworkManager. If no arguments are
+          supplied, Wi-Fi status is printed; <code class="option">on</code> enables Wi-Fi;
+          <code class="option">off</code> disables Wi-Fi.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>wwan</strong></span>
+           [ on  |   off ]
+        </span></p></td>
+<td><p>Show or set status of WWAN (mobile broadband) in NetworkManager. If no
+          arguments are supplied, mobile broadband status is printed;
+          <code class="option">on</code> enables mobile broadband, <code class="option">off</code>
+          disables it.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>all</strong></span>
+           [ on  |   off ]
+        </span></p></td>
+<td><p>Show or set all previously mentioned radio switches at the same time.</p></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="monitor"></a><h2>Activity Monitor</h2>
+<div class="cmdsynopsis"><p><code class="command">nmcli monitor</code> </p></div>
+<p>Observe NetworkManager activity. Watches for changes
+    in connectivity state, devices or connection profiles.</p>
+<p>See also <span class="command"><strong>nmcli connection monitor</strong></span>
+    and <span class="command"><strong>nmcli device monitor</strong></span> to watch
+    for changes in certain devices or connections.</p>
+</div>
+<div class="refsect1">
+<a name="connection"></a><h2>Connection Management Commands</h2>
+<div class="cmdsynopsis"><p><code class="command">nmcli connection</code>  { <span class="command"><strong>show</strong></span>  |   <span class="command"><strong>up</strong></span>  |   <span class="command"><strong>down</strong></span>  |   <span class="command"><strong>add</strong></span>  |   <span class="command"><strong>edit</strong></span>  |   <span class="command"><strong>modify</strong></span>  |   <span class="command"><strong>delete</strong></span>  |   <span class="command"><strong>monitor</strong></span>  |   <span class="command"><strong>reload</strong></span>  |   <span class="command"><strong>load</strong></span> } [<em class="replaceable"><code>ARGUMENTS</code></em>...]</p></div>
+<p>NetworkManager stores all network configuration as "connections",
+    which are collections of data (Layer2 details, IP addressing, etc.) that
+    describe how to create or connect to a network. A connection is "active"
+    when a device uses that connection's configuration to create or connect to
+    a network. There may be multiple connections that apply to a device, but only
+    one of them can be active on that device at any given time. The additional
+    connections can be used to allow quick switching between different networks
+    and configurations.</p>
+<p>Consider a machine which is usually connected to a DHCP-enabled network,
+    but sometimes connected to a testing network which uses static IP addressing.
+    Instead of manually reconfiguring eth0 each time the network is changed, the
+    settings can be saved as two connections which both apply to eth0, one for DHCP
+    (called <code class="literal">default</code>) and one with the static addressing details (called
+    <code class="literal">testing</code>). When connected to the DHCP-enabled network the user would run
+    <span class="command"><strong>nmcli con up default</strong></span> , and when connected to the static network the user
+    would run <span class="command"><strong>nmcli con up testing</strong></span>.</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>show</strong></span>
+           [<code class="option">--active</code>]
+           [
+             <code class="option">--order</code>
+               [+-]<em class="replaceable"><code>category</code></em>:... 
+          ]
+        </span></p></td>
+<td>
+<p>List in-memory and on-disk connection profiles, some of which may also be
+          active if a device is using that connection profile. Without a parameter, all
+          profiles are listed. When <code class="option">--active</code> option is specified, only
+          the active profiles are shown.</p>
+<p>The <code class="option">--order</code> option can be used to get custom
+          ordering of connections. The connections can be ordered by active status
+          (<code class="literal">active</code>), name (<code class="literal">name</code>), type
+          (<code class="literal">type</code>) or D-Bus path (<code class="literal">path</code>). If
+          connections are equal according to a sort order category, an additional
+          category can be specified. The default sorting order is equivalent to
+          <code class="literal">--order active:name:path</code>. <code class="literal">+</code> or no
+          prefix means sorting in ascending order (alphabetically or in numbers),
+          <code class="literal">-</code> means reverse (descending) order. The category names
+          can be abbreviated (e.g. <code class="literal">--order -a:na</code>).</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>show</strong></span>
+           [<code class="option">--active</code>]
+           [ <code class="option">id</code>  |   <code class="option">uuid</code>  |   <code class="option">path</code>  |   <code class="option">apath</code> ]
+            <em class="replaceable"><code>ID</code></em>... 
+        </span></p></td>
+<td>
+<p>Show details for specified connections. By default, both static
+          configuration and active connection data are displayed. When
+          <code class="option">--active</code> option is specified, only the active profiles are
+          taken into account. Use global <code class="option">--show-secrets</code> option to
+          display secrets associated with the profile.</p>
+<p><code class="option">id</code>, <code class="option">uuid</code>,
+          <code class="option">path</code> and <code class="option">apath</code> keywords can be used
+          if <em class="replaceable"><code>ID</code></em> is ambiguous.  Optional
+          <em class="replaceable"><code>ID</code></em>-specifying keywords are:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">id</code></span></p></td>
+<td><p>the <em class="replaceable"><code>ID</code></em> denotes a connection name.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">uuid</code></span></p></td>
+<td><p>the <em class="replaceable"><code>ID</code></em> denotes a connection UUID.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">path</code></span></p></td>
+<td><p>the <em class="replaceable"><code>ID</code></em> denotes a D-Bus
+                static connection path in the format of
+                /org/freedesktop/NetworkManager/Settings/<em class="replaceable"><code>num</code></em>
+                or just <em class="replaceable"><code>num</code></em>.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">apath</code></span></p></td>
+<td><p>the <em class="replaceable"><code>ID</code></em> denotes a D-Bus active connection path in the format of
+                /org/freedesktop/NetworkManager/ActiveConnection/<em class="replaceable"><code>num</code></em> or just
+                <em class="replaceable"><code>num</code></em>.</p></td>
+</tr>
+</tbody>
+</table></div>
+<p>It is possible to filter the output using the global
+          <code class="option">--fields</code> option. Use the following values:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">profile</code></span></p></td>
+<td><p>only shows static profile configuration.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">active</code></span></p></td>
+<td><p>only shows active connection data (when the profile is active).</p></td>
+</tr>
+</tbody>
+</table></div>
+<p>You can also specify particular fields. For static configuration, use
+          setting and property names as described in
+          <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span> manual page. For active data use GENERAL, IP4, DHCP4, IP6,
+          DHCP6, VPN.</p>
+<p>When no command is given to the <span class="command"><strong>nmcli connection</strong></span>,
+          the default action is <span class="command"><strong>nmcli connection show</strong></span>.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>up</strong></span>
+           [ <code class="option">id</code>  |   <code class="option">uuid</code>  |   <code class="option">path</code> ]
+            <em class="replaceable"><code>ID</code></em>... 
+           [<code class="option">ifname</code> <em class="replaceable"><code>ifname</code></em>]
+           [<code class="option">ap</code> <em class="replaceable"><code>BSSID</code></em>]
+           [<code class="option">passwd-file</code> <em class="replaceable"><code>file</code></em>]
+        </span></p></td>
+<td>
+<p>Activate a connection. The connection is identified by its name, UUID or
+          D-Bus path. If <em class="replaceable"><code>ID</code></em> is ambiguous, a keyword <code class="option">id</code>,
+          <code class="option">uuid</code> or <code class="option">path</code> can be used. When
+          requiring a particular device to activate the connection on, the
+          <code class="option">ifname</code> option with interface name should be given. If the
+          <em class="replaceable"><code>ID</code></em> is not given an <code class="option">ifname</code> is required, and
+          NetworkManager will activate the best available connection for the given
+          <code class="option">ifname</code>. In case of a VPN connection, the
+          <code class="option">ifname</code> option specifies the device of the base connection.
+          The <code class="option">ap</code> option specify what particular AP should be used in
+          case of a Wi-Fi connection.</p>
+<p>If <code class="option">--wait</code> option is not specified, the default timeout will be 90
+          seconds.</p>
+<p>See <span class="command"><strong>connection show</strong></span> above for the description of the
+          <em class="replaceable"><code>ID</code></em>-specifying keywords.</p>
+<p>Available options are:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">ifname</code></span></p></td>
+<td><p>interface that will be used for activation.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">ap</code></span></p></td>
+<td><p>BSSID of the AP which the command should connect to (for Wi-Fi connections).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">passwd-file</code></span></p></td>
+<td>
+<p>some networks may require credentials during activation. You can give
+                these credentials using this option. Each line of the file should contain one
+                password in the form:
+
+                </p>
+<pre class="programlisting">setting_name.property_name:the password</pre>
+<p>
+
+                For example, for WPA Wi-Fi with PSK, the line would be
+
+                </p>
+<pre class="programlisting">802-11-wireless-security.psk:secret12345</pre>
+<p>
+
+                For 802.1X password, the line would be
+
+                </p>
+<pre class="programlisting">802-1x.password:my 1X password</pre>
+<p>
+
+                <span class="command"><strong>nmcli</strong></span> also accepts <code class="literal">wifi-sec</code> and <code class="literal">wifi</code> strings instead of
+                <code class="literal">802-11-wireless-security</code>. When NetworkManager requires a password and it is
+                not given, <span class="command"><strong>nmcli</strong></span> will ask for it when run with <code class="option">--ask</code>.
+                If <code class="option">--ask</code> was not passed, NetworkManager can ask another secret
+                agent that may be running (typically a GUI secret agent, such as nm-applet or
+                gnome-shell).</p>
+</td>
+</tr>
+</tbody>
+</table></div>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>down</strong></span>
+           [ <code class="option">id</code>  |   <code class="option">uuid</code>  |   <code class="option">path</code>  |   <code class="option">apath</code> ]
+            <em class="replaceable"><code>ID</code></em>... 
+        </span></p></td>
+<td>
+<p>Deactivate a connection from a device without preventing the device from
+          further auto-activation. Multiple connections can be passed to the
+          command.</p>
+<p>Be aware that this command deactivates the specified active connection,
+          but the device on which the connection was active, is still ready to connect
+          and will perform auto-activation by looking for a suitable connection that has
+          the 'autoconnect' flag set. This includes the just deactivated connection. So
+          if the connection is set to auto-connect, it will be automatically started on
+          the disconnected device again.</p>
+<p>In most cases you may want to use <span class="command"><strong>device disconnect</strong></span>
+          command instead.</p>
+<p>The connection is identified by its name, UUID or D-Bus path. If
+          <em class="replaceable"><code>ID</code></em> is ambiguous, a keyword <code class="option">id</code>,
+          <code class="option">uuid</code>, <code class="option">path</code> or
+          <code class="option">apath</code> can be used.</p>
+<p> See <span class="command"><strong>connection show</strong></span> above for the description of
+          the <em class="replaceable"><code>ID</code></em>-specifying keywords.</p>
+<p>If <code class="option">--wait</code> option is not specified, the default timeout
+          will be 10 seconds.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>add</strong></span>
+            <code class="option">ifname</code> <em class="replaceable"><code>ifname</code></em> 
+           [con-name <em class="replaceable"><code>name</code></em>]
+           [
+            <code class="option">autoconnect</code>
+             { yes  |   no }
+          ]
+           [
+            <code class="option">save</code>
+             { yes  |   no }
+          ]
+           [master <em class="replaceable"><code>master</code></em>]
+           [slave-type <em class="replaceable"><code>type</code></em>]
+           [type <em class="replaceable"><code>type</code></em>]
+           [<em class="replaceable"><code>ARGUMENTS</code></em>...]
+           [ip4 <em class="replaceable"><code>addr</code></em>]
+           [gw4 <em class="replaceable"><code>addr</code></em>]
+           [ip6 <em class="replaceable"><code>addr</code></em>]
+           [gw6 <em class="replaceable"><code>addr</code></em>]
+           [
+            <code class="option">--</code>
+              
+              [+|-]<em class="replaceable"><code>setting</code></em>.<em class="replaceable"><code>property</code></em>
+              <em class="replaceable"><code>value</code></em>
+            ... 
+          ]
+        </span></p></td>
+<td>
+<p>Add a connection for NetworkManager. Arguments differ according to connection types, see below.</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">ifname</code></span></p></td>
+<td><p>interface to bind the connection to. The connection will only be
+                applicable to this interface name. A special value of <code class="literal">*</code>
+                can be used for interface-independent connections. The
+                <code class="option">ifname</code> argument is mandatory for all connection types
+                except bond, team, bridge and vlan. Note: use quotes around
+                <code class="literal">*</code> to suppress shell expansion.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">con-name</code></span></p></td>
+<td><p>connection name (when not provided a default name is generated:
+                &lt;type&gt;[-&lt;ifname&gt;][-&lt;num&gt;]).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">autoconnect</code></span></p></td>
+<td><p>whether the connection profile can be automatically activated (default:
+                yes).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">save</code></span></p></td>
+<td><p>whether the connection should be persistent, i.e. NetworkManager should
+                store it on disk (default: <code class="literal">yes</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">master</code></span></p></td>
+<td><p>master interface name, or connection UUID or ID of master connection
+                profile. The value can be prefixed with <code class="literal">ifname/</code>,
+                <code class="literal">uuid/</code> or <code class="literal">id/</code> to disambiguate it.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">slave-type</code></span></p></td>
+<td><p>type of master connection. Only required when it can not be inferred
+                (i.e. the master connection does
+                not exist yet).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">type</code></span></p></td>
+<td><p>connection type; see below for allowed values. Note that types
+                <code class="option">bond-slave</code>, <code class="option">team-slave</code> and
+                <code class="option">bridge-slave</code> create <code class="option">ethernet</code> connection
+                profiles. Their use is discouraged in favor of using a specific type with
+                <code class="option">master</code> option.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type ethernet</code>
+                 [<code class="option">mac</code> <em class="replaceable"><code>addr</code></em>]
+                 [<code class="option">cloned-mac</code> <em class="replaceable"><code>addr</code></em>]
+                 [<code class="option">mtu</code> <em class="replaceable"><code>mtu</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">mac</code></span></p></td>
+<td><p>MAC address of the device this connection is locked to.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">cloned-mac</code></span></p></td>
+<td><p>cloned MAC.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">mtu</code></span></p></td>
+<td><p>MTU.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type wifi</code>
+                  <code class="option">ssid</code> <em class="replaceable"><code>SSID</code></em> 
+                 [<code class="option">mac</code> <em class="replaceable"><code>addr</code></em>]
+                 [<code class="option">cloned-mac</code> <em class="replaceable"><code>addr</code></em>]
+                 [
+                  <code class="option">mode</code>
+                   { infrastructure  |   ap  |   adhoc }
+                ]
+                 [<code class="option">mtu</code> <em class="replaceable"><code>mtu</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">ssid</code></span></p></td>
+<td><p>SSID.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">mac</code></span></p></td>
+<td><p>MAC address of the device this connection is locked to.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">cloned-mac</code></span></p></td>
+<td><p>cloned MAC.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">mode</code></span></p></td>
+<td><p>Wi-Fi network mode. If blank, <code class="literal">infrastructure</code>
+                      is assumed.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">mtu</code></span></p></td>
+<td><p>MTU.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type wimax</code>
+                 [<code class="option">mac</code> <em class="replaceable"><code>addr</code></em>]
+                 [<code class="option">nsp</code> <em class="replaceable"><code>nsp</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">mac</code></span></p></td>
+<td><p>MAC address of the device this connection is locked to.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">nsp</code></span></p></td>
+<td><p>Network Service Provider name.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type pppoe</code>
+                  <code class="option">username</code> <em class="replaceable"><code>user</code></em> 
+                 [<code class="option">password</code> <em class="replaceable"><code>passwd</code></em>]
+                 [<code class="option">service</code> <em class="replaceable"><code>name</code></em>]
+                 [<code class="option">mtu</code> <em class="replaceable"><code>mtu</code></em>]
+                 [<code class="option">mac</code> <em class="replaceable"><code>addr</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">username</code></span></p></td>
+<td><p>PPPoE username.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">password</code></span></p></td>
+<td><p>Password for the PPPoE username.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">service</code></span></p></td>
+<td><p>PPPoE service name (if required by concentrator).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">mtu</code></span></p></td>
+<td><p>MTU.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">mac</code></span></p></td>
+<td><p>MAC address of the device this connection is locked to.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type gsm</code>
+                 [<code class="option">apn</code> <em class="replaceable"><code>APN</code></em>]
+                 [<code class="option">username</code> <em class="replaceable"><code>user</code></em>]
+                 [<code class="option">password</code> <em class="replaceable"><code>passwd</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">apn</code></span></p></td>
+<td><p>APN - GSM Access Point Name.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">user</code></span></p></td>
+<td><p>user name.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">password</code></span></p></td>
+<td><p>password.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type cdma</code>
+                 [<code class="option">username</code> <em class="replaceable"><code>user</code></em>]
+                 [<code class="option">password</code> <em class="replaceable"><code>passwd</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">user</code></span></p></td>
+<td><p>user name.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">password</code></span></p></td>
+<td><p>password.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type infiniband</code>
+                 [<code class="option">mac</code> <em class="replaceable"><code>addr</code></em>]
+                 [<code class="option">mtu</code> <em class="replaceable"><code>mtu</code></em>]
+                 [
+                  <code class="option">transport-mode</code>
+                   { datagram  |   connected }
+                ]
+                 [<code class="option">parent</code> <em class="replaceable"><code>device</code></em>]
+                 [<code class="option">p-key</code> <em class="replaceable"><code>key</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">mac</code></span></p></td>
+<td><p>MAC address of the device this connection is locked to
+                      (InfiniBand MAC is 20 bytes).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">mtu</code></span></p></td>
+<td><p>MTU.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">transport-mode</code></span></p></td>
+<td><p>InfiniBand transport mode.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">parent</code></span></p></td>
+<td><p>the interface name of the parent device (if any).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">p-key</code></span></p></td>
+<td><p>the InfiniBand P_Key (16-bit unsigned integer).</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type bluetooth</code>
+                 [<code class="option">addr</code> <em class="replaceable"><code>addr</code></em>]
+                 [
+                  <code class="option">bt-type</code>
+                   { panu  |   dun-gsm  |   dun-cdma }
+                ]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">addr</code></span></p></td>
+<td><p>Bluetooth device address (MAC).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">bt-type</code></span></p></td>
+<td><p>Bluetooth connection type.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type vlan</code>
+                  <code class="option">dev</code> <em class="replaceable"><code>device</code></em> 
+                  <code class="option">id</code> <em class="replaceable"><code>id</code></em> 
+                 [<code class="option">flags</code> <em class="replaceable"><code>flags</code></em>]
+                 [<code class="option">ingress</code> <em class="replaceable"><code>mapping</code></em>]
+                 [<code class="option">egress</code> <em class="replaceable"><code>mapping</code></em>]
+                 [<code class="option">mtu</code> <em class="replaceable"><code>mtu</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">dev</code></span></p></td>
+<td><p>parent device this VLAN is on.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">id</code></span></p></td>
+<td><p>VLAN ID in range 0-4095.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">flags</code></span></p></td>
+<td><p>flags.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">ingress</code></span></p></td>
+<td><p>VLAN ingress priority mapping.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">egress</code></span></p></td>
+<td><p>VLAN egress priority mapping.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">mtu</code></span></p></td>
+<td><p>MTU.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type bond</code>
+                 [
+                  <code class="option">mode</code>
+                   { active-backup  |   balance-xor  |   broadcast  |   802.3ad  |   balance-tlb  |   balance-alb  |   <em class="replaceable"><code>num</code></em> }
+                ]
+                 [<code class="option">primary</code> <em class="replaceable"><code>ifname</code></em>]
+                 [<code class="option">miimon</code> <em class="replaceable"><code>num</code></em>]
+                 [<code class="option">downdelay</code> <em class="replaceable"><code>num</code></em>]
+                 [<code class="option">updelay</code> <em class="replaceable"><code>num</code></em>]
+                 [<code class="option">arp-interval</code> <em class="replaceable"><code>num</code></em>]
+                 [<code class="option">arp-ip-target</code> <em class="replaceable"><code>num</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">mode</code></span></p></td>
+<td><p>bonding mode (default: <code class="literal">balance-rr</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">primary</code></span></p></td>
+<td><p>primary interface name (for <code class="literal">active-backup</code> mode).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">miimon</code></span></p></td>
+<td><p>miimon (default: <code class="literal">100</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">downdelay</code></span></p></td>
+<td><p>downdelay (default: <code class="literal">0</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">updelay</code></span></p></td>
+<td><p>updelay (default: <code class="literal">0</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">arp-interval</code></span></p></td>
+<td><p>ARP interval (default: <code class="literal">0</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">arp-ip-target</code></span></p></td>
+<td><p>ARP IP target.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type bond-slave</code>
+                 [<code class="option">master</code> <em class="replaceable"><code>master</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody><tr>
+<td><p><span class="term"><code class="option">master</code></span></p></td>
+<td><p>master bond interface name, or connection UUID or
+                      ID of bond master connection profile. The value can be
+                      prefixed with <code class="literal">ifname/</code>,
+                      <code class="literal">uuid/</code> or <code class="literal">id/</code> to
+                      disambiguate it.</p></td>
+</tr></tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type team</code>
+                 [
+                  <code class="option">config</code>
+                   { file  |   <em class="replaceable"><code>JSON</code></em> }
+                ]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody><tr>
+<td><p><span class="term"><code class="option">config</code></span></p></td>
+<td><p>JSON configuration for team.</p></td>
+</tr></tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type team-slave</code>
+                 [
+                  <code class="option">config</code>
+                  <code class="option"><em class="replaceable"><code>JSON</code></em></code>
+                ]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">master</code></span></p></td>
+<td><p>master team interface name, or connection UUID or
+                      ID of team master connection profile. The value can be
+                      prefixed with <code class="literal">ifname/</code>,
+                      <code class="literal">uuid/</code> or <code class="literal">id/</code>to
+                      disambiguate it.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">config</code></span></p></td>
+<td><p>JSON configuration for team.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type bridge</code>
+                 [
+                  <code class="option">stp</code>
+                   { yes  |   no }
+                ]
+                 [<code class="option">priority</code> <em class="replaceable"><code>num</code></em>]
+                 [<code class="option">forward-delay</code> <em class="replaceable"><code>2-30</code></em>]
+                 [<code class="option">hello-time</code> <em class="replaceable"><code>1-10</code></em>]
+                 [<code class="option">max-age</code> <em class="replaceable"><code>6-42</code></em>]
+                 [<code class="option">ageing-time</code> <em class="replaceable"><code>0-1000000</code></em>]
+                 [
+                  <code class="option">multicast-snooping</code>
+                   { yes  |   no }
+                ]
+                 [<code class="option">mac</code> <em class="replaceable"><code>addr</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">stp</code></span></p></td>
+<td><p>controls whether Spanning Tree Protocol (STP) is enabled for this bridge
+                      (default: <code class="literal">yes</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">priority</code></span></p></td>
+<td><p>sets STP priority (default: <code class="literal">128</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">forward-delay</code></span></p></td>
+<td><p>STP forwarding delay, in seconds (default: <code class="literal">15</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">hello-time</code></span></p></td>
+<td><p>STP hello time, in seconds (default: <code class="literal">2</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">max-age</code></span></p></td>
+<td><p>STP maximum message age, in seconds (default: <code class="literal">20</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">ageing-time</code></span></p></td>
+<td><p>the Ethernet MAC address aging time, in seconds (default: <code class="literal">300</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">multicast-snooping</code></span></p></td>
+<td><p>controls whether IGMP snooping is enabled (default: <code class="literal">yes</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">mac</code></span></p></td>
+<td><p>MAC address of the bridge (note: this requires a recent kernel feature,
+                      originally introduced in 3.15 upstream kernel).</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type bridge-slave</code>
+                 [<code class="option">master</code> <em class="replaceable"><code>master</code></em>]
+                 [<code class="option">priority</code> <em class="replaceable"><code>num</code></em>]
+                 [<code class="option">path-cost</code> <em class="replaceable"><code>1-65535</code></em>]
+                 [
+                  <code class="option">hairpin</code>
+                   { yes  |   no }
+                ]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">master</code></span></p></td>
+<td><p>master bridge interface name, or connection UUID
+                      or ID of bridge master connection profile. The value
+                      can be prefixed with <code class="literal">ifname/</code>,
+                      <code class="literal">uuid/</code> or <code class="literal">id/</code>
+                      to disambiguate it.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">priority</code></span></p></td>
+<td><p>STP priority of this slave (default: <code class="literal">32</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">path-cost</code></span></p></td>
+<td><p>STP port cost for destinations via this slave (default: <code class="literal">100</code>).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">hairpin</code></span></p></td>
+<td><p>'hairpin mode' for the slave, which allows frames to be sent back out
+                       through the slave the frame was received on (default: <code class="literal">yes</code>).</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type vpn</code>
+                 [<code class="option">type</code> <em class="replaceable"><code>type</code></em>]
+                 [<code class="option">user</code> <em class="replaceable"><code>username</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">vpn-type</code></span></p></td>
+<td><p>VPN type.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">user</code></span></p></td>
+<td><p>VPN username.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type olpc-mesh</code>
+                  <code class="option">ssid</code> <em class="replaceable"><code>SSID</code></em> 
+                 [<code class="option">channel</code> <em class="replaceable"><code>1-13</code></em>]
+                 [<code class="option">dhcp-anycast</code> <em class="replaceable"><code>MAC</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">ssid</code></span></p></td>
+<td><p>SSID.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">channel</code></span></p></td>
+<td><p>channel to use for the network.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">dhcp-anycast</code></span></p></td>
+<td><p>anycast DHCP MAC address used when requesting an IP address via DHCP.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type adsl</code>
+                  <code class="option">username</code> <em class="replaceable"><code>username</code></em> 
+                  
+                  <code class="option">protocol</code>
+                   { pppoa  |   pppoe  |   ipoatm }
+                 
+                 [<code class="option">password</code> <em class="replaceable"><code>passwd</code></em>]
+                 [
+                  <code class="option">encapsulation</code>
+                   { vcmux  |   llc }
+                ]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">username</code></span></p></td>
+<td><p>ADSL user name.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">protocol</code></span></p></td>
+<td><p>ADSL protocol.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">password</code></span></p></td>
+<td><p>ADSL password.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">encapsulation</code></span></p></td>
+<td><p>ADSL encapsulation.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type tun</code>
+                  
+                  <code class="option">mode</code>
+                   { tun  |   tap }
+                 
+                 [<code class="option">owner</code> <em class="replaceable"><code>UID</code></em>]
+                 [<code class="option">group</code> <em class="replaceable"><code>GID</code></em>]
+                 [
+                  <code class="option">pi</code>
+                   { yes  |   no }
+                ]
+                 [
+                  <code class="option">vnet-hdr</code>
+                   { yes  |   no }
+                ]
+                 [
+                  <code class="option">multi-queue</code>
+                   { yes  |   no }
+                ]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">mode</code></span></p></td>
+<td><p>Mode for the device.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">owner</code></span></p></td>
+<td><p>UID of the owner.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">group</code></span></p></td>
+<td><p>GID of the group.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">pi</code></span></p></td>
+<td><p>include packet information (~IFF_NO_PI flag).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">vnet-hdr</code></span></p></td>
+<td><p>send and receive large (i.e. GSO) packets and packets with partial
+                      checksums (IFF_VNET_HDR flag).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">multi-queue</code></span></p></td>
+<td><p>multi-queue support for tun/tap device (IFF_MULTI_QUEUE flag).</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type ip-tunnel</code>
+                  
+                  <code class="option">mode</code>
+                   { ipip  |   gre  |   sit  |   isatap  |   vti  |   ip6ip6  |   ipip6  |   ip6gre  |   vti6  |   tun }
+                 
+                  <code class="option">remote</code> <em class="replaceable"><code>addr</code></em> 
+                 [<code class="option">local</code> <em class="replaceable"><code>addr</code></em>]
+                 [<code class="option">dev</code> <em class="replaceable"><code>device</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">mode</code></span></p></td>
+<td><p>tunnel mode.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">remote</code></span></p></td>
+<td><p>IPv4 or IPv6 address of the remote tunnel endpoint.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">local</code></span></p></td>
+<td><p>IPv4 or IPv6 address of the local tunnel endpoint.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">dev</code></span></p></td>
+<td><p>device to use for tunnel endpoint communication.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type macvlan</code>
+                  <code class="option">dev</code> <em class="replaceable"><code>device</code></em> 
+                  
+                  <code class="option">mode</code>
+                   { vepa  |   bridge  |   private  |   passthru  |   source }
+                 
+                 [
+                  <code class="option">tap</code>
+                   { yes  |   no }
+                ]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">dev</code></span></p></td>
+<td><p>parent device this MACVLAN is on.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">mode</code></span></p></td>
+<td><p>MACVLAN mode, which specifies the communication mechanism between
+                      multiple MACVLANs on the same lower device.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">tap</code></span></p></td>
+<td><p>controls the device type. If set to 'yes' a MACVTAP will be created
+                      (default: <code class="literal">no</code>).</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term">
+                <code class="option">type vxlan</code>
+                  <code class="option">id</code> <em class="replaceable"><code>id</code></em> 
+                  <code class="option">remote</code> <em class="replaceable"><code>addr</code></em> 
+                 [<code class="option">dev</code> <em class="replaceable"><code>parent device (ifname or connection UUID)</code></em>]
+                 [<code class="option">local</code> <em class="replaceable"><code>addr</code></em>]
+                 [<code class="option">source-port-min</code> <em class="replaceable"><code>0-65535</code></em>]
+                 [<code class="option">source-port-max</code> <em class="replaceable"><code>0-65535</code></em>]
+                 [<code class="option">destination-port</code> <em class="replaceable"><code>0-65535</code></em>]
+              </span></p></td>
+<td><div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">id</code></span></p></td>
+<td><p>VXLAN Network Identifer to use.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">remote</code></span></p></td>
+<td><p>unicast destination IP address or multicast IP address to join.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">dev</code></span></p></td>
+<td><p>device to use for tunnel endpoint communication.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">local</code></span></p></td>
+<td><p>source IP address.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">source-port-min</code></span></p></td>
+<td><p>minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">source-port-max</code></span></p></td>
+<td><p>maximum UDP source port to communicate to the remote VXLAN tunnel endpoint.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">destination-port</code></span></p></td>
+<td><p>UDP destination port to communicate to the remote VXLAN tunnel endpoint.</p></td>
+</tr>
+</tbody>
+</table></div></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">ip4</code>, </span><span class="term"><code class="option">gw4</code></span></p></td>
+<td><p>IPv4 addresses.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">ip6</code>, </span><span class="term"><code class="option">gw6</code></span></p></td>
+<td><p>IPv6 addresses.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--</code></span></p></td>
+<td><p>If a <code class="option">--</code> argument is encountered, the rest of command
+                line is interpreted as property list in the same format as <span class="command"><strong>connection
+                modify</strong></span> command accepts.  This makes it possible to adjust the
+                connection properties before it's added.</p></td>
+</tr>
+</tbody>
+</table></div>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>edit</strong></span>
+           { 
+              [ <code class="option">id</code>  |   <code class="option">uuid</code>  |   <code class="option">path</code> ]
+                <em class="replaceable"><code>ID</code></em>... 
+              |   
+              [<code class="option">type</code> <em class="replaceable"><code>type</code></em>]
+               [<code class="option">con-name</code> <em class="replaceable"><code>name</code></em>]
+             }
+        </span></p></td>
+<td>
+<p>Edit an existing connection or add a new one, using an interactive editor.</p>
+<p>The existing connection is identified by its name, UUID or D-Bus path. If
+          <em class="replaceable"><code>ID</code></em> is ambiguous, a keyword <code class="option">id</code>,
+          <code class="option">uuid</code>, or <code class="option">path</code> can be used. See
+          <span class="command"><strong>connection show</strong></span> above for the description of the
+          <em class="replaceable"><code>ID</code></em>-specifying keywords. Not providing an
+          <em class="replaceable"><code>ID</code></em> means that a new connection will be added.</p>
+<p>The interactive editor will guide you through the connection editing and
+          allow you to change connection parameters according to your needs by means of
+          a simple menu-driven interface. The editor indicates what settings and
+          properties can be modified and provides in-line help.</p>
+<p>Available options:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">type</code></span></p></td>
+<td><p>type of the new connection; valid types are the same as for
+                  <span class="command"><strong>connection add</strong></span> command.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">con-name</code></span></p></td>
+<td><p>name for the new connection. It can be changed later in the editor.</p></td>
+</tr>
+</tbody>
+</table></div>
+<p>See also
+          <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span> for all NetworkManager settings and property names, and their
+          descriptions; and
+          <span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(7)</span>
+          for sample editor sessions.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>modify</strong></span>
+           [<code class="option">--temporary</code>]
+           [ <code class="option">id</code>  |   <code class="option">uuid</code>  |   <code class="option">path</code> ]
+            <em class="replaceable"><code>ID</code></em> 
+            
+            [+|-]<em class="replaceable"><code>setting</code></em>.<em class="replaceable"><code>property</code></em>
+            <em class="replaceable"><code>value</code></em>
+          ... 
+        </span></p></td>
+<td>
+<p>Modify one or more properties in the connection profile.</p>
+<p>The connection is identified by its name, UUID or D-Bus path. If
+          <em class="replaceable"><code>ID</code></em> is ambiguous, a keyword <code class="option">id</code>,
+          <code class="option">uuid</code> or <code class="option">path</code> can be used. See
+          <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span> for setting and property names, their descriptions and default
+          values. This command supports abbreviations for <em class="replaceable"><code>setting</code></em>
+          and <em class="replaceable"><code>property</code></em> provided they are unique. Empty
+          <em class="replaceable"><code>value</code></em> ("") removes the property value (sets
+          the property to the default value). The provided value overwrites the existing
+          property value.</p>
+<p>If you want to append an item to the existing value, use
+          <code class="literal">+</code> prefix for the property name. If you want to remove just
+          one item from container-type property, use <code class="literal">-</code> prefix for
+          the property name and specify a value or an zero-based index of the item to
+          remove (or option name for properties with named options) as
+          <em class="replaceable"><code>value</code></em>. Of course, <code class="literal">+</code> and
+          <code class="literal">-</code> only have a real effect for multi-value (container)
+          properties like <code class="literal">ipv4.dns</code>, <code class="literal">ipv4.addresses</code>,
+          <code class="literal">bond.options</code>, etc.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>clone</strong></span>
+           [<code class="option">--temporary</code>]
+           [ <code class="option">id</code>  |   <code class="option">uuid</code>  |   <code class="option">path</code> ]
+            <em class="replaceable"><code>ID</code></em>... 
+            <code class="option">new</code> <em class="replaceable"><code>name</code></em> 
+        </span></p></td>
+<td>
+<p>Clone a connection. The connection to be cloned is identified by its
+          name, UUID or D-Bus path. If <em class="replaceable"><code>ID</code></em> is ambiguous, a keyword
+          <code class="option">id</code>, <code class="option">uuid</code> or <code class="option">path</code>
+          can be used. See <span class="command"><strong>connection show</strong></span> above for the description
+          of the <em class="replaceable"><code>ID</code></em>-specifying keywords. <em class="replaceable"><code>name</code></em> is
+          the name of the new cloned connection. The new connection will be the exact
+          copy except the connection.id (<em class="replaceable"><code>name</code></em>) and
+          connection.uuid (generated) properties.</p>
+<p>The new connection profile will be saved as persistent unless
+          <code class="option">--temporary</code> option is specified, in which case the new profile
+          won't exist after NetworkManager restart.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>delete</strong></span>
+           [ <code class="option">id</code>  |   <code class="option">uuid</code>  |   <code class="option">path</code> ]
+            <em class="replaceable"><code>ID</code></em>... 
+        </span></p></td>
+<td>
+<p>Delete a configured connection. The connection to be deleted is
+          identified by its name, UUID or D-Bus path. If <em class="replaceable"><code>ID</code></em> is ambiguous, a
+          keyword <code class="option">id</code>, <code class="option">uuid</code> or <code class="option">path</code> can be used.
+          See <span class="command"><strong>connection show</strong></span> above for the description of
+          the <em class="replaceable"><code>ID</code></em>-specifying keywords.</p>
+<p>If <code class="option">--wait</code> option is not specified, the default timeout will be 10
+          seconds.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>monitor</strong></span>
+           [ <code class="option">id</code>  |   <code class="option">uuid</code>  |   <code class="option">path</code> ]
+            <em class="replaceable"><code>ID</code></em>... 
+        </span></p></td>
+<td>
+<p>Monitor connection profile activity. This command prints a line whenever
+          the specified connection changes. The connection to be monitored is identified
+          by its name, UUID or D-Bus path. If <em class="replaceable"><code>ID</code></em> is ambiguous, a keyword
+          <code class="option">id</code>, <code class="option">uuid</code> or <code class="option">path</code>
+          can be used. See <span class="command"><strong>connection show</strong></span> above for the description of the
+          <em class="replaceable"><code>ID</code></em>-specifying keywords.</p>
+<p>Monitors all connection profiles in case none is specified. The command
+          terminates when all monitored connections disappear. If you want to monitor
+          connection creation consider using the global monitor with <span class="command"><strong>nmcli
+          monitor</strong></span> command.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>reload</strong></span>
+        </span></p></td>
+<td><p>Reload all connection files from disk.
+          NetworkManager does not monitor changes to connection
+          files by default. So you need to use this command in order to tell
+          NetworkManager to re-read the connection profiles from
+          disk when a change was made to them. However, the auto-loading feature can be
+          enabled and then NetworkManager will reload connection
+          files any time they change (monitor-connection-files=true in
+          <span class="citerefentry"><span class="refentrytitle">NetworkManager.conf</span>(5)</span>).
+          </p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>load</strong></span>
+            <em class="replaceable"><code>filename</code></em>... 
+        </span></p></td>
+<td><p>Load/reload one or more connection files from disk. Use this after
+          manually editing a connection file to ensure that
+          NetworkManager is aware of its latest state.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>import</strong></span>
+           [<code class="option">--temporary</code>]
+           [<code class="option">type</code> <em class="replaceable"><code>type</code></em>]
+           [<code class="option">file</code> <em class="replaceable"><code>file</code></em>]
+        </span></p></td>
+<td>
+<p>Import an external/foreign configuration as a NetworkManager connection
+          profile. The type of the input file is specified by <code class="option">type</code>
+          option.</p>
+<p>Only VPN configurations are supported at the moment. The configuration is
+          imported by NetworkManager VPN plugins. <code class="option">type</code> values are
+          the same as for <code class="option">vpn-type</code> option in <span class="command"><strong>nmcli
+          connection add</strong></span>. VPN configurations are imported by VPN plugins.
+          Therefore the proper VPN plugin has to be installed so that <span class="command"><strong>nmcli</strong></span> could import
+          the data.</p>
+<p>The imported connection profile will be saved as persistent unless
+          <code class="option">--temporary</code> option is specified, in which case the new profile
+          won't exist after NetworkManager restart.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>export</strong></span>
+           [ <code class="option">id</code>  |   <code class="option">uuid</code>  |   <code class="option">path</code> ]
+            <em class="replaceable"><code>ID</code></em> 
+           [<em class="replaceable"><code>file</code></em>]
+        </span></p></td>
+<td>
+<p>Export a connection.</p>
+<p>Only VPN connections are supported at the moment. A proper VPN plugin has
+          to be installed so that <span class="command"><strong>nmcli</strong></span> could export a connection. If no
+          <em class="replaceable"><code>file</code></em> is provided, the VPN configuration
+          data will be printed to standard output.</p>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="device"></a><h2>Device Management Commands</h2>
+<div class="cmdsynopsis"><p><code class="command">nmcli device</code>  { <span class="command"><strong>status</strong></span>  |   <span class="command"><strong>show</strong></span>  |   <span class="command"><strong>set</strong></span>  |   <span class="command"><strong>connect</strong></span>  |   <span class="command"><strong>reapply</strong></span>  |   <span class="command"><strong>disconnect</strong></span>  |   <span class="command"><strong>delete</strong></span>  |   <span class="command"><strong>monitor</strong></span>  |   <span class="command"><strong>wifi</strong></span>  |   <span class="command"><strong>lldp</strong></span> } [<em class="replaceable"><code>ARGUMENTS</code></em>...]</p></div>
+<p>Show and manage network interfaces.</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><span class="command"><strong>status</strong></span></span></p></td>
+<td>
+<p>Print status of devices.</p>
+<p>This is the default action if no command is specified to
+          <span class="command"><strong>nmcli device</strong></span>.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>show</strong></span>
+           [<em class="replaceable"><code>ifname</code></em>]
+        </span></p></td>
+<td><p>Show detailed information about devices. Without an argument, all
+          devices are examined. To get information for a specific device, the interface
+          name has to be provided.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>set</strong></span>
+           [ifname]
+            <em class="replaceable"><code>ifname</code></em> 
+           [
+            <code class="option">autoconnect</code>
+             { yes  |   no }
+          ]
+           [
+            <code class="option">managed</code>
+             { yes  |   no }
+          ]
+        </span></p></td>
+<td><p>Set device properties.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>connect</strong></span>
+           [<em class="replaceable"><code>ifname</code></em>]
+        </span></p></td>
+<td>
+<p>Connect the device. NetworkManager will try to find a suitable connection
+          that will be activated. It will also consider connections that are not set to
+          auto connect.</p>
+<p>If <code class="option">--wait</code> option is not specified, the default timeout will be 90
+          seconds.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>reapply</strong></span>
+           [<em class="replaceable"><code>ifname</code></em>]
+        </span></p></td>
+<td><p>Attempt to update device with changes to the currently active connection
+          made since it was last applied.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>disconnect</strong></span>
+           [<em class="replaceable"><code>ifname</code></em>...]
+        </span></p></td>
+<td>
+<p>Disconnect a device and prevent the device from automatically activating
+          further connections without user/manual intervention. Note that disconnecting
+          software devices may mean that the devices will disappear.</p>
+<p>If <code class="option">--wait</code> option is not specified, the default timeout
+          will be 10 seconds.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>delete</strong></span>
+           [<em class="replaceable"><code>ifname</code></em>...]
+        </span></p></td>
+<td>
+<p>Delete a device. The command removes the interface from the system. Note
+          that this only works for software devices like bonds, bridges, teams, etc.
+          Hardware devices (like Ethernet) cannot be deleted by the command.</p>
+<p>If <code class="option">--wait</code> option is not specified, the default timeout will be 10
+          seconds.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>monitor</strong></span>
+           [<em class="replaceable"><code>ifname</code></em>...]
+        </span></p></td>
+<td>
+<p>Monitor device activity. This command prints a line whenever the
+          specified devices change state.</p>
+<p>Monitors all devices in case no interface is specified. The monitor
+          terminates when all specified devices disappear. If you want to monitor device
+          addition consider using the global monitor with <span class="command"><strong>nmcli
+          monitor</strong></span> command.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>wifi</strong></span>
+           [
+            <span class="command"><strong>list</strong></span>
+             [<code class="option">ifname</code> <em class="replaceable"><code>ifname</code></em>]
+             [<code class="option">bssid</code> <em class="replaceable"><code>BSSID</code></em>]
+          ]
+        </span></p></td>
+<td><p>List available Wi-Fi access points. The <code class="option">ifname</code> and
+          <code class="option">bssid</code> options can be used to list APs for a particular
+          interface or with a specific BSSID, respectively.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>wifi</strong></span>
+          <span class="command"><strong>connect</strong></span>
+            <em class="replaceable"><code>(B)SSID</code></em> 
+           [<code class="option">password</code> <em class="replaceable"><code>password</code></em>]
+           [
+            <code class="option">wep-key-type</code>
+             { key  |   phrase }
+          ]
+           [<code class="option">ifname</code> <em class="replaceable"><code>ifname</code></em>]
+           [<code class="option">bssid</code> <em class="replaceable"><code>BSSID</code></em>]
+           [<code class="option">name</code> <em class="replaceable"><code>name</code></em>]
+           [
+            <code class="option">private</code>
+             { yes  |   no }
+          ]
+           [
+            <code class="option">hidden</code>
+             { yes  |   no }
+          ]
+        </span></p></td>
+<td>
+<p>Connect to a Wi-Fi network specified by SSID or BSSID. The command
+          creates a new connection and then activates it on a device. This is a
+          command-line counterpart of clicking an SSID in a GUI client. The command
+          always creates a new connection and thus it is mainly useful for connecting to
+          new Wi-Fi networks. If a connection for the network already exists, it is
+          better to bring up (activate) the existing connection as follows:
+          <span class="command"><strong>nmcli con up id <em class="replaceable"><code>name</code></em></strong></span>. Note that
+          only open, WEP and WPA-PSK networks are supported at the moment. It is also
+          supposed that IP configuration is obtained via DHCP.</p>
+<p>If <code class="option">--wait</code> option is not specified, the default timeout will be 90
+          seconds.</p>
+<p>Available options are:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">password</code></span></p></td>
+<td><p>password for secured networks (WEP or WPA).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">wep-key-type</code></span></p></td>
+<td><p>type of WEP secret, either <code class="option">key</code> for ASCII/HEX key or
+                <code class="option">phrase</code> for passphrase.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">ifname</code></span></p></td>
+<td><p>interface that will be used for activation.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">bssid</code></span></p></td>
+<td><p>if specified, the created connection will be restricted just for the
+                BSSID.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">name</code></span></p></td>
+<td><p>if specified, the connection will use the name (else NM creates a name
+                itself).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">private</code></span></p></td>
+<td><p>if set to <code class="literal">yes</code>, the connection will only be visible
+                to the user who created it. Otherwise the connection is system-wide, which is
+                the default.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">hidden</code></span></p></td>
+<td><p>set to <code class="literal">yes</code> when connecting for the first time to an
+                AP not broadcasting its SSID. Otherwise the SSID would not be found and the
+                connection attempt would fail.</p></td>
+</tr>
+</tbody>
+</table></div>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>wifi</strong></span>
+          <span class="command"><strong>hotspot</strong></span>
+           [<code class="option">ifname</code> <em class="replaceable"><code>ifname</code></em>]
+           [<code class="option">con-name</code> <em class="replaceable"><code>name</code></em>]
+           [<code class="option">ssid</code> <em class="replaceable"><code>SSID</code></em>]
+           [
+            <code class="option">band</code>
+             { a  |   bg }
+          ]
+           [<code class="option">channel</code> <em class="replaceable"><code>channel</code></em>]
+           [<code class="option">password</code> <em class="replaceable"><code>password</code></em>]
+        </span></p></td>
+<td>
+<p>Create a Wi-Fi hotspot. The command creates a hotspot connection profile
+          according to Wi-Fi device capabilities and activates it on the device. The
+          hotspot is secured with WPA if device/driver supports that, otherwise WEP is
+          used. Use <span class="command"><strong>connection down</strong></span> or <span class="command"><strong>device
+          disconnect</strong></span> to stop the hotspot.</p>
+<p>Parameters of the hotspot can be influenced by the optional
+          parameters:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">ifname</code></span></p></td>
+<td><p>what Wi-Fi device is used.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">con-name</code></span></p></td>
+<td><p>name of the created hotspot connection profile.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">ssid</code></span></p></td>
+<td><p>SSID of the hotspot.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">band</code></span></p></td>
+<td><p>Wi-Fi band to use.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">channel</code></span></p></td>
+<td><p>Wi-Fi channel to use.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">password</code></span></p></td>
+<td>
+<p>password to use for the created hotspot. If not provided, <span class="command"><strong>nmcli</strong></span> will
+                generate a password. The password is either WPA pre-shared key or WEP
+                key.</p>
+<p>Note that <code class="option">--show-secrets</code> global option can be used to
+                print the hotspot password. It is useful especially when the password was
+                generated.</p>
+</td>
+</tr>
+</tbody>
+</table></div>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>wifi</strong></span>
+          <span class="command"><strong>rescan</strong></span>
+           [<code class="option">ifname</code> <em class="replaceable"><code>ifname</code></em>]
+           [<code class="option">ssid</code> <em class="replaceable"><code>SSID</code></em>...]
+        </span></p></td>
+<td>
+<p>Request that NetworkManager immediately re-scan for
+          available access points. NetworkManager scans Wi-Fi networks periodically, but
+          in some cases it can be useful to start scanning manually (e.g. after resuming
+          the computer). By using <code class="option">ssid</code>, it is possible to scan for a
+          specific SSID, which is useful for APs with hidden SSIDs. You can provide
+          multiple <code class="option">ssid</code> parameters in order to scan more
+          SSIDs.</p>
+<p>This command does not show the APs, use <span class="command"><strong>nmcli device wifi list</strong></span>
+          for that.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>lldp</strong></span>
+           [
+            <span class="command"><strong>list</strong></span>
+             [<code class="option">ifname</code> <em class="replaceable"><code>ifname</code></em>]
+          ]
+        </span></p></td>
+<td><p>Display information about neighboring devices learned through the Link
+          Layer Discovery Protocol (LLDP). The <code class="option">ifname</code> option can be
+          used to list neighbors only for a given interface. The protocol must be enabled
+          in the connection settings.</p></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="agent"></a><h2>Secret Agent</h2>
+<div class="cmdsynopsis"><p><code class="command">nmcli agent</code>  { <span class="command"><strong>secret</strong></span>  |   <span class="command"><strong>polkit</strong></span>  |   <span class="command"><strong>all</strong></span> }</p></div>
+<p>Run <span class="command"><strong>nmcli</strong></span> as a NetworkManager secret agent, or polkit agent.</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><span class="command"><strong>secret</strong></span></span></p></td>
+<td><p>Register <span class="command"><strong>nmcli</strong></span> as a NetworkManager secret agent and listen for secret
+          requests. You do usually not need this command, because <span class="command"><strong>nmcli</strong></span> can handle
+          secrets when connecting to networks. However, you may find the command useful
+          when you use another tool for activating connections and you do not have a
+          secret agent available (like nm-applet).</p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>polkit</strong></span>
+        </span></p></td>
+<td><p>Register <span class="command"><strong>nmcli</strong></span> as a polkit agent for the user session and listen for
+          authorization requests. You do not usually need this command, because <span class="command"><strong>nmcli</strong></span> can
+          handle polkit actions related to NetworkManager operations (when run with
+          <code class="option">--ask</code>). However, you may find the command useful when you want
+          to run a simple text based polkit agent and you do not have an agent of a desktop
+          environment.  Note that running this command makes <span class="command"><strong>nmcli</strong></span> handle all polkit requests,
+          not only NetworkManager related ones, because only one polkit agent can run for the
+          session.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">
+          <span class="command"><strong>all</strong></span>
+        </span></p></td>
+<td><p>Runs <span class="command"><strong>nmcli</strong></span> as both NetworkManager secret and a polkit agent.</p></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="environment_variables"></a><h2>Environment Variables</h2>
+<p><span class="command"><strong>nmcli</strong></span>'s behavior is affected by the following
+    environment variables.</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="envar">LC_ALL</code></span></p></td>
+<td><p>If set to a non-empty string value, it overrides the values of all the
+          other internationalization variables.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="envar">LC_MESSAGES</code></span></p></td>
+<td><p>Determines the locale to be used for internationalized messages.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="envar">LANG</code></span></p></td>
+<td><p>Provides a default value for the internationalization variables that are
+          unset or null.</p></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="internationalization_notes"></a><h2>Internationalization notes</h2>
+<p>Be aware that <span class="command"><strong>nmcli</strong></span> is localized and that is why the
+    output depends on your environment. This is important to realize especially
+    when you parse the output.</p>
+<p>Call <span class="command"><strong>nmcli</strong></span> as <span class="command"><strong>LC_ALL=C nmcli</strong></span> to
+    be sure the locale is set to <code class="literal">C</code> while executing in a script.</p>
+<p><code class="envar">LC_ALL</code>, <code class="envar">LC_MESSAGES</code>, <code class="envar">LANG</code>
+    variables specify the <code class="envar">LC_MESSAGES</code> locale category (in that
+    order), which determines the language that <span class="command"><strong>nmcli</strong></span> uses for
+    messages. The <code class="literal">C</code> locale is used if none of these variables are set, and this
+    locale uses English messages.</p>
+</div>
+<div class="refsect1">
+<a name="exit_status"></a><h2>Exit Status</h2>
+<p><span class="command"><strong>nmcli</strong></span> exits with status 0 if it succeeds, a value
+    greater than 0 is returned if an error occurs.</p>
+<div class="variablelist"><table border="0" class="variablelist compact">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><span class="errorcode">0</span></span></p></td>
+<td><p>Success – indicates the operation succeeded.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="errorcode">1</span></span></p></td>
+<td><p>Unknown or unspecified error.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="errorcode">2</span></span></p></td>
+<td><p>Invalid user input, wrong <span class="command"><strong>nmcli</strong></span>
+          invocation.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="errorcode">3</span></span></p></td>
+<td><p>Timeout expired (see <code class="option">--wait</code> option).</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="errorcode">4</span></span></p></td>
+<td><p>Connection activation failed.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="errorcode">5</span></span></p></td>
+<td><p>Connection deactivation failed.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="errorcode">6</span></span></p></td>
+<td><p>Disconnecting device failed.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="errorcode">7</span></span></p></td>
+<td><p>Connection deletion failed.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="errorcode">8</span></span></p></td>
+<td><p>NetworkManager is not running.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="errorcode">9</span></span></p></td>
+<td><p><span class="command"><strong>nmcli</strong></span> and <span class="command"><strong>NetworkManager</strong></span>
+          versions mismatch.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="errorcode">10</span></span></p></td>
+<td><p>Connection, device, or access point does not exist.</p></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="examples"></a><h2>Examples</h2>
+<p>This section presents various examples of <span class="command"><strong>nmcli</strong></span> usage. If you want even
+    more, please refer to
+    <span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(7)</span>
+    manual page.</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli -t -f RUNNING general</code></strong></span></p></td>
+<td><p>tells you whether NetworkManager is running or not.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli -t -f STATE general</code></strong></span></p></td>
+<td><p>shows the overall status of NetworkManager.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli radio wifi off</code></strong></span></p></td>
+<td><p>switches Wi-Fi off.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli connection show</code></strong></span></p></td>
+<td><p>lists all connections NetworkManager has.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli -p -m multiline -f all con show</code></strong></span></p></td>
+<td><p>shows all configured connections in multi-line mode.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli connection show --active</code></strong></span></p></td>
+<td><p>lists all currently active connections.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli -f name,autoconnect c s</code></strong></span></p></td>
+<td><p>shows all connection profile names and their auto-connect property.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli -p connection show "My default em1"</code></strong></span></p></td>
+<td><p>shows details for "My default em1" connection profile.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli --show-secrets connection show "My Home WiFi"</code></strong></span></p></td>
+<td><p>shows details for "My Home WiFi" connection profile with all passwords.
+          Without <code class="option">--show-secrets</code> option, secrets would not be
+          displayed.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli -f active connection show "My default em1"</code></strong></span></p></td>
+<td><p>shows details for "My default em1" active connection, like IP, DHCP
+          information, etc.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli -f profile con s "My wired connection"</code></strong></span></p></td>
+<td><p>shows static configuration details of the connection profile with "My
+          wired connection" name.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli -p con up "My wired connection" ifname eth0</code></strong></span></p></td>
+<td><p>activates the connection profile with name "My wired connection" on
+          interface eth0. The -p option makes <span class="command"><strong>nmcli</strong></span> show progress of the
+          activation.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli con up 6b028a27-6dc9-4411-9886-e9ad1dd43761 ap 00:3A:98:7C:42:D3</code></strong></span></p></td>
+<td><p>connects the Wi-Fi connection with UUID
+          6b028a27-6dc9-4411-9886-e9ad1dd43761 to the AP with BSSID
+          00:3A:98:7C:42:D3.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli device status</code></strong></span></p></td>
+<td><p>shows the status for all devices.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli dev disconnect em2</code></strong></span></p></td>
+<td><p>disconnects a connection on interface em2 and marks the device as
+          unavailable for auto-connecting. As a result, no connection will automatically
+          be activated on the device until the device's 'autoconnect' is set to TRUE or
+          the user manually activates a connection.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli -f GENERAL,WIFI-PROPERTIES dev show wlan0</code></strong></span></p></td>
+<td><p>shows details for wlan0 interface; only GENERAL and WIFI-PROPERTIES
+          sections will be shown.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli -f CONNECTIONS device show wlp3s0</code></strong></span></p></td>
+<td><p>shows all available connection profiles for your Wi-Fi interface
+          wlp3s0.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli dev wifi</code></strong></span></p></td>
+<td><p>lists available Wi-Fi access points known to NetworkManager.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli dev wifi con "Cafe Hotspot 1" password caffeine name "My cafe"</code></strong></span></p></td>
+<td><p>creates a new connection named "My cafe" and then connects it to "Cafe
+          Hotspot 1" SSID using password "caffeine". This is mainly useful when
+          connecting to "Cafe Hotspot 1" for the first time. Next time, it is better to
+          use <span class="command"><strong>nmcli con up id "My cafe"</strong></span> so that the
+          existing connection profile can be used and no additional is created.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli -s dev wifi hotspot con-name QuickHotspot</code></strong></span></p></td>
+<td><p>creates a hotspot profile and connects it. Prints the hotspot password
+          the user should use to connect to the hotspot from other devices.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli connection add type ethernet autoconnect no ifname eth0</code></strong></span></p></td>
+<td><p>non-interactively adds an Ethernet connection tied to eth0 interface with
+          automatic IP configuration (DHCP), and disables the connection's <code class="literal">autoconnect</code>
+          flag.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli c a ifname Maxipes-fik type vlan dev eth0 id 55</code></strong></span></p></td>
+<td><p>non-interactively adds a VLAN connection with ID 55. The connection will
+          use eth0 and the VLAN interface will be named Maxipes-fik.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli c a ifname eth0 type ethernet -- ipv4.method disabled ipv6.method link-local</code></strong></span></p></td>
+<td><p>non-interactively adds a connection that will use eth0 Ethernet interface
+          and only have an IPv6 link-local address configured.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli connection edit ethernet-em1-2</code></strong></span></p></td>
+<td><p>edits existing "ethernet-em1-2" connection in the interactive
+          editor.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli connection edit type ethernet con-name "yet another Ethernet connection"</code></strong></span></p></td>
+<td><p>adds a new Ethernet connection in the interactive editor.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli con mod ethernet-2 connection.autoconnect no</code></strong></span></p></td>
+<td><p>modifies 'autoconnect' property in the 'connection' setting of
+          'ethernet-2' connection.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli con mod "Home Wi-Fi" wifi.mtu 1350</code></strong></span></p></td>
+<td><p>modifies 'mtu' property in the 'wifi' setting of 'Home Wi-Fi'
+          connection.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli con mod em1-1 ipv4.method manual ipv4.addr "192.168.1.23/24 192.168.1.1, 10.10.1.5/8, 10.0.0.11"</code></strong></span></p></td>
+<td><p>sets manual addressing and the addresses in em1-1 profile.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli con modify ABC +ipv4.dns 8.8.8.8</code></strong></span></p></td>
+<td><p>appends a Google public DNS server to DNS servers in ABC profile.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli con modify ABC -ipv4.addresses "192.168.100.25/24 192.168.1.1"</code></strong></span></p></td>
+<td><p>removes the specified IP address from (static) profile ABC.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli con import type openvpn file ~/Downloads/frootvpn.ovpn</code></strong></span></p></td>
+<td><p>imports an OpenVPN configuration to NetworkManager.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><strong class="userinput"><code>nmcli con export corp-vpnc /home/joe/corpvpn.conf</code></strong></span></p></td>
+<td><p>exports NetworkManager VPN profile corp-vpnc as standard Cisco (vpnc)
+          configuration.</p></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="notes"></a><h2>Notes</h2>
+<p><span class="command"><strong>nmcli</strong></span> accepts abbreviations, as long as they are a unique prefix in the set
+    of possible options. As new options get added, these abbreviations are not guaranteed
+    to stay unique. For scripting and long term compatibility it is therefore strongly
+    advised to spell out the full option names.</p>
+</div>
+<div class="refsect1">
+<a name="bugs"></a><h2>Bugs</h2>
+<p>There are probably some bugs. If you find a bug, please report it to
+    https://bugzilla.gnome.org/ — product <code class="literal">NetworkManager</code>.</p>
+</div>
+<div class="refsect1">
+<a name="see_also"></a><h2>See Also</h2>
+<p><span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(7)</span>,
+    <span class="citerefentry"><span class="refentrytitle">nm-online</span>(1)</span>,
+    <span class="citerefentry"><span class="refentrytitle">NetworkManager</span>(8)</span>,
+    <span class="citerefentry"><span class="refentrytitle">NetworkManager.conf</span>(5)</span>,
+    <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span>,
+    <span class="citerefentry"><span class="refentrytitle">nm-applet</span>(1)</span>,
+    <span class="citerefentry"><span class="refentrytitle">nm-connection-editor</span>(1)</span>.</p>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.24</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/api/html/nmtui.html b/docs/api/html/nmtui.html
new file mode 100644
index 00000000..ca11c834
--- /dev/null
+++ b/docs/api/html/nmtui.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>nmtui: NetworkManager D-Bus API Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="NetworkManager D-Bus API Reference Manual">
+<link rel="up" href="manpages.html" title="UNIX Manual Pages">
+<link rel="prev" href="nmcli.html" title="nmcli">
+<link rel="next" href="nm-online.html" title="nm-online">
+<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">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="manpages.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="nmcli.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="nm-online.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="nmtui"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle">nmtui</span></h2>
+<p>nmtui — Text User Interface for controlling NetworkManager</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv">
+<a name="synopsis"></a><h2>Synopsis</h2>
+<div class="cmdsynopsis"><p><code class="command">  nmtui-edit  |   nmtui edit  </code>   
+        { <em class="replaceable"><code>name</code></em>  |   <em class="replaceable"><code>id</code></em> }
+       </p></div>
+<div class="cmdsynopsis"><p><code class="command">  nmtui-connect  |   nmtui connect  </code>   
+        { <em class="replaceable"><code>name</code></em>  |   <em class="replaceable"><code>uuid</code></em>  |   <em class="replaceable"><code>device</code></em>  |   <em class="replaceable"><code>SSID</code></em> }
+       </p></div>
+<div class="cmdsynopsis"><p><code class="command">  nmtui-hostname  |   nmtui hostname  </code> </p></div>
+</div>
+<div class="refsect1">
+<a name="description"></a><h2>Description</h2>
+<p><span class="command"><strong>nmtui</strong></span> is a curses‐based TUI application for
+    interacting with NetworkManager. When starting <span class="command"><strong>nmtui</strong></span>, the
+    user is prompted to choose the activity to perform unless it was specified as
+    the first argument.</p>
+<p>The supported activities are:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">edit</code></span></p></td>
+<td><p>Show a connection editor that supports adding, modifying, viewing and
+          deleting connections. It provides similar functionality as
+          <span class="command"><strong>nm-connection-editor</strong></span>.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">connect</code></span></p></td>
+<td><p>Show a list of available connections, with the option to activate or
+          deactivate them. It provides similar functionality as
+          <span class="command"><strong>nm-applet</strong></span>.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">hostname</code></span></p></td>
+<td><p>Set the system hostname.</p></td>
+</tr>
+</tbody>
+</table></div>
+<p>Corresponding to above activities, <span class="command"><strong>nmtui</strong></span> also comes
+    with binaries named <span class="command"><strong>nmtui-edit</strong></span>,
+    <span class="command"><strong>nmtui-connect</strong></span>, and <span class="command"><strong>nmtui-hostname</strong></span> to skip
+    the selection of the activities.</p>
+</div>
+<div class="refsect1">
+<a name="see_also"></a><h2>See Also</h2>
+<p><span class="citerefentry"><span class="refentrytitle">nmcli</span>(1)</span>,
+    <span class="citerefentry"><span class="refentrytitle">nm-applet</span>(1)</span>,
+    <span class="citerefentry"><span class="refentrytitle">nm-connection-editor</span>(1)</span>,
+    <span class="citerefentry"><span class="refentrytitle">NetworkManager</span>(8)</span>.</p>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.24</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index 48f59265..3cf2c9ed 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -49,39 +49,39 @@
       <title>Interfaces</title>
       <!-- TODO: Split me into chapters about daemon, vpn plugins, dispatcher and the secret agent.
                     Then describe the daemon's singletons and object hierarchy. -->
-      <xi:include href="xml/nmdbus-manager-org.freedesktop.NetworkManager.xml"/>
-      <xi:include href="xml/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml"/>
-      <xi:include href="xml/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml"/>
-      <xi:include href="xml/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml"/>
-      <xi:include href="xml/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml"/>
-      <xi:include href="xml/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml"/>
-      <xi:include href="xml/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml"/>
-      <xi:include href="xml/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml"/>
-      <xi:include href="xml/nmdbus-device-org.freedesktop.NetworkManager.Device.xml"/>
-      <xi:include href="xml/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml"/>
-      <xi:include href="xml/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml"/>
-      <xi:include href="xml/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml"/>
-      <xi:include href="xml/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml"/>
-      <xi:include href="xml/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml"/>
-      <xi:include href="xml/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml"/>
-      <xi:include href="xml/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml"/>
-      <xi:include href="xml/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml"/>
-      <xi:include href="xml/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml"/>
-      <xi:include href="xml/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml"/>
-      <xi:include href="xml/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml"/>
-      <xi:include href="xml/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml"/>
-      <xi:include href="xml/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml"/>
-      <xi:include href="xml/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml"/>
-      <xi:include href="xml/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml"/>
-      <xi:include href="xml/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml"/>
-      <xi:include href="xml/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml"/>
-      <xi:include href="xml/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml"/>
-      <xi:include href="xml/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml"/>
-      <xi:include href="xml/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml"/>
-      <xi:include href="xml/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml"/>
-      <xi:include href="xml/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml"/>
-      <xi:include href="xml/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml"/>
-      <xi:include href="xml/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml"/>
+      <xi:include href="../../introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml"/>
+      <xi:include href="../../introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml"/>
+      <xi:include href="../../introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml"/>
+      <xi:include href="../../introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml"/>
+      <xi:include href="../../introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml"/>
+      <xi:include href="../../introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml"/>
+      <xi:include href="../../introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml"/>
+      <xi:include href="../../introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml"/>
+      <xi:include href="../../introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml"/>
+      <xi:include href="../../introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml"/>
+      <xi:include href="../../introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml"/>
+      <xi:include href="../../introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml"/>
+      <xi:include href="../../introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml"/>
+      <xi:include href="../../introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml"/>
+      <xi:include href="../../introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml"/>
     </section>
   </chapter>
 
@@ -144,12 +144,15 @@
 
   <chapter id="manpages">
     <title>UNIX Manual Pages</title>
-    <xi:include href="xml/NetworkManager.xml"/>
-    <xi:include href="xml/NetworkManager.conf.xml"/>
-    <xi:include href="xml/nmcli-examples.xml"/>
-    <xi:include href="xml/nm-settings.xml"><xi:fallback /></xi:include>
-    <xi:include href="xml/nm-settings-keyfile.xml"><xi:fallback /></xi:include>
-    <xi:include href="xml/nm-settings-ifcfg-rh.xml"><xi:fallback /></xi:include>
+    <xi:include href="../../man/nmcli.xml"/>
+    <xi:include href="../../man/nmtui.xml"/>
+    <xi:include href="../../man/nm-online.xml"/>
+    <xi:include href="../../man/NetworkManager.xml"/>
+    <xi:include href="../../man/NetworkManager.conf.xml"/>
+    <xi:include href="../../man/nmcli-examples.xml"/>
+    <xi:include href="../../man/nm-settings.xml"><xi:fallback /></xi:include>
+    <xi:include href="../../man/nm-settings-keyfile.xml"><xi:fallback /></xi:include>
+    <xi:include href="../../man/nm-settings-ifcfg-rh.xml"><xi:fallback /></xi:include>
   </chapter>
 
 
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 99f6a00b..9a03ea63 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.1.92
+1.1.93
author	Michael Biebl <biebl@debian.org>	2016-04-06 00:46:19 +0200
committer	Michael Biebl <biebl@debian.org>	2016-04-06 00:46:19 +0200
commit	2bfb3eb7d0323e69affca154395f51d8b577414d (patch)
tree	e3130a5146441296df6d08a0f4ac7222a854c8f8 /docs/api
parent	d9c99a29a0d3384c9c3d2adce430f5cb1134ab6a (diff)