summaryrefslogtreecommitdiff
path: root/docs/libnm-util
diff options
context:
space:
mode:
Diffstat (limited to 'docs/libnm-util')
-rw-r--r--docs/libnm-util/Makefile.am3
-rw-r--r--docs/libnm-util/Makefile.in62
-rw-r--r--docs/libnm-util/html/NMConnection.html50
-rw-r--r--docs/libnm-util/html/NMSetting.html12
-rw-r--r--docs/libnm-util/html/NMSettingBond.html4
-rw-r--r--docs/libnm-util/html/NMSettingBridge.html472
-rw-r--r--docs/libnm-util/html/NMSettingBridgePort.html314
-rw-r--r--docs/libnm-util/html/NMSettingConnection.html126
-rw-r--r--docs/libnm-util/html/NMSettingGsm.html18
-rw-r--r--docs/libnm-util/html/NMSettingIP4Config.html4
-rw-r--r--docs/libnm-util/html/NMSettingIP6Config.html45
-rw-r--r--docs/libnm-util/html/NMSettingInfiniband.html4
-rw-r--r--docs/libnm-util/html/NMSettingVlan.html11
-rw-r--r--docs/libnm-util/html/NMSettingWireless.html27
-rw-r--r--docs/libnm-util/html/api-index-full.html240
-rw-r--r--docs/libnm-util/html/ch01.html8
-rw-r--r--docs/libnm-util/html/index.html10
-rw-r--r--docs/libnm-util/html/index.sgml84
-rw-r--r--docs/libnm-util/html/libnm-util-nm-utils.html86
-rw-r--r--docs/libnm-util/html/libnm-util.devhelp270
-rw-r--r--docs/libnm-util/html/object-tree.html16
-rw-r--r--docs/libnm-util/libnm-util-docs.sgml2
-rw-r--r--docs/libnm-util/libnm-util-sections.txt83
-rw-r--r--docs/libnm-util/libnm-util.types4
-rw-r--r--docs/libnm-util/tmpl/nm-connection-private.sgml24
-rw-r--r--docs/libnm-util/tmpl/nm-connection.sgml20
-rw-r--r--docs/libnm-util/tmpl/nm-setting-8021x.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-adsl.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-bluetooth.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-bond.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-bridge-port.sgml143
-rw-r--r--docs/libnm-util/tmpl/nm-setting-bridge.sgml227
-rw-r--r--docs/libnm-util/tmpl/nm-setting-cdma.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-connection.sgml52
-rw-r--r--docs/libnm-util/tmpl/nm-setting-gsm.sgml4
-rw-r--r--docs/libnm-util/tmpl/nm-setting-infiniband.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-ip4-config.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-ip6-config.sgml23
-rw-r--r--docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-ppp.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-pppoe.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-private.sgml10
-rw-r--r--docs/libnm-util/tmpl/nm-setting-serial.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-vlan.sgml3
-rw-r--r--docs/libnm-util/tmpl/nm-setting-vpn.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-wimax.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-wired.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-wireless-security.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-setting-wireless.sgml9
-rw-r--r--docs/libnm-util/tmpl/nm-setting.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-utils-enum-types.sgml2
-rw-r--r--docs/libnm-util/tmpl/nm-utils.sgml30
-rw-r--r--docs/libnm-util/version.xml2
53 files changed, 2199 insertions, 137 deletions
diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am
index be1bdeebc..8b8b5aa14 100644
--- a/docs/libnm-util/Makefile.am
+++ b/docs/libnm-util/Makefile.am
@@ -10,7 +10,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
# The directory containing the source code. Relative to $(srcdir).
# gtk-doc will search all .c & .h files beneath here for inline comments
# documenting functions and macros.
-DOC_SOURCE_DIR=../../libnm-util
+DOC_SOURCE_DIR=$(top_srcdir)/libnm-util
# Extra options to supply to gtkdoc-scan.
SCAN_OPTIONS=--rebuild-types --rebuild-sections
@@ -66,6 +66,7 @@ EXTRA_DIST += version.xml.in
CLEANFILES += \
libnm-util-sections.txt \
+ libnm-util-overrides.txt \
html/* \
tmpl/* \
xml/*
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index a8edfffcf..59d4179ba 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -61,16 +61,18 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = docs/libnm-util
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
- $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gnome-code-coverage.m4 \
+ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vapigen.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -103,6 +105,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CKDB_PATH = @CKDB_PATH@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -117,9 +123,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCLIENT_VERSION = @DHCLIENT_VERSION@
DHCPCD_PATH = @DHCPCD_PATH@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -129,17 +133,14 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GENHTML = @GENHTML@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
GLIB_LIBS = @GLIB_LIBS@
GLIB_MAKEFILE = @GLIB_MAKEFILE@
GLIB_MKENUMS = @GLIB_MKENUMS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -180,6 +181,7 @@ IPTABLES_PATH = @IPTABLES_PATH@
IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
+LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBDL = @LIBDL@
@@ -196,11 +198,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@
LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
LIBNL3_LIBS = @LIBNL3_LIBS@
LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@
-LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@
LIBNL_LIBS = @LIBNL_LIBS@
-LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
-LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
@@ -215,6 +213,8 @@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
+MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
+MM_GLIB_LIBS = @MM_GLIB_LIBS@
MOC = @MOC@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
@@ -224,6 +224,7 @@ NMEDIT = @NMEDIT@
NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
NM_MICRO_VERSION = @NM_MICRO_VERSION@
NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@
NM_VERSION = @NM_VERSION@
NSS_CFLAGS = @NSS_CFLAGS@
NSS_LIBS = @NSS_LIBS@
@@ -250,13 +251,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
QT_CFLAGS = @QT_CFLAGS@
QT_LIBS = @QT_LIBS@
RANLIB = @RANLIB@
-RESOLVCONF_PATH = @RESOLVCONF_PATH@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
+SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
+SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
+SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
UDEV_BASE_DIR = @UDEV_BASE_DIR@
USE_NLS = @USE_NLS@
@@ -311,6 +313,11 @@ localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
+nmbinary = @nmbinary@
+nmconfdir = @nmconfdir@
+nmdatadir = @nmdatadir@
+nmrundir = @nmrundir@
+nmstatedir = @nmstatedir@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
@@ -325,6 +332,10 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+with_dhclient = @with_dhclient@
+with_dhcpcd = @with_dhcpcd@
+with_netconfig = @with_netconfig@
+with_resolvconf = @with_resolvconf@
AUTOMAKE_OPTIONS = 1.6
# The name of the module
@@ -336,7 +347,7 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
# The directory containing the source code. Relative to $(srcdir).
# gtk-doc will search all .c & .h files beneath here for inline comments
# documenting functions and macros.
-DOC_SOURCE_DIR = ../../libnm-util
+DOC_SOURCE_DIR = $(top_srcdir)/libnm-util
# Extra options to supply to gtkdoc-scan.
SCAN_OPTIONS = --rebuild-types --rebuild-sections
@@ -423,7 +434,8 @@ REPORT_FILES = \
$(DOC_MODULE)-unused.txt
CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
- libnm-util-sections.txt html/* tmpl/* xml/*
+ libnm-util-sections.txt libnm-util-overrides.txt html/* tmpl/* \
+ xml/*
@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP =
@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP =
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 9e62ec8a5..3f55caf8e 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -82,6 +82,9 @@ const <span class="returnvalue">char</span> * <a class="link" href="NMCon
<a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="returnvalue">NMSettingBluetooth</span></a> * <a class="link" href="NMConnection.html#nm-connection-get-setting-bluetooth" title="nm_connection_get_setting_bluetooth ()">nm_connection_get_setting_bluetooth</a>
(<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
<a class="link" href="NMSettingBond.html" title="NMSettingBond"><span class="returnvalue">NMSettingBond</span></a> * <a class="link" href="NMConnection.html#nm-connection-get-setting-bond" title="nm_connection_get_setting_bond ()">nm_connection_get_setting_bond</a> (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
+<a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="returnvalue">NMSettingBridge</span></a> * <a class="link" href="NMConnection.html#nm-connection-get-setting-bridge" title="nm_connection_get_setting_bridge ()">nm_connection_get_setting_bridge</a> (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
+<a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="returnvalue">NMSettingBridgePort</span></a> * <a class="link" href="NMConnection.html#nm-connection-get-setting-bridge-port" title="nm_connection_get_setting_bridge_port ()">nm_connection_get_setting_bridge_port</a>
+ (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> * <a class="link" href="NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()">nm_connection_get_setting_by_name</a> (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);
<a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="returnvalue">NMSettingCdma</span></a> * <a class="link" href="NMConnection.html#nm-connection-get-setting-cdma" title="nm_connection_get_setting_cdma ()">nm_connection_get_setting_cdma</a> (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);
@@ -700,6 +703,53 @@ A shortcut to return any <a class="link" href="NMSettingBond.html" title="NMSett
</div>
<hr>
<div class="refsect2">
+<a name="nm-connection-get-setting-bridge"></a><h3>nm_connection_get_setting_bridge ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="returnvalue">NMSettingBridge</span></a> * nm_connection_get_setting_bridge (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+<p>
+A shortcut to return any <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> the connection might contain.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>an <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> if the connection contains one, otherwise NULL. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-connection-get-setting-bridge-port"></a><h3>nm_connection_get_setting_bridge_port ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="returnvalue">NMSettingBridgePort</span></a> * nm_connection_get_setting_bridge_port
+ (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+<p>
+A shortcut to return any <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> the connection might contain.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>an <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> if the connection contains one, otherwise NULL. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
<a name="nm-connection-get-setting-by-name"></a><h3>nm_connection_get_setting_by_name ()</h3>
<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> * nm_connection_get_setting_by_name (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 8a8b2b8ce..12b826b1b 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -116,22 +116,24 @@ const <span class="returnvalue">char</span> * <a class="link" href="NMSet
+----<a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a>
+----<a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth">NMSettingBluetooth</a>
+----<a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
- +----<a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
+ +----<a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+ +----<a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+----<a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
- +----<a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+----<a class="link" href="NMSettingInfiniband.html" title="NMSettingInfiniband">NMSettingInfiniband</a>
+----<a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
+ +----<a class="link" href="NMSettingVlan.html" title="NMSettingVlan">NMSettingVlan</a>
+----<a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
- +----<a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">NMSettingOlpcMesh</a>
+----<a class="link" href="NMSettingPPP.html" title="NMSettingPPP">NMSettingPPP</a>
+----<a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
+----<a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
- +----<a class="link" href="NMSettingVlan.html" title="NMSettingVlan">NMSettingVlan</a>
- +----<a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
+ +----<a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+ +----<a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
+ +----<a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">NMSettingOlpcMesh</a>
+----<a class="link" href="NMSettingWimax.html" title="NMSettingWimax">NMSettingWimax</a>
+----<a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
+----<a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
+----<a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+ +----<a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
</pre>
<pre class="synopsis">
GEnum
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index e29bca050..ff77e1025 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -7,7 +7,7 @@
<link rel="home" href="index.html" title="libnm-util Reference Manual">
<link rel="up" href="ch01.html" title="libnm-util API Reference">
<link rel="prev" href="NMSettingWimax.html" title="NMSettingWimax">
-<link rel="next" href="NMSettingInfiniband.html" title="NMSettingInfiniband">
+<link rel="next" href="NMSettingBridge.html" title="NMSettingBridge">
<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
@@ -18,7 +18,7 @@
<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">libnm-util Reference Manual</th>
-<td><a accesskey="n" href="NMSettingInfiniband.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="NMSettingBridge.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
<tr><td colspan="5" class="shortcuts">
<a href="#NMSettingBond.synopsis" class="shortcut">Top</a>
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
new file mode 100644
index 000000000..4e52f8ed8
--- /dev/null
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -0,0 +1,472 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NMSettingBridge</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="libnm-util Reference Manual">
+<link rel="up" href="ch01.html" title="libnm-util API Reference">
+<link rel="prev" href="NMSettingBond.html" title="NMSettingBond">
+<link rel="next" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="NMSettingBond.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libnm-util Reference Manual</th>
+<td><a accesskey="n" href="NMSettingBridgePort.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#NMSettingBridge.synopsis" class="shortcut">Top</a>
+  | 
+ <a href="#NMSettingBridge.description" class="shortcut">Description</a>
+  | 
+ <a href="#NMSettingBridge.object-hierarchy" class="shortcut">Object Hierarchy</a>
+  | 
+ <a href="#NMSettingBridge.properties" class="shortcut">Properties</a>
+</td></tr>
+</table>
+<div class="refentry">
+<a name="NMSettingBridge"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="NMSettingBridge.top_of_page"></a>NMSettingBridge</span></h2>
+<p>NMSettingBridge — Describes connection properties for bridges</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv">
+<a name="NMSettingBridge.synopsis"></a><h2>Synopsis</h2>
+<a name="NMSettingBridgeError"></a><pre class="synopsis">
+#include &lt;nm-setting-bridge.h&gt;
+
+ <a class="link" href="NMSettingBridge.html#NMSettingBridge-struct" title="NMSettingBridge">NMSettingBridge</a>;
+ <a class="link" href="NMSettingBridge.html#NMSettingBridgeClass" title="NMSettingBridgeClass">NMSettingBridgeClass</a>;
+enum <a class="link" href="NMSettingBridge.html#NMSettingBridgeError-enum" title="enum NMSettingBridgeError">NMSettingBridgeError</a>;
+#define <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-AGEING-TIME:CAPS" title="NM_SETTING_BRIDGE_AGEING_TIME">NM_SETTING_BRIDGE_AGEING_TIME</a>
+#define <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR:CAPS" title="NM_SETTING_BRIDGE_ERROR">NM_SETTING_BRIDGE_ERROR</a>
+#define <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-FORWARD-DELAY:CAPS" title="NM_SETTING_BRIDGE_FORWARD_DELAY">NM_SETTING_BRIDGE_FORWARD_DELAY</a>
+#define <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-HELLO-TIME:CAPS" title="NM_SETTING_BRIDGE_HELLO_TIME">NM_SETTING_BRIDGE_HELLO_TIME</a>
+#define <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-INTERFACE-NAME:CAPS" title="NM_SETTING_BRIDGE_INTERFACE_NAME">NM_SETTING_BRIDGE_INTERFACE_NAME</a>
+#define <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-MAX-AGE:CAPS" title="NM_SETTING_BRIDGE_MAX_AGE">NM_SETTING_BRIDGE_MAX_AGE</a>
+#define <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-PRIORITY:CAPS" title="NM_SETTING_BRIDGE_PRIORITY">NM_SETTING_BRIDGE_PRIORITY</a>
+#define <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-SETTING-NAME:CAPS" title="NM_SETTING_BRIDGE_SETTING_NAME">NM_SETTING_BRIDGE_SETTING_NAME</a>
+#define <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-STP:CAPS" title="NM_SETTING_BRIDGE_STP">NM_SETTING_BRIDGE_STP</a>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> <a class="link" href="NMSettingBridge.html#nm-setting-bridge-error-quark" title="nm_setting_bridge_error_quark ()">nm_setting_bridge_error_quark</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a> <a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-ageing-time" title="nm_setting_bridge_get_ageing_time ()">nm_setting_bridge_get_ageing_time</a> (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a> <a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-forward-delay" title="nm_setting_bridge_get_forward_delay ()">nm_setting_bridge_get_forward_delay</a> (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a> <a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-hello-time" title="nm_setting_bridge_get_hello_time ()">nm_setting_bridge_get_hello_time</a> (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);
+const <span class="returnvalue">char</span> * <a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-interface-name" title="nm_setting_bridge_get_interface_name ()">nm_setting_bridge_get_interface_name</a>
+ (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a> <a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-max-age" title="nm_setting_bridge_get_max_age ()">nm_setting_bridge_get_max_age</a> (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a> <a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-priority" title="nm_setting_bridge_get_priority ()">nm_setting_bridge_get_priority</a> (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-stp" title="nm_setting_bridge_get_stp ()">nm_setting_bridge_get_stp</a> (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> * <a class="link" href="NMSettingBridge.html#nm-setting-bridge-new" title="nm_setting_bridge_new ()">nm_setting_bridge_new</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMSettingBridge.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="synopsis">
+ <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+ +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+ +----NMSettingBridge
+</pre>
+<pre class="synopsis">
+ GEnum
+ +----NMSettingBridgeError
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMSettingBridge.properties"></a><h2>Properties</h2>
+<pre class="synopsis">
+ "<a class="link" href="NMSettingBridge.html#NMSettingBridge--ageing-time" title='The "ageing-time" property'>ageing-time</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct
+ "<a class="link" href="NMSettingBridge.html#NMSettingBridge--forward-delay" title='The "forward-delay" property'>forward-delay</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct
+ "<a class="link" href="NMSettingBridge.html#NMSettingBridge--hello-time" title='The "hello-time" property'>hello-time</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct
+ "<a class="link" href="NMSettingBridge.html#NMSettingBridge--interface-name" title='The "interface-name" property'>interface-name</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
+ "<a class="link" href="NMSettingBridge.html#NMSettingBridge--max-age" title='The "max-age" property'>max-age</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct
+ "<a class="link" href="NMSettingBridge.html#NMSettingBridge--priority" title='The "priority" property'>priority</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct
+ "<a class="link" href="NMSettingBridge.html#NMSettingBridge--stp" title='The "stp" property'>stp</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write / Construct
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMSettingBridge.description"></a><h2>Description</h2>
+<p>
+The <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes properties
+necessary for bridging connections.
+</p>
+</div>
+<div class="refsect1">
+<a name="NMSettingBridge.details"></a><h2>Details</h2>
+<div class="refsect2">
+<a name="NMSettingBridge-struct"></a><h3>NMSettingBridge</h3>
+<pre class="programlisting">typedef struct _NMSettingBridge NMSettingBridge;</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridgeClass"></a><h3>NMSettingBridgeClass</h3>
+<pre class="programlisting">typedef struct {
+ NMSettingClass parent;
+
+ /* Padding for future expansion */
+ void (*_reserved1) (void);
+ void (*_reserved2) (void);
+ void (*_reserved3) (void);
+ void (*_reserved4) (void);
+} NMSettingBridgeClass;
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridgeError-enum"></a><h3>enum NMSettingBridgeError</h3>
+<pre class="programlisting">typedef enum {
+ NM_SETTING_BRIDGE_ERROR_UNKNOWN = 0, /*&lt; nick=UnknownError &gt;*/
+ NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY, /*&lt; nick=InvalidProperty &gt;*/
+ NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY, /*&lt; nick=MissingProperty &gt;*/
+} NMSettingBridgeError;
+</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><a name="NM-SETTING-BRIDGE-ERROR-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_SETTING_BRIDGE_ERROR_UNKNOWN</code></span></p></td>
+<td>unknown or unclassified error
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-BRIDGE-ERROR-INVALID-PROPERTY:CAPS"></a><span class="term"><code class="literal">NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY</code></span></p></td>
+<td>the property was invalid
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-BRIDGE-ERROR-MISSING-PROPERTY:CAPS"></a><span class="term"><code class="literal">NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY</code></span></p></td>
+<td>the property was missing and is
+required
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-AGEING-TIME:CAPS"></a><h3>NM_SETTING_BRIDGE_AGEING_TIME</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_AGEING_TIME "ageing-time"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-ERROR:CAPS"></a><h3>NM_SETTING_BRIDGE_ERROR</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_ERROR nm_setting_bridge_error_quark ()
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-FORWARD-DELAY:CAPS"></a><h3>NM_SETTING_BRIDGE_FORWARD_DELAY</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_FORWARD_DELAY "forward-delay"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-HELLO-TIME:CAPS"></a><h3>NM_SETTING_BRIDGE_HELLO_TIME</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_HELLO_TIME "hello-time"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-INTERFACE-NAME:CAPS"></a><h3>NM_SETTING_BRIDGE_INTERFACE_NAME</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_INTERFACE_NAME "interface-name"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-MAX-AGE:CAPS"></a><h3>NM_SETTING_BRIDGE_MAX_AGE</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_MAX_AGE "max-age"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-PRIORITY:CAPS"></a><h3>NM_SETTING_BRIDGE_PRIORITY</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_PRIORITY "priority"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BRIDGE_SETTING_NAME</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-STP:CAPS"></a><h3>NM_SETTING_BRIDGE_STP</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_STP "stp"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-error-quark"></a><h3>nm_setting_bridge_error_quark ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> nm_setting_bridge_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+Registers an error quark for <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> if necessary.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the error quark used for <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> errors.</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-get-ageing-time"></a><h3>nm_setting_bridge_get_ageing_time ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a> nm_setting_bridge_get_ageing_time (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html#NMSettingBridge--ageing-time" title='The "ageing-time" property'><span class="type">"ageing-time"</span></a> property of the setting</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-get-forward-delay"></a><h3>nm_setting_bridge_get_forward_delay ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a> nm_setting_bridge_get_forward_delay (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html#NMSettingBridge--forward-delay" title='The "forward-delay" property'><span class="type">"forward-delay"</span></a> property of the setting</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-get-hello-time"></a><h3>nm_setting_bridge_get_hello_time ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a> nm_setting_bridge_get_hello_time (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html#NMSettingBridge--hello-time" title='The "hello-time" property'><span class="type">"hello-time"</span></a> property of the setting</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-get-interface-name"></a><h3>nm_setting_bridge_get_interface_name ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_bridge_get_interface_name
+ (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html#NMSettingBridge--interface-name" title='The "interface-name" property'><span class="type">"interface-name"</span></a> property of the setting</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-get-max-age"></a><h3>nm_setting_bridge_get_max_age ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a> nm_setting_bridge_get_max_age (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html#NMSettingBridge--max-age" title='The "max-age" property'><span class="type">"max-age"</span></a> property of the setting</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-get-priority"></a><h3>nm_setting_bridge_get_priority ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a> nm_setting_bridge_get_priority (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html#NMSettingBridge--priority" title='The "priority" property'><span class="type">"priority"</span></a> property of the setting</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-get-stp"></a><h3>nm_setting_bridge_get_stp ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_bridge_get_stp (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridge.html#NMSettingBridge--stp" title='The "stp" property'><span class="type">"stp"</span></a> property of the setting</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-new"></a><h3>nm_setting_bridge_new ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> * nm_setting_bridge_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+Creates a new <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> object with default values.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the new empty <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> object. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<div class="refsect1">
+<a name="NMSettingBridge.property-details"></a><h2>Property Details</h2>
+<div class="refsect2">
+<a name="NMSettingBridge--ageing-time"></a><h3>The <code class="literal">"ageing-time"</code> property</h3>
+<pre class="programlisting"> "ageing-time" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct</pre>
+<p>
+The ethernet MAC address aging time, in seconds.
+</p>
+<p>Allowed values: &lt;= 1000000</p>
+<p>Default value: 300</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridge--forward-delay"></a><h3>The <code class="literal">"forward-delay"</code> property</h3>
+<pre class="programlisting"> "forward-delay" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct</pre>
+<p>
+The Spanning Tree Protocol (STP) forwarding delay, in seconds.
+</p>
+<p>Allowed values: &lt;= 30</p>
+<p>Default value: 15</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridge--hello-time"></a><h3>The <code class="literal">"hello-time"</code> property</h3>
+<pre class="programlisting"> "hello-time" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct</pre>
+<p>
+The Spanning Tree Protocol (STP) hello time, in seconds.
+</p>
+<p>Allowed values: &lt;= 10</p>
+<p>Default value: 2</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridge--interface-name"></a><h3>The <code class="literal">"interface-name"</code> property</h3>
+<pre class="programlisting"> "interface-name" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
+<p>
+The name of the virtual in-kernel briding network interface
+</p>
+<p>Default value: NULL</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridge--max-age"></a><h3>The <code class="literal">"max-age"</code> property</h3>
+<pre class="programlisting"> "max-age" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct</pre>
+<p>
+The Spanning Tree Protocol (STP) maximum message age, in seconds.
+</p>
+<p>Allowed values: &lt;= 40</p>
+<p>Default value: 20</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridge--priority"></a><h3>The <code class="literal">"priority"</code> property</h3>
+<pre class="programlisting"> "priority" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct</pre>
+<p>
+Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower
+values are "better"; the lowest priority bridge will be elected the root
+bridge.
+</p>
+<p>Allowed values: &lt;= 65535</p>
+<p>Default value: 128</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridge--stp"></a><h3>The <code class="literal">"stp"</code> property</h3>
+<pre class="programlisting"> "stp" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write / Construct</pre>
+<p>
+Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
+</p>
+<p>Default value: TRUE</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+ Generated by GTK-Doc V1.18</div>
+</body>
+</html> \ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
new file mode 100644
index 000000000..e5ce3b47d
--- /dev/null
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -0,0 +1,314 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NMSettingBridgePort</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="libnm-util Reference Manual">
+<link rel="up" href="ch01.html" title="libnm-util API Reference">
+<link rel="prev" href="NMSettingBridge.html" title="NMSettingBridge">
+<link rel="next" href="NMSettingInfiniband.html" title="NMSettingInfiniband">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="NMSettingBridge.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libnm-util Reference Manual</th>
+<td><a accesskey="n" href="NMSettingInfiniband.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#NMSettingBridgePort.synopsis" class="shortcut">Top</a>
+  | 
+ <a href="#NMSettingBridgePort.description" class="shortcut">Description</a>
+  | 
+ <a href="#NMSettingBridgePort.object-hierarchy" class="shortcut">Object Hierarchy</a>
+  | 
+ <a href="#NMSettingBridgePort.properties" class="shortcut">Properties</a>
+</td></tr>
+</table>
+<div class="refentry">
+<a name="NMSettingBridgePort"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="NMSettingBridgePort.top_of_page"></a>NMSettingBridgePort</span></h2>
+<p>NMSettingBridgePort — Describes connection properties for bridge ports</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv">
+<a name="NMSettingBridgePort.synopsis"></a><h2>Synopsis</h2>
+<a name="NMSettingBridgePortError"></a><pre class="synopsis">
+#include &lt;nm-setting-bridge-port.h&gt;
+
+ <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort-struct" title="NMSettingBridgePort">NMSettingBridgePort</a>;
+ <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePortClass" title="NMSettingBridgePortClass">NMSettingBridgePortClass</a>;
+enum <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePortError-enum" title="enum NMSettingBridgePortError">NMSettingBridgePortError</a>;
+#define <a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR:CAPS" title="NM_SETTING_BRIDGE_PORT_ERROR">NM_SETTING_BRIDGE_PORT_ERROR</a>
+#define <a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS" title="NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE">NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE</a>
+#define <a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS" title="NM_SETTING_BRIDGE_PORT_PATH_COST">NM_SETTING_BRIDGE_PORT_PATH_COST</a>
+#define <a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS" title="NM_SETTING_BRIDGE_PORT_PRIORITY">NM_SETTING_BRIDGE_PORT_PRIORITY</a>
+#define <a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS" title="NM_SETTING_BRIDGE_PORT_SETTING_NAME">NM_SETTING_BRIDGE_PORT_SETTING_NAME</a>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> <a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-error-quark" title="nm_setting_bridge_port_error_quark ()">nm_setting_bridge_port_error_quark</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-get-hairpin-mode" title="nm_setting_bridge_port_get_hairpin_mode ()">nm_setting_bridge_port_get_hairpin_mode</a>
+ (<em class="parameter"><code><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a> <a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-get-path-cost" title="nm_setting_bridge_port_get_path_cost ()">nm_setting_bridge_port_get_path_cost</a>
+ (<em class="parameter"><code><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a> <a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-get-priority" title="nm_setting_bridge_port_get_priority ()">nm_setting_bridge_port_get_priority</a> (<em class="parameter"><code><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> *setting</code></em>);
+<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> * <a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-new" title="nm_setting_bridge_port_new ()">nm_setting_bridge_port_new</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMSettingBridgePort.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="synopsis">
+ <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+ +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+ +----NMSettingBridgePort
+</pre>
+<pre class="synopsis">
+ GEnum
+ +----NMSettingBridgePortError
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMSettingBridgePort.properties"></a><h2>Properties</h2>
+<pre class="synopsis">
+ "<a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode" title='The "hairpin-mode" property'>hairpin-mode</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write
+ "<a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--path-cost" title='The "path-cost" property'>path-cost</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct
+ "<a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--priority" title='The "priority" property'>priority</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct
+</pre>
+</div>
+<div class="refsect1">
+<a name="NMSettingBridgePort.description"></a><h2>Description</h2>
+<p>
+The <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes
+optional properties that apply to bridge ports.
+</p>
+</div>
+<div class="refsect1">
+<a name="NMSettingBridgePort.details"></a><h2>Details</h2>
+<div class="refsect2">
+<a name="NMSettingBridgePort-struct"></a><h3>NMSettingBridgePort</h3>
+<pre class="programlisting">typedef struct _NMSettingBridgePort NMSettingBridgePort;</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridgePortClass"></a><h3>NMSettingBridgePortClass</h3>
+<pre class="programlisting">typedef struct {
+ NMSettingClass parent;
+
+ /* Padding for future expansion */
+ void (*_reserved1) (void);
+ void (*_reserved2) (void);
+ void (*_reserved3) (void);
+ void (*_reserved4) (void);
+} NMSettingBridgePortClass;
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridgePortError-enum"></a><h3>enum NMSettingBridgePortError</h3>
+<pre class="programlisting">typedef enum {
+ NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN = 0, /*&lt; nick=UnknownError &gt;*/
+ NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY, /*&lt; nick=InvalidProperty &gt;*/
+ NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY, /*&lt; nick=MissingProperty &gt;*/
+} NMSettingBridgePortError;
+</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><a name="NM-SETTING-BRIDGE-PORT-ERROR-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN</code></span></p></td>
+<td>unknown or unclassified error
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-BRIDGE-PORT-ERROR-INVALID-PROPERTY:CAPS"></a><span class="term"><code class="literal">NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY</code></span></p></td>
+<td>the property was invalid
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-BRIDGE-PORT-ERROR-MISSING-PROPERTY:CAPS"></a><span class="term"><code class="literal">NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY</code></span></p></td>
+<td>the property was missing and
+is required
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-PORT-ERROR:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_ERROR</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_ERROR nm_setting_bridge_port_error_quark ()
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_PATH_COST</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_PATH_COST "path-cost"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_PRIORITY</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_PRIORITY "priority"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_SETTING_NAME</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_SETTING_NAME "bridge-port"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-port-error-quark"></a><h3>nm_setting_bridge_port_error_quark ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> nm_setting_bridge_port_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+Registers an error quark for <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> if necessary.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the error quark used for <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> errors.</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-port-get-hairpin-mode"></a><h3>nm_setting_bridge_port_get_hairpin_mode ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_bridge_port_get_hairpin_mode
+ (<em class="parameter"><code><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode" title='The "hairpin-mode" property'><span class="type">"hairpin-mode"</span></a> property of the setting</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-port-get-path-cost"></a><h3>nm_setting_bridge_port_get_path_cost ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a> nm_setting_bridge_port_get_path_cost
+ (<em class="parameter"><code><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--path-cost" title='The "path-cost" property'><span class="type">"path-cost"</span></a> property of the setting</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-port-get-priority"></a><h3>nm_setting_bridge_port_get_priority ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a> nm_setting_bridge_port_get_priority (<em class="parameter"><code><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--priority" title='The "priority" property'><span class="type">"priority"</span></a> property of the setting</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-port-new"></a><h3>nm_setting_bridge_port_new ()</h3>
+<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> * nm_setting_bridge_port_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+Creates a new <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> object with default values.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the new empty <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> object. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<div class="refsect1">
+<a name="NMSettingBridgePort.property-details"></a><h2>Property Details</h2>
+<div class="refsect2">
+<a name="NMSettingBridgePort--hairpin-mode"></a><h3>The <code class="literal">"hairpin-mode"</code> property</h3>
+<pre class="programlisting"> "hairpin-mode" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write</pre>
+<p>
+Enables or disabled 'hairpin mode' for the port, which allows frames to
+be sent back out through the port the frame was received on.
+</p>
+<p>Default value: FALSE</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridgePort--path-cost"></a><h3>The <code class="literal">"path-cost"</code> property</h3>
+<pre class="programlisting"> "path-cost" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct</pre>
+<p>
+The Spanning Tree Protocol (STP) port cost for destinations via this port.
+</p>
+<p>Allowed values: &lt;= 65535</p>
+<p>Default value: 100</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridgePort--priority"></a><h3>The <code class="literal">"priority"</code> property</h3>
+<pre class="programlisting"> "priority" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct</pre>
+<p>
+The Spanning Tree Protocol (STP) priority of this bridge port.
+</p>
+<p>Allowed values: &lt;= 63</p>
+<p>Default value: 32</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+ Generated by GTK-Doc V1.18</div>
+</body>
+</html> \ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index f83cfc860..bb1014e51 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -53,6 +53,7 @@ enum <a class="link" href="NMSettingConnection.html#NMSettingConn
#define <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-MASTER:CAPS" title="NM_SETTING_CONNECTION_MASTER">NM_SETTING_CONNECTION_MASTER</a>
#define <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-PERMISSIONS:CAPS" title="NM_SETTING_CONNECTION_PERMISSIONS">NM_SETTING_CONNECTION_PERMISSIONS</a>
#define <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-READ-ONLY:CAPS" title="NM_SETTING_CONNECTION_READ_ONLY">NM_SETTING_CONNECTION_READ_ONLY</a>
+#define <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-SECONDARIES:CAPS" title="NM_SETTING_CONNECTION_SECONDARIES">NM_SETTING_CONNECTION_SECONDARIES</a>
#define <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS" title="NM_SETTING_CONNECTION_SETTING_NAME">NM_SETTING_CONNECTION_SETTING_NAME</a>
#define <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-SLAVE-TYPE:CAPS" title="NM_SETTING_CONNECTION_SLAVE_TYPE">NM_SETTING_CONNECTION_SLAVE_TYPE</a>
#define <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-TIMESTAMP:CAPS" title="NM_SETTING_CONNECTION_TIMESTAMP">NM_SETTING_CONNECTION_TIMESTAMP</a>
@@ -64,6 +65,8 @@ enum <a class="link" href="NMSettingConnection.html#NMSettingConn
<em class="parameter"><code>const <span class="type">char</span> *ptype</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *pitem</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *detail</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSettingConnection.html#nm-setting-connection-add-secondary" title="nm_setting_connection_add_secondary ()">nm_setting_connection_add_secondary</a> (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *sec_uuid</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> <a class="link" href="NMSettingConnection.html#nm-setting-connection-error-quark" title="nm_setting_connection_error_quark ()">nm_setting_connection_error_quark</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-autoconnect" title="nm_setting_connection_get_autoconnect ()">nm_setting_connection_get_autoconnect</a>
(<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
@@ -73,6 +76,8 @@ const <span class="returnvalue">char</span> * <a class="link" href="NMSet
const <span class="returnvalue">char</span> * <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-master" title="nm_setting_connection_get_master ()">nm_setting_connection_get_master</a> (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a> <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-num-permissions" title="nm_setting_connection_get_num_permissions ()">nm_setting_connection_get_num_permissions</a>
(<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a> <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-num-secondaries" title="nm_setting_connection_get_num_secondaries ()">nm_setting_connection_get_num_secondaries</a>
+ (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-permission" title="nm_setting_connection_get_permission ()">nm_setting_connection_get_permission</a>
(<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>,
@@ -80,6 +85,8 @@ const <span class="returnvalue">char</span> * <a class="link" href="NMSet
<em class="parameter"><code>const <span class="type">char</span> **out_pitem</code></em>,
<em class="parameter"><code>const <span class="type">char</span> **out_detail</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-read-only" title="nm_setting_connection_get_read_only ()">nm_setting_connection_get_read_only</a> (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
+const <span class="returnvalue">char</span> * <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-secondary" title="nm_setting_connection_get_secondary ()">nm_setting_connection_get_secondary</a> (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);
const <span class="returnvalue">char</span> * <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-slave-type" title="nm_setting_connection_get_slave_type ()">nm_setting_connection_get_slave_type</a>
(<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="returnvalue">guint64</span></a> <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-timestamp" title="nm_setting_connection_get_timestamp ()">nm_setting_connection_get_timestamp</a> (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);
@@ -94,6 +101,9 @@ const <span class="returnvalue">char</span> * <a class="link" href="NMSet
<span class="returnvalue">void</span> <a class="link" href="NMSettingConnection.html#nm-setting-connection-remove-permission" title="nm_setting_connection_remove_permission ()">nm_setting_connection_remove_permission</a>
(<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="NMSettingConnection.html#nm-setting-connection-remove-secondary" title="nm_setting_connection_remove_secondary ()">nm_setting_connection_remove_secondary</a>
+ (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);
</pre>
</div>
<div class="refsect1">
@@ -116,6 +126,7 @@ const <span class="returnvalue">char</span> * <a class="link" href="NMSet
"<a class="link" href="NMSettingConnection.html#NMSettingConnection--master" title='The "master" property'>master</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
"<a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title='The "permissions" property'>permissions</a>" <span class="type">GSList_gchararray_</span>* : Read / Write
"<a class="link" href="NMSettingConnection.html#NMSettingConnection--read-only" title='The "read-only" property'>read-only</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write / Construct
+ "<a class="link" href="NMSettingConnection.html#NMSettingConnection--secondaries" title='The "secondaries" property'>secondaries</a>" <span class="type">GSList_gchararray_</span>* : Read / Write
"<a class="link" href="NMSettingConnection.html#NMSettingConnection--slave-type" title='The "slave-type" property'>slave-type</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
"<a class="link" href="NMSettingConnection.html#NMSettingConnection--timestamp" title='The "timestamp" property'>timestamp</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> : Read / Write / Construct
"<a class="link" href="NMSettingConnection.html#NMSettingConnection--type" title='The "type" property'>type</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
@@ -259,6 +270,14 @@ Describes errors that may result from operations involving a
</div>
<hr>
<div class="refsect2">
+<a name="NM-SETTING-CONNECTION-SECONDARIES:CAPS"></a><h3>NM_SETTING_CONNECTION_SECONDARIES</h3>
+<pre class="programlisting">#define NM_SETTING_CONNECTION_SECONDARIES "secondaries"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
<a name="NM-SETTING-CONNECTION-SETTING-NAME:CAPS"></a><h3>NM_SETTING_CONNECTION_SETTING_NAME</h3>
<pre class="programlisting">#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
</pre>
@@ -351,6 +370,35 @@ present in the list</td>
</div>
<hr>
<div class="refsect2">
+<a name="nm-setting-connection-add-secondary"></a><h3>nm_setting_connection_add_secondary ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_connection_add_secondary (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *sec_uuid</code></em>);</pre>
+<p>
+Adds a new secondary connetion UUID to the setting.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>sec_uuid</code></em> :</span></p></td>
+<td>the secondary connection UUID to add</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the secondary connection UUID was added; <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if the UUID
+was already present</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
<a name="nm-setting-connection-error-quark"></a><h3>nm_setting_connection_error_quark ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> nm_setting_connection_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
<p>
@@ -481,6 +529,26 @@ property of this setting.
</div>
<hr>
<div class="refsect2">
+<a name="nm-setting-connection-get-num-secondaries"></a><h3>nm_setting_connection_get_num_secondaries ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a> nm_setting_connection_get_num_secondaries
+ (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the number of configured secondary connection UUIDs</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
<a name="nm-setting-connection-get-permission"></a><h3>nm_setting_connection_get_permission ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_connection_get_permission
(<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
@@ -550,6 +618,31 @@ Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--
</div>
<hr>
<div class="refsect2">
+<a name="nm-setting-connection-get-secondary"></a><h3>nm_setting_connection_get_secondary ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_connection_get_secondary (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>idx</code></em> :</span></p></td>
+<td>the zero-based index of the secondary connection UUID entry</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the secondary connection UUID at index <em class="parameter"><code>idx</code></em>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
<a name="nm-setting-connection-get-slave-type"></a><h3>nm_setting_connection_get_slave_type ()</h3>
<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_connection_get_slave_type
(<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
@@ -732,6 +825,30 @@ Removes the permission at index <em class="parameter"><code>idx</code></em> from
</tbody>
</table></div>
</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-connection-remove-secondary"></a><h3>nm_setting_connection_remove_secondary ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> nm_setting_connection_remove_secondary
+ (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> idx</code></em>);</pre>
+<p>
+Removes the secondary coonnection UUID at index <em class="parameter"><code>idx</code></em>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>idx</code></em> :</span></p></td>
+<td>index number of the secondary connection UUID</td>
+</tr>
+</tbody>
+</table></div>
+</div>
</div>
<div class="refsect1">
<a name="NMSettingConnection.property-details"></a><h2>Property Details</h2>
@@ -800,6 +917,15 @@ if the connection is read-only and cannot be modified.
</div>
<hr>
<div class="refsect2">
+<a name="NMSettingConnection--secondaries"></a><h3>The <code class="literal">"secondaries"</code> property</h3>
+<pre class="programlisting"> "secondaries" <span class="type">GSList_gchararray_</span>* : Read / Write</pre>
+<p>
+List of connection UUIDs that should be activated when the base connection
+itself is activated.
+</p>
+</div>
+<hr>
+<div class="refsect2">
<a name="NMSettingConnection--slave-type"></a><h3>The <code class="literal">"slave-type"</code> property</h3>
<pre class="programlisting"> "slave-type" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index f2522cdc2..d10521acb 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -297,7 +297,9 @@ the device may use when connecting to this network.
NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA = 0,
NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE = 1,
NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA = 2,
- NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3
+ NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3,
+ NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G = 4,
+ NM_SETTING_GSM_NETWORK_TYPE_4G = 5
} NMSettingGsmNetworkType;
</pre>
<p>
@@ -336,6 +338,18 @@ preferred but 2G-type technologies may be used as a fallback
preferred but 3G-type technologies may be used as a fallback
</td>
</tr>
+<tr>
+<td><p><a name="NM-SETTING-GSM-NETWORK-TYPE-PREFER-4G:CAPS"></a><span class="term"><code class="literal">NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G</code></span></p></td>
+<td>4G/LTE-type technologies are
+preferred but 3G/2/-type technologies may be used as a fallback
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-GSM-NETWORK-TYPE-4G:CAPS"></a><span class="term"><code class="literal">NM_SETTING_GSM_NETWORK_TYPE_4G</code></span></p></td>
+<td>only 4G/LTE type
+technologies may be used
+</td>
+</tr>
</tbody>
</table></div>
</div>
@@ -746,7 +760,7 @@ technologies. Permitted values are those specified by
<a class="link" href="NMSettingGsm.html#NMSettingGsmNetworkType"><span class="type">NMSettingGsmNetworkType</span></a>. Note that not all devices allow network
preference control.
</p>
-<p>Allowed values: [G_MAXULONG,3]</p>
+<p>Allowed values: [G_MAXULONG,5]</p>
<p>Default value: -1</p>
</div>
<hr>
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index 1f9e666b0..df6762afd 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -1675,7 +1675,7 @@ either automatic or disabled with these methods.
<pre class="programlisting"> "dhcp-client-id" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
A string sent to the DHCP server to identify the local machine which the
-DHCP server may use to cusomize the DHCP lease and options.
+DHCP server may use to customize the DHCP lease and options.
</p>
<p>Default value: NULL</p>
</div>
@@ -1710,7 +1710,7 @@ the current persistent hostname of the computer is sent.
List of DNS servers (network byte order). For the 'auto' method, these
DNS servers are appended to those (if any) returned by automatic
configuration. DNS servers cannot be used with the 'shared', 'link-local',
-or 'disabled' methods as there is no usptream network. In all other
+or 'disabled' methods as there is no upstream network. In all other
methods, these DNS servers are used as the only DNS servers for this
connection.
</p>
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index b053bd279..b467336f4 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -51,6 +51,7 @@ typedef <a class="link" href="NMSettingIP6Config.html#NMIP6Route">NM
enum <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigError-enum" title="enum NMSettingIP6ConfigError">NMSettingIP6ConfigError</a>;
enum <a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigPrivacy-enum" title="enum NMSettingIP6ConfigPrivacy">NMSettingIP6ConfigPrivacy</a>;
#define <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ADDRESSES:CAPS" title="NM_SETTING_IP6_CONFIG_ADDRESSES">NM_SETTING_IP6_CONFIG_ADDRESSES</a>
+#define <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-DHCP-HOSTNAME:CAPS" title="NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME">NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME</a>
#define <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-DNS:CAPS" title="NM_SETTING_IP6_CONFIG_DNS">NM_SETTING_IP6_CONFIG_DNS</a>
#define <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-DNS-SEARCH:CAPS" title="NM_SETTING_IP6_CONFIG_DNS_SEARCH">NM_SETTING_IP6_CONFIG_DNS_SEARCH</a>
#define <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR:CAPS" title="NM_SETTING_IP6_CONFIG_ERROR">NM_SETTING_IP6_CONFIG_ERROR</a>
@@ -119,6 +120,8 @@ const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="N
<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-error-quark" title="nm_setting_ip6_config_error_quark ()">nm_setting_ip6_config_error_quark</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
<a class="link" href="NMSettingIP6Config.html#NMIP6Address"><span class="returnvalue">NMIP6Address</span></a> * <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-address" title="nm_setting_ip6_config_get_address ()">nm_setting_ip6_config_get_address</a> (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
+const <span class="returnvalue">char</span> * <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-dhcp-hostname" title="nm_setting_ip6_config_get_dhcp_hostname ()">nm_setting_ip6_config_get_dhcp_hostname</a>
+ (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);
const struct <span class="returnvalue">in6_addr</span> * <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-dns" title="nm_setting_ip6_config_get_dns ()">nm_setting_ip6_config_get_dns</a> (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);
const <span class="returnvalue">char</span> * <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-dns-search" title="nm_setting_ip6_config_get_dns_search ()">nm_setting_ip6_config_get_dns_search</a>
@@ -184,6 +187,7 @@ const <span class="returnvalue">char</span> * <a class="link" href="NMSet
<a name="NMSettingIP6Config.properties"></a><h2>Properties</h2>
<pre class="synopsis">
"<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--addresses" title='The "addresses" property'>addresses</a>" <span class="type">GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*</span> : Read / Write
+ "<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--dhcp-hostname" title='The "dhcp-hostname" property'>dhcp-hostname</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
"<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--dns" title='The "dns" property'>dns</a>" <span class="type">GPtrArray_GArray_guchar__</span>* : Read / Write
"<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--dns-search" title='The "dns-search" property'>dns-search</a>" <span class="type">GSList_gchararray_</span>* : Read / Write
"<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--ignore-auto-dns" title='The "ignore-auto-dns" property'>ignore-auto-dns</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write / Construct
@@ -332,6 +336,14 @@ are enabled and temporary addresses are preferred over public addresses
</div>
<hr>
<div class="refsect2">
+<a name="NM-SETTING-IP6-CONFIG-DHCP-HOSTNAME:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME</h3>
+<pre class="programlisting">#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME "dhcp-hostname"
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
<a name="NM-SETTING-IP6-CONFIG-DNS:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_DNS</h3>
<pre class="programlisting">#define NM_SETTING_IP6_CONFIG_DNS "dns"
</pre>
@@ -1227,6 +1239,30 @@ Registers an error quark for <a class="link" href="NMSettingIP6Config.html" titl
</div>
<hr>
<div class="refsect2">
+<a name="nm-setting-ip6-config-get-dhcp-hostname"></a><h3>nm_setting_ip6_config_get_dhcp_hostname ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_ip6_config_get_dhcp_hostname
+ (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
+<p>
+Returns the value contained in the <a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--dhcp-hostname" title='The "dhcp-hostname" property'><span class="type">"dhcp-hostname"</span></a>
+property.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td>
+<td>the <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the configured hostname to send to the DHCP server</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
<a name="nm-setting-ip6-config-get-dns"></a><h3>nm_setting_ip6_config_get_dns ()</h3>
<pre class="programlisting">const struct <span class="returnvalue">in6_addr</span> * nm_setting_ip6_config_get_dns (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> i</code></em>);</pre>
@@ -1657,6 +1693,15 @@ assigned an address with these methods.
</div>
<hr>
<div class="refsect2">
+<a name="NMSettingIP6Config--dhcp-hostname"></a><h3>The <code class="literal">"dhcp-hostname"</code> property</h3>
+<pre class="programlisting"> "dhcp-hostname" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
+<p>
+The specified name will be sent to the DHCP server when acquiring a lease.
+</p>
+<p>Default value: NULL</p>
+</div>
+<hr>
+<div class="refsect2">
<a name="NMSettingIP6Config--dns"></a><h3>The <code class="literal">"dns"</code> property</h3>
<pre class="programlisting"> "dns" <span class="type">GPtrArray_GArray_guchar__</span>* : Read / Write</pre>
<p>
diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index a208bff1e..03755208b 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="libnm-util Reference Manual">
<link rel="up" href="ch01.html" title="libnm-util API Reference">
-<link rel="prev" href="NMSettingBond.html" title="NMSettingBond">
+<link rel="prev" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
<link rel="next" href="NMSettingVlan.html" title="NMSettingVlan">
<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
@@ -14,7 +14,7 @@
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
<tr valign="middle">
-<td><a accesskey="p" href="NMSettingBond.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="NMSettingBridgePort.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">libnm-util Reference Manual</th>
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index 013c31f1c..b1edb3ad2 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -152,7 +152,8 @@ necessary for connection to VLAN interfaces.
<pre class="programlisting">typedef enum {
NM_SETTING_VLAN_ERROR_UNKNOWN = 0, /*&lt; nick=Unknown &gt;*/
NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, /*&lt; nick=InvalidProperty &gt;*/
- NM_SETTING_VLAN_ERROR_MISSING_PROPERTY /*&lt; nick=MissingProperty &gt;*/
+ NM_SETTING_VLAN_ERROR_MISSING_PROPERTY, /*&lt; nick=MissingProperty &gt;*/
+ NM_SETTING_VLAN_ERROR_INVALID_PARENT /*&lt; nick=InvalidParent &gt;*/
} NMSettingVlanError;
</pre>
<div class="variablelist"><table border="0">
@@ -171,7 +172,13 @@ necessary for connection to VLAN interfaces.
<tr>
<td><p><a name="NM-SETTING-VLAN-ERROR-MISSING-PROPERTY:CAPS"></a><span class="term"><code class="literal">NM_SETTING_VLAN_ERROR_MISSING_PROPERTY</code></span></p></td>
<td>the property was missing and is
-required
+ required
+</td>
+</tr>
+<tr>
+<td><p><a name="NM-SETTING-VLAN-ERROR-INVALID-PARENT:CAPS"></a><span class="term"><code class="literal">NM_SETTING_VLAN_ERROR_INVALID_PARENT</code></span></p></td>
+<td>the VLAN parent was specified
+ inconsistently
</td>
</tr>
</tbody>
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 85e17c1db..e3d964a4a 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -57,6 +57,7 @@ enum <a class="link" href="NMSettingWireless.html#NMSettingWirele
#define <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MAC-ADDRESS-BLACKLIST:CAPS" title="NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST">NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST</a>
#define <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE:CAPS" title="NM_SETTING_WIRELESS_MODE">NM_SETTING_WIRELESS_MODE</a>
#define <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS" title="NM_SETTING_WIRELESS_MODE_ADHOC">NM_SETTING_WIRELESS_MODE_ADHOC</a>
+#define <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-AP:CAPS" title="NM_SETTING_WIRELESS_MODE_AP">NM_SETTING_WIRELESS_MODE_AP</a>
#define <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS" title="NM_SETTING_WIRELESS_MODE_INFRA">NM_SETTING_WIRELESS_MODE_INFRA</a>
#define <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS" title="NM_SETTING_WIRELESS_MTU">NM_SETTING_WIRELESS_MTU</a>
#define <a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-RATE:CAPS" title="NM_SETTING_WIRELESS_RATE">NM_SETTING_WIRELESS_RATE</a>
@@ -287,6 +288,16 @@ Indicates Ad-Hoc mode where no access point is expected to be present.
</div>
<hr>
<div class="refsect2">
+<a name="NM-SETTING-WIRELESS-MODE-AP:CAPS"></a><h3>NM_SETTING_WIRELESS_MODE_AP</h3>
+<pre class="programlisting">#define NM_SETTING_WIRELESS_MODE_AP "ap"
+</pre>
+<p>
+Indicates AP/master mode where the wireless device is started as an access
+point/hotspot.
+</p>
+</div>
+<hr>
+<div class="refsect2">
<a name="NM-SETTING-WIRELESS-MODE-INFRA:CAPS"></a><h3>NM_SETTING_WIRELESS_MODE_INFRA</h3>
<pre class="programlisting">#define NM_SETTING_WIRELESS_MODE_INFRA "infrastructure"
</pre>
@@ -357,9 +368,10 @@ for this connection.
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_setting_wireless_add_seen_bssid (<em class="parameter"><code><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> *setting</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *bssid</code></em>);</pre>
<p>
-Adds a new WiFi AP's BSSID to the previously seen BSSID list of the setting.
-NetworkManager tracks previously seen BSSIDs internally so this function
-no longer has much use.
+Adds a new Wi-Fi AP's BSSID to the previously seen BSSID list of the setting.
+NetworkManager now tracks previously seen BSSIDs internally so this function
+no longer has much use. Actually, changes you make using this function will
+not be preserved.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
@@ -853,7 +865,7 @@ MAC address is in the standard hex-digits-and-colons notation.
<a name="NMSettingWireless--mode"></a><h3>The <code class="literal">"mode"</code> property</h3>
<pre class="programlisting"> "mode" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
<p>
-WiFi network mode; one of 'infrastructure' or 'adhoc'. If blank,
+WiFi network mode; one of 'infrastructure', 'adhoc' or 'ap'. If blank,
infrastructure is assumed.
</p>
<p>Default value: NULL</p>
@@ -897,9 +909,10 @@ the connection contains a valid 802-11-wireless-security setting.
<pre class="programlisting"> "seen-bssids" <span class="type">GSList_gchararray_</span>* : Read / Write</pre>
<p>
A list of BSSIDs (each BSSID formatted as a MAC address like
-'00:11:22:33:44:55') that have been detected as part of the WiFI network.
-NetworkManager internally tracks previously seen BSSIDs so this property
-is no longer of much use.
+'00:11:22:33:44:55') that have been detected as part of the Wi-FI network.
+NetworkManager internally tracks previously seen BSSIDs. The property is only
+meant for reading and reflects the BBSID list of NetworkManager. The changes you
+make to this property will not be preserved.
</p>
</div>
<hr>
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 2e5d124d0..807aea99c 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -135,6 +135,14 @@
</dt>
<dd></dd>
<dt>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-bridge" title="nm_connection_get_setting_bridge ()">nm_connection_get_setting_bridge</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-bridge-port" title="nm_connection_get_setting_bridge_port ()">nm_connection_get_setting_bridge_port</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()">nm_connection_get_setting_by_name</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
</dt>
<dd></dd>
@@ -701,6 +709,70 @@
</dt>
<dd></dd>
<dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridge-struct" title="NMSettingBridge">NMSettingBridge</a>, struct in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridge--ageing-time" title='The "ageing-time" property'>NMSettingBridge:ageing-time</a>, object property in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridge--forward-delay" title='The "forward-delay" property'>NMSettingBridge:forward-delay</a>, object property in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridge--hello-time" title='The "hello-time" property'>NMSettingBridge:hello-time</a>, object property in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridge--interface-name" title='The "interface-name" property'>NMSettingBridge:interface-name</a>, object property in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridge--max-age" title='The "max-age" property'>NMSettingBridge:max-age</a>, object property in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridge--priority" title='The "priority" property'>NMSettingBridge:priority</a>, object property in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridge--stp" title='The "stp" property'>NMSettingBridge:stp</a>, object property in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridgeClass" title="NMSettingBridgeClass">NMSettingBridgeClass</a>, struct in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridgeError-enum" title="enum NMSettingBridgeError">NMSettingBridgeError</a>, enum in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort-struct" title="NMSettingBridgePort">NMSettingBridgePort</a>, struct in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode" title='The "hairpin-mode" property'>NMSettingBridgePort:hairpin-mode</a>, object property in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--path-cost" title='The "path-cost" property'>NMSettingBridgePort:path-cost</a>, object property in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--priority" title='The "priority" property'>NMSettingBridgePort:priority</a>, object property in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#NMSettingBridgePortClass" title="NMSettingBridgePortClass">NMSettingBridgePortClass</a>, struct in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#NMSettingBridgePortError-enum" title="enum NMSettingBridgePortError">NMSettingBridgePortError</a>, enum in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="NMSettingCdma.html#NMSettingCdma-struct" title="NMSettingCdma">NMSettingCdma</a>, struct in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
</dt>
<dd></dd>
@@ -765,6 +837,10 @@
</dt>
<dd></dd>
<dt>
+<a class="link" href="NMSettingConnection.html#NMSettingConnection--secondaries" title='The "secondaries" property'>NMSettingConnection:secondaries</a>, object property in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="NMSettingConnection.html#NMSettingConnection--slave-type" title='The "slave-type" property'>NMSettingConnection:slave-type</a>, object property in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
</dt>
<dd></dd>
@@ -961,6 +1037,10 @@
</dt>
<dd></dd>
<dt>
+<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--dhcp-hostname" title='The "dhcp-hostname" property'>NMSettingIP6Config:dhcp-hostname</a>, object property in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--dns" title='The "dns" property'>NMSettingIP6Config:dns</a>, object property in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
</dt>
<dd></dd>
@@ -2085,6 +2165,118 @@
</dt>
<dd></dd>
<dt>
+<a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-AGEING-TIME:CAPS" title="NM_SETTING_BRIDGE_AGEING_TIME">NM_SETTING_BRIDGE_AGEING_TIME</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR:CAPS" title="NM_SETTING_BRIDGE_ERROR">NM_SETTING_BRIDGE_ERROR</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-error-quark" title="nm_setting_bridge_error_quark ()">nm_setting_bridge_error_quark</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-FORWARD-DELAY:CAPS" title="NM_SETTING_BRIDGE_FORWARD_DELAY">NM_SETTING_BRIDGE_FORWARD_DELAY</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-ageing-time" title="nm_setting_bridge_get_ageing_time ()">nm_setting_bridge_get_ageing_time</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-forward-delay" title="nm_setting_bridge_get_forward_delay ()">nm_setting_bridge_get_forward_delay</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-hello-time" title="nm_setting_bridge_get_hello_time ()">nm_setting_bridge_get_hello_time</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-interface-name" title="nm_setting_bridge_get_interface_name ()">nm_setting_bridge_get_interface_name</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-max-age" title="nm_setting_bridge_get_max_age ()">nm_setting_bridge_get_max_age</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-priority" title="nm_setting_bridge_get_priority ()">nm_setting_bridge_get_priority</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-stp" title="nm_setting_bridge_get_stp ()">nm_setting_bridge_get_stp</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-HELLO-TIME:CAPS" title="NM_SETTING_BRIDGE_HELLO_TIME">NM_SETTING_BRIDGE_HELLO_TIME</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-INTERFACE-NAME:CAPS" title="NM_SETTING_BRIDGE_INTERFACE_NAME">NM_SETTING_BRIDGE_INTERFACE_NAME</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-MAX-AGE:CAPS" title="NM_SETTING_BRIDGE_MAX_AGE">NM_SETTING_BRIDGE_MAX_AGE</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-new" title="nm_setting_bridge_new ()">nm_setting_bridge_new</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR:CAPS" title="NM_SETTING_BRIDGE_PORT_ERROR">NM_SETTING_BRIDGE_PORT_ERROR</a>, macro in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-error-quark" title="nm_setting_bridge_port_error_quark ()">nm_setting_bridge_port_error_quark</a>, function in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-get-hairpin-mode" title="nm_setting_bridge_port_get_hairpin_mode ()">nm_setting_bridge_port_get_hairpin_mode</a>, function in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-get-path-cost" title="nm_setting_bridge_port_get_path_cost ()">nm_setting_bridge_port_get_path_cost</a>, function in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-get-priority" title="nm_setting_bridge_port_get_priority ()">nm_setting_bridge_port_get_priority</a>, function in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS" title="NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE">NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE</a>, macro in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-new" title="nm_setting_bridge_port_new ()">nm_setting_bridge_port_new</a>, function in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS" title="NM_SETTING_BRIDGE_PORT_PATH_COST">NM_SETTING_BRIDGE_PORT_PATH_COST</a>, macro in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS" title="NM_SETTING_BRIDGE_PORT_PRIORITY">NM_SETTING_BRIDGE_PORT_PRIORITY</a>, macro in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS" title="NM_SETTING_BRIDGE_PORT_SETTING_NAME">NM_SETTING_BRIDGE_PORT_SETTING_NAME</a>, macro in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-PRIORITY:CAPS" title="NM_SETTING_BRIDGE_PRIORITY">NM_SETTING_BRIDGE_PRIORITY</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-SETTING-NAME:CAPS" title="NM_SETTING_BRIDGE_SETTING_NAME">NM_SETTING_BRIDGE_SETTING_NAME</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-STP:CAPS" title="NM_SETTING_BRIDGE_STP">NM_SETTING_BRIDGE_STP</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-ERROR:CAPS" title="NM_SETTING_CDMA_ERROR">NM_SETTING_CDMA_ERROR</a>, macro in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
</dt>
<dd></dd>
@@ -2149,6 +2341,10 @@
</dt>
<dd></dd>
<dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-add-secondary" title="nm_setting_connection_add_secondary ()">nm_setting_connection_add_secondary</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-AUTOCONNECT:CAPS" title="NM_SETTING_CONNECTION_AUTOCONNECT">NM_SETTING_CONNECTION_AUTOCONNECT</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
</dt>
<dd></dd>
@@ -2181,6 +2377,10 @@
</dt>
<dd></dd>
<dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-num-secondaries" title="nm_setting_connection_get_num_secondaries ()">nm_setting_connection_get_num_secondaries</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-permission" title="nm_setting_connection_get_permission ()">nm_setting_connection_get_permission</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
</dt>
<dd></dd>
@@ -2189,6 +2389,10 @@
</dt>
<dd></dd>
<dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-secondary" title="nm_setting_connection_get_secondary ()">nm_setting_connection_get_secondary</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-slave-type" title="nm_setting_connection_get_slave_type ()">nm_setting_connection_get_slave_type</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
</dt>
<dd></dd>
@@ -2237,6 +2441,14 @@
</dt>
<dd></dd>
<dt>
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-remove-secondary" title="nm_setting_connection_remove_secondary ()">nm_setting_connection_remove_secondary</a>, function in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-SECONDARIES:CAPS" title="NM_SETTING_CONNECTION_SECONDARIES">NM_SETTING_CONNECTION_SECONDARIES</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS" title="NM_SETTING_CONNECTION_SETTING_NAME">NM_SETTING_CONNECTION_SETTING_NAME</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
</dt>
<dd></dd>
@@ -2669,6 +2881,10 @@
</dt>
<dd></dd>
<dt>
+<a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-DHCP-HOSTNAME:CAPS" title="NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME">NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME</a>, macro in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-DNS:CAPS" title="NM_SETTING_IP6_CONFIG_DNS">NM_SETTING_IP6_CONFIG_DNS</a>, macro in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
</dt>
<dd></dd>
@@ -2689,6 +2905,10 @@
</dt>
<dd></dd>
<dt>
+<a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-dhcp-hostname" title="nm_setting_ip6_config_get_dhcp_hostname ()">nm_setting_ip6_config_get_dhcp_hostname</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-dns" title="nm_setting_ip6_config_get_dns ()">nm_setting_ip6_config_get_dns</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
</dt>
<dd></dd>
@@ -3093,6 +3313,10 @@
</dt>
<dd></dd>
<dt>
+NM_SETTING_REGISTER_TYPE, macro in nm-setting-private
+</dt>
+<dd></dd>
+<dt>
NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
</dt>
<dd></dd>
@@ -3597,6 +3821,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
</dt>
<dd></dd>
<dt>
+<a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-AP:CAPS" title="NM_SETTING_WIRELESS_MODE_AP">NM_SETTING_WIRELESS_MODE_AP</a>, macro in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS" title="NM_SETTING_WIRELESS_MODE_INFRA">NM_SETTING_WIRELESS_MODE_INFRA</a>, macro in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
</dt>
<dd></dd>
@@ -3830,6 +4058,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
</dt>
<dd></dd>
<dt>
+<a class="link" href="libnm-util-nm-utils.html#nm-utils-ap-mode-security-valid" title="nm_utils_ap_mode_security_valid ()">nm_utils_ap_mode_security_valid</a>, function in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="libnm-util-nm-utils.html#nm-utils-deinit" title="nm_utils_deinit ()">nm_utils_deinit</a>, function in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
</dt>
<dd></dd>
@@ -3870,6 +4102,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
</dt>
<dd></dd>
<dt>
+<a class="link" href="libnm-util-nm-utils.html#nm-utils-iface-valid-name" title="nm_utils_iface_valid_name ()">nm_utils_iface_valid_name</a>, function in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="libnm-util-nm-utils.html#nm-utils-init" title="nm_utils_init ()">nm_utils_init</a>, function in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
</dt>
<dd></dd>
@@ -3930,6 +4166,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
</dt>
<dd></dd>
<dt>
+<a class="link" href="libnm-util-nm-utils.html#nm-utils-is-uuid" title="nm_utils_is_uuid ()">nm_utils_is_uuid</a>, function in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="libnm-util-nm-utils.html#nm-utils-rsa-key-encrypt" title="nm_utils_rsa_key_encrypt ()">nm_utils_rsa_key_encrypt</a>, function in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
</dt>
<dd></dd>
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index c3f6cd8ef..cba034e17 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp2695408"></a>libnm-util API Reference</h2></div></div></div>
+<a name="idp3785600"></a>libnm-util API Reference</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="NMConnection.html">NMConnection</a></span><span class="refpurpose"> — Describes a connection to specific network or provider</span>
@@ -62,6 +62,12 @@ serial communications</span>
<span class="refentrytitle"><a href="NMSettingBond.html">NMSettingBond</a></span><span class="refpurpose"> — Describes connection properties for bonds</span>
</dt>
<dt>
+<span class="refentrytitle"><a href="NMSettingBridge.html">NMSettingBridge</a></span><span class="refpurpose"> — Describes connection properties for bridges</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="NMSettingBridgePort.html">NMSettingBridgePort</a></span><span class="refpurpose"> — Describes connection properties for bridge ports</span>
+</dt>
+<dt>
<span class="refentrytitle"><a href="NMSettingInfiniband.html">NMSettingInfiniband</a></span><span class="refpurpose"> — Describes connection properties for IP-over-InfiniBand networks</span>
</dt>
<dt>
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 9273a726f..1da1ad014 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,14 +15,14 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-util Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- for libnm-util 0.9.6.4
+ for libnm-util 0.9.7.995
The latest version of this documentation can be found on-line at
<a class="ulink" href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/" target="_top">http://projects.gnome.org/NetworkManager/developers/libnm-util/09/</a>.
</p></div>
<div><p class="copyright">Copyright © 2012 The NetworkManager Authors</p></div>
<div><div class="legalnotice">
-<a name="idp2010352"></a><p>
+<a name="idp3543120"></a><p>
Permission is granted to copy, distribute and/or modify this
document under the terms of the <em class="citetitle">GNU Free
Documentation License</em>, Version 1.1 or any later
@@ -88,6 +88,12 @@ serial communications</span>
<span class="refentrytitle"><a href="NMSettingBond.html">NMSettingBond</a></span><span class="refpurpose"> — Describes connection properties for bonds</span>
</dt>
<dt>
+<span class="refentrytitle"><a href="NMSettingBridge.html">NMSettingBridge</a></span><span class="refpurpose"> — Describes connection properties for bridges</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="NMSettingBridgePort.html">NMSettingBridgePort</a></span><span class="refpurpose"> — Describes connection properties for bridge ports</span>
+</dt>
+<dt>
<span class="refentrytitle"><a href="NMSettingInfiniband.html">NMSettingInfiniband</a></span><span class="refpurpose"> — Describes connection properties for IP-over-InfiniBand networks</span>
</dt>
<dt>
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index 2fa04eafc..330e08a9b 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -33,6 +33,8 @@
<ANCHOR id="nm-connection-get-setting-adsl" href="libnm-util/NMConnection.html#nm-connection-get-setting-adsl">
<ANCHOR id="nm-connection-get-setting-bluetooth" href="libnm-util/NMConnection.html#nm-connection-get-setting-bluetooth">
<ANCHOR id="nm-connection-get-setting-bond" href="libnm-util/NMConnection.html#nm-connection-get-setting-bond">
+<ANCHOR id="nm-connection-get-setting-bridge" href="libnm-util/NMConnection.html#nm-connection-get-setting-bridge">
+<ANCHOR id="nm-connection-get-setting-bridge-port" href="libnm-util/NMConnection.html#nm-connection-get-setting-bridge-port">
<ANCHOR id="nm-connection-get-setting-by-name" href="libnm-util/NMConnection.html#nm-connection-get-setting-by-name">
<ANCHOR id="nm-connection-get-setting-cdma" href="libnm-util/NMConnection.html#nm-connection-get-setting-cdma">
<ANCHOR id="nm-connection-get-setting-connection" href="libnm-util/NMConnection.html#nm-connection-get-setting-connection">
@@ -155,6 +157,7 @@
<ANCHOR id="NM-SETTING-CONNECTION-MASTER:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-MASTER:CAPS">
<ANCHOR id="NM-SETTING-CONNECTION-PERMISSIONS:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-PERMISSIONS:CAPS">
<ANCHOR id="NM-SETTING-CONNECTION-READ-ONLY:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-READ-ONLY:CAPS">
+<ANCHOR id="NM-SETTING-CONNECTION-SECONDARIES:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-SECONDARIES:CAPS">
<ANCHOR id="NM-SETTING-CONNECTION-SETTING-NAME:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS">
<ANCHOR id="NM-SETTING-CONNECTION-SLAVE-TYPE:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-SLAVE-TYPE:CAPS">
<ANCHOR id="NM-SETTING-CONNECTION-TIMESTAMP:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-TIMESTAMP:CAPS">
@@ -162,14 +165,17 @@
<ANCHOR id="NM-SETTING-CONNECTION-UUID:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-UUID:CAPS">
<ANCHOR id="NM-SETTING-CONNECTION-ZONE:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE:CAPS">
<ANCHOR id="nm-setting-connection-add-permission" href="libnm-util/NMSettingConnection.html#nm-setting-connection-add-permission">
+<ANCHOR id="nm-setting-connection-add-secondary" href="libnm-util/NMSettingConnection.html#nm-setting-connection-add-secondary">
<ANCHOR id="nm-setting-connection-error-quark" href="libnm-util/NMSettingConnection.html#nm-setting-connection-error-quark">
<ANCHOR id="nm-setting-connection-get-autoconnect" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-autoconnect">
<ANCHOR id="nm-setting-connection-get-connection-type" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-connection-type">
<ANCHOR id="nm-setting-connection-get-id" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-id">
<ANCHOR id="nm-setting-connection-get-master" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-master">
<ANCHOR id="nm-setting-connection-get-num-permissions" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-num-permissions">
+<ANCHOR id="nm-setting-connection-get-num-secondaries" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-num-secondaries">
<ANCHOR id="nm-setting-connection-get-permission" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-permission">
<ANCHOR id="nm-setting-connection-get-read-only" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-read-only">
+<ANCHOR id="nm-setting-connection-get-secondary" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-secondary">
<ANCHOR id="nm-setting-connection-get-slave-type" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-slave-type">
<ANCHOR id="nm-setting-connection-get-timestamp" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-timestamp">
<ANCHOR id="nm-setting-connection-get-uuid" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-uuid">
@@ -178,12 +184,14 @@
<ANCHOR id="nm-setting-connection-new" href="libnm-util/NMSettingConnection.html#nm-setting-connection-new">
<ANCHOR id="nm-setting-connection-permissions-user-allowed" href="libnm-util/NMSettingConnection.html#nm-setting-connection-permissions-user-allowed">
<ANCHOR id="nm-setting-connection-remove-permission" href="libnm-util/NMSettingConnection.html#nm-setting-connection-remove-permission">
+<ANCHOR id="nm-setting-connection-remove-secondary" href="libnm-util/NMSettingConnection.html#nm-setting-connection-remove-secondary">
<ANCHOR id="NMSettingConnection.property-details" href="libnm-util/NMSettingConnection.html#NMSettingConnection.property-details">
<ANCHOR id="NMSettingConnection--autoconnect" href="libnm-util/NMSettingConnection.html#NMSettingConnection--autoconnect">
<ANCHOR id="NMSettingConnection--id" href="libnm-util/NMSettingConnection.html#NMSettingConnection--id">
<ANCHOR id="NMSettingConnection--master" href="libnm-util/NMSettingConnection.html#NMSettingConnection--master">
<ANCHOR id="NMSettingConnection--permissions" href="libnm-util/NMSettingConnection.html#NMSettingConnection--permissions">
<ANCHOR id="NMSettingConnection--read-only" href="libnm-util/NMSettingConnection.html#NMSettingConnection--read-only">
+<ANCHOR id="NMSettingConnection--secondaries" href="libnm-util/NMSettingConnection.html#NMSettingConnection--secondaries">
<ANCHOR id="NMSettingConnection--slave-type" href="libnm-util/NMSettingConnection.html#NMSettingConnection--slave-type">
<ANCHOR id="NMSettingConnection--timestamp" href="libnm-util/NMSettingConnection.html#NMSettingConnection--timestamp">
<ANCHOR id="NMSettingConnection--type" href="libnm-util/NMSettingConnection.html#NMSettingConnection--type">
@@ -269,6 +277,7 @@
<ANCHOR id="NM-SETTING-WIRELESS-MAC-ADDRESS-BLACKLIST:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-MAC-ADDRESS-BLACKLIST:CAPS">
<ANCHOR id="NM-SETTING-WIRELESS-MODE:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-MODE:CAPS">
<ANCHOR id="NM-SETTING-WIRELESS-MODE-ADHOC:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS">
+<ANCHOR id="NM-SETTING-WIRELESS-MODE-AP:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-AP:CAPS">
<ANCHOR id="NM-SETTING-WIRELESS-MODE-INFRA:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS">
<ANCHOR id="NM-SETTING-WIRELESS-MTU:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS">
<ANCHOR id="NM-SETTING-WIRELESS-RATE:CAPS" href="libnm-util/NMSettingWireless.html#NM-SETTING-WIRELESS-RATE:CAPS">
@@ -530,6 +539,8 @@
<ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE-GPRS-EDGE:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-GPRS-EDGE:CAPS">
<ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE-PREFER-UMTS-HSPA:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-UMTS-HSPA:CAPS">
<ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE-PREFER-GPRS-EDGE:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-GPRS-EDGE:CAPS">
+<ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE-PREFER-4G:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-4G:CAPS">
+<ANCHOR id="NM-SETTING-GSM-NETWORK-TYPE-4G:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-4G:CAPS">
<ANCHOR id="NM-SETTING-GSM-ALLOWED-BANDS:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-ALLOWED-BANDS:CAPS">
<ANCHOR id="NM-SETTING-GSM-APN:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-APN:CAPS">
<ANCHOR id="NM-SETTING-GSM-ERROR:CAPS" href="libnm-util/NMSettingGsm.html#NM-SETTING-GSM-ERROR:CAPS">
@@ -630,6 +641,72 @@
<ANCHOR id="NMSettingBond.property-details" href="libnm-util/NMSettingBond.html#NMSettingBond.property-details">
<ANCHOR id="NMSettingBond--interface-name" href="libnm-util/NMSettingBond.html#NMSettingBond--interface-name">
<ANCHOR id="NMSettingBond--options" href="libnm-util/NMSettingBond.html#NMSettingBond--options">
+<ANCHOR id="NMSettingBridge" href="libnm-util/NMSettingBridge.html">
+<ANCHOR id="NMSettingBridge.synopsis" href="libnm-util/NMSettingBridge.html#NMSettingBridge.synopsis">
+<ANCHOR id="NMSettingBridgeError" href="libnm-util/NMSettingBridge.html#NMSettingBridgeError">
+<ANCHOR id="NMSettingBridge.object-hierarchy" href="libnm-util/NMSettingBridge.html#NMSettingBridge.object-hierarchy">
+<ANCHOR id="NMSettingBridge.properties" href="libnm-util/NMSettingBridge.html#NMSettingBridge.properties">
+<ANCHOR id="NMSettingBridge.description" href="libnm-util/NMSettingBridge.html#NMSettingBridge.description">
+<ANCHOR id="NMSettingBridge.details" href="libnm-util/NMSettingBridge.html#NMSettingBridge.details">
+<ANCHOR id="NMSettingBridge-struct" href="libnm-util/NMSettingBridge.html#NMSettingBridge-struct">
+<ANCHOR id="NMSettingBridgeClass" href="libnm-util/NMSettingBridge.html#NMSettingBridgeClass">
+<ANCHOR id="NMSettingBridgeError-enum" href="libnm-util/NMSettingBridge.html#NMSettingBridgeError-enum">
+<ANCHOR id="NM-SETTING-BRIDGE-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-AGEING-TIME:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-AGEING-TIME:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-ERROR:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-FORWARD-DELAY:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-FORWARD-DELAY:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-HELLO-TIME:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-HELLO-TIME:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-INTERFACE-NAME:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-INTERFACE-NAME:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-MAX-AGE:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-MAX-AGE:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-PRIORITY:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-PRIORITY:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-SETTING-NAME:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-SETTING-NAME:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-STP:CAPS" href="libnm-util/NMSettingBridge.html#NM-SETTING-BRIDGE-STP:CAPS">
+<ANCHOR id="nm-setting-bridge-error-quark" href="libnm-util/NMSettingBridge.html#nm-setting-bridge-error-quark">
+<ANCHOR id="nm-setting-bridge-get-ageing-time" href="libnm-util/NMSettingBridge.html#nm-setting-bridge-get-ageing-time">
+<ANCHOR id="nm-setting-bridge-get-forward-delay" href="libnm-util/NMSettingBridge.html#nm-setting-bridge-get-forward-delay">
+<ANCHOR id="nm-setting-bridge-get-hello-time" href="libnm-util/NMSettingBridge.html#nm-setting-bridge-get-hello-time">
+<ANCHOR id="nm-setting-bridge-get-interface-name" href="libnm-util/NMSettingBridge.html#nm-setting-bridge-get-interface-name">
+<ANCHOR id="nm-setting-bridge-get-max-age" href="libnm-util/NMSettingBridge.html#nm-setting-bridge-get-max-age">
+<ANCHOR id="nm-setting-bridge-get-priority" href="libnm-util/NMSettingBridge.html#nm-setting-bridge-get-priority">
+<ANCHOR id="nm-setting-bridge-get-stp" href="libnm-util/NMSettingBridge.html#nm-setting-bridge-get-stp">
+<ANCHOR id="nm-setting-bridge-new" href="libnm-util/NMSettingBridge.html#nm-setting-bridge-new">
+<ANCHOR id="NMSettingBridge.property-details" href="libnm-util/NMSettingBridge.html#NMSettingBridge.property-details">
+<ANCHOR id="NMSettingBridge--ageing-time" href="libnm-util/NMSettingBridge.html#NMSettingBridge--ageing-time">
+<ANCHOR id="NMSettingBridge--forward-delay" href="libnm-util/NMSettingBridge.html#NMSettingBridge--forward-delay">
+<ANCHOR id="NMSettingBridge--hello-time" href="libnm-util/NMSettingBridge.html#NMSettingBridge--hello-time">
+<ANCHOR id="NMSettingBridge--interface-name" href="libnm-util/NMSettingBridge.html#NMSettingBridge--interface-name">
+<ANCHOR id="NMSettingBridge--max-age" href="libnm-util/NMSettingBridge.html#NMSettingBridge--max-age">
+<ANCHOR id="NMSettingBridge--priority" href="libnm-util/NMSettingBridge.html#NMSettingBridge--priority">
+<ANCHOR id="NMSettingBridge--stp" href="libnm-util/NMSettingBridge.html#NMSettingBridge--stp">
+<ANCHOR id="NMSettingBridgePort" href="libnm-util/NMSettingBridgePort.html">
+<ANCHOR id="NMSettingBridgePort.synopsis" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePort.synopsis">
+<ANCHOR id="NMSettingBridgePortError" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePortError">
+<ANCHOR id="NMSettingBridgePort.object-hierarchy" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePort.object-hierarchy">
+<ANCHOR id="NMSettingBridgePort.properties" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePort.properties">
+<ANCHOR id="NMSettingBridgePort.description" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePort.description">
+<ANCHOR id="NMSettingBridgePort.details" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePort.details">
+<ANCHOR id="NMSettingBridgePort-struct" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePort-struct">
+<ANCHOR id="NMSettingBridgePortClass" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePortClass">
+<ANCHOR id="NMSettingBridgePortError-enum" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePortError-enum">
+<ANCHOR id="NM-SETTING-BRIDGE-PORT-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-PORT-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR-INVALID-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-PORT-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-PORT-ERROR:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS">
+<ANCHOR id="NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS" href="libnm-util/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS">
+<ANCHOR id="nm-setting-bridge-port-error-quark" href="libnm-util/NMSettingBridgePort.html#nm-setting-bridge-port-error-quark">
+<ANCHOR id="nm-setting-bridge-port-get-hairpin-mode" href="libnm-util/NMSettingBridgePort.html#nm-setting-bridge-port-get-hairpin-mode">
+<ANCHOR id="nm-setting-bridge-port-get-path-cost" href="libnm-util/NMSettingBridgePort.html#nm-setting-bridge-port-get-path-cost">
+<ANCHOR id="nm-setting-bridge-port-get-priority" href="libnm-util/NMSettingBridgePort.html#nm-setting-bridge-port-get-priority">
+<ANCHOR id="nm-setting-bridge-port-new" href="libnm-util/NMSettingBridgePort.html#nm-setting-bridge-port-new">
+<ANCHOR id="NMSettingBridgePort.property-details" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePort.property-details">
+<ANCHOR id="NMSettingBridgePort--hairpin-mode" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode">
+<ANCHOR id="NMSettingBridgePort--path-cost" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePort--path-cost">
+<ANCHOR id="NMSettingBridgePort--priority" href="libnm-util/NMSettingBridgePort.html#NMSettingBridgePort--priority">
<ANCHOR id="NMSettingInfiniband" href="libnm-util/NMSettingInfiniband.html">
<ANCHOR id="NMSettingInfiniband.synopsis" href="libnm-util/NMSettingInfiniband.html#NMSettingInfiniband.synopsis">
<ANCHOR id="NMSettingInfinibandError" href="libnm-util/NMSettingInfiniband.html#NMSettingInfinibandError">
@@ -672,6 +749,7 @@
<ANCHOR id="NM-SETTING-VLAN-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-ERROR-UNKNOWN:CAPS">
<ANCHOR id="NM-SETTING-VLAN-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-ERROR-INVALID-PROPERTY:CAPS">
<ANCHOR id="NM-SETTING-VLAN-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-ERROR-MISSING-PROPERTY:CAPS">
+<ANCHOR id="NM-SETTING-VLAN-ERROR-INVALID-PARENT:CAPS" href="libnm-util/NMSettingVlan.html#NM-SETTING-VLAN-ERROR-INVALID-PARENT:CAPS">
<ANCHOR id="NMVlanFlags-enum" href="libnm-util/NMSettingVlan.html#NMVlanFlags-enum">
<ANCHOR id="NM-VLAN-FLAG-REORDER-HEADERS:CAPS" href="libnm-util/NMSettingVlan.html#NM-VLAN-FLAG-REORDER-HEADERS:CAPS">
<ANCHOR id="NM-VLAN-FLAG-GVRP:CAPS" href="libnm-util/NMSettingVlan.html#NM-VLAN-FLAG-GVRP:CAPS">
@@ -1061,6 +1139,7 @@
<ANCHOR id="NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-PUBLIC-ADDR:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-PUBLIC-ADDR:CAPS">
<ANCHOR id="NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-TEMP-ADDR:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-TEMP-ADDR:CAPS">
<ANCHOR id="NM-SETTING-IP6-CONFIG-ADDRESSES:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ADDRESSES:CAPS">
+<ANCHOR id="NM-SETTING-IP6-CONFIG-DHCP-HOSTNAME:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-DHCP-HOSTNAME:CAPS">
<ANCHOR id="NM-SETTING-IP6-CONFIG-DNS:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-DNS:CAPS">
<ANCHOR id="NM-SETTING-IP6-CONFIG-DNS-SEARCH:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-DNS-SEARCH:CAPS">
<ANCHOR id="NM-SETTING-IP6-CONFIG-ERROR:CAPS" href="libnm-util/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR:CAPS">
@@ -1112,6 +1191,7 @@
<ANCHOR id="nm-setting-ip6-config-clear-routes" href="libnm-util/NMSettingIP6Config.html#nm-setting-ip6-config-clear-routes">
<ANCHOR id="nm-setting-ip6-config-error-quark" href="libnm-util/NMSettingIP6Config.html#nm-setting-ip6-config-error-quark">
<ANCHOR id="nm-setting-ip6-config-get-address" href="libnm-util/NMSettingIP6Config.html#nm-setting-ip6-config-get-address">
+<ANCHOR id="nm-setting-ip6-config-get-dhcp-hostname" href="libnm-util/NMSettingIP6Config.html#nm-setting-ip6-config-get-dhcp-hostname">
<ANCHOR id="nm-setting-ip6-config-get-dns" href="libnm-util/NMSettingIP6Config.html#nm-setting-ip6-config-get-dns">
<ANCHOR id="nm-setting-ip6-config-get-dns-search" href="libnm-util/NMSettingIP6Config.html#nm-setting-ip6-config-get-dns-search">
<ANCHOR id="nm-setting-ip6-config-get-ignore-auto-dns" href="libnm-util/NMSettingIP6Config.html#nm-setting-ip6-config-get-ignore-auto-dns">
@@ -1132,6 +1212,7 @@
<ANCHOR id="nm-setting-ip6-config-remove-route" href="libnm-util/NMSettingIP6Config.html#nm-setting-ip6-config-remove-route">
<ANCHOR id="NMSettingIP6Config.property-details" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config.property-details">
<ANCHOR id="NMSettingIP6Config--addresses" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config--addresses">
+<ANCHOR id="NMSettingIP6Config--dhcp-hostname" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config--dhcp-hostname">
<ANCHOR id="NMSettingIP6Config--dns" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config--dns">
<ANCHOR id="NMSettingIP6Config--dns-search" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config--dns-search">
<ANCHOR id="NMSettingIP6Config--ignore-auto-dns" href="libnm-util/NMSettingIP6Config.html#NMSettingIP6Config--ignore-auto-dns">
@@ -1301,6 +1382,7 @@
<ANCHOR id="NMU-SEC-WPA2-PSK:CAPS" href="libnm-util/libnm-util-nm-utils.html#NMU-SEC-WPA2-PSK:CAPS">
<ANCHOR id="NMU-SEC-WPA2-ENTERPRISE:CAPS" href="libnm-util/libnm-util-nm-utils.html#NMU-SEC-WPA2-ENTERPRISE:CAPS">
<ANCHOR id="NM-UTILS-HWADDR-LEN-MAX:CAPS" href="libnm-util/libnm-util-nm-utils.html#NM-UTILS-HWADDR-LEN-MAX:CAPS">
+<ANCHOR id="nm-utils-ap-mode-security-valid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-ap-mode-security-valid">
<ANCHOR id="nm-utils-deinit" href="libnm-util/libnm-util-nm-utils.html#nm-utils-deinit">
<ANCHOR id="nm-utils-escape-ssid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-escape-ssid">
<ANCHOR id="nm-utils-file-is-pkcs12" href="libnm-util/libnm-util-nm-utils.html#nm-utils-file-is-pkcs12">
@@ -1310,6 +1392,7 @@
<ANCHOR id="nm-utils-hwaddr-len" href="libnm-util/libnm-util-nm-utils.html#nm-utils-hwaddr-len">
<ANCHOR id="nm-utils-hwaddr-ntoa" href="libnm-util/libnm-util-nm-utils.html#nm-utils-hwaddr-ntoa">
<ANCHOR id="nm-utils-hwaddr-type" href="libnm-util/libnm-util-nm-utils.html#nm-utils-hwaddr-type">
+<ANCHOR id="nm-utils-iface-valid-name" href="libnm-util/libnm-util-nm-utils.html#nm-utils-iface-valid-name">
<ANCHOR id="nm-utils-init" href="libnm-util/libnm-util-nm-utils.html#nm-utils-init">
<ANCHOR id="nm-utils-ip4-addresses-from-gvalue" href="libnm-util/libnm-util-nm-utils.html#nm-utils-ip4-addresses-from-gvalue">
<ANCHOR id="nm-utils-ip4-addresses-to-gvalue" href="libnm-util/libnm-util-nm-utils.html#nm-utils-ip4-addresses-to-gvalue">
@@ -1325,6 +1408,7 @@
<ANCHOR id="nm-utils-ip6-routes-from-gvalue" href="libnm-util/libnm-util-nm-utils.html#nm-utils-ip6-routes-from-gvalue">
<ANCHOR id="nm-utils-ip6-routes-to-gvalue" href="libnm-util/libnm-util-nm-utils.html#nm-utils-ip6-routes-to-gvalue">
<ANCHOR id="nm-utils-is-empty-ssid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-is-empty-ssid">
+<ANCHOR id="nm-utils-is-uuid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-is-uuid">
<ANCHOR id="nm-utils-rsa-key-encrypt" href="libnm-util/libnm-util-nm-utils.html#nm-utils-rsa-key-encrypt">
<ANCHOR id="nm-utils-same-ssid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-same-ssid">
<ANCHOR id="nm-utils-security-valid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-security-valid">
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 694287db9..eaa3def12 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -44,6 +44,8 @@
enum <a class="link" href="libnm-util-nm-utils.html#NMUtilsSecurityType-enum" title="enum NMUtilsSecurityType">NMUtilsSecurityType</a>;
#define <a class="link" href="libnm-util-nm-utils.html#NM-UTILS-HWADDR-LEN-MAX:CAPS" title="NM_UTILS_HWADDR_LEN_MAX">NM_UTILS_HWADDR_LEN_MAX</a>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="libnm-util-nm-utils.html#nm-utils-ap-mode-security-valid" title="nm_utils_ap_mode_security_valid ()">nm_utils_ap_mode_security_valid</a> (<em class="parameter"><code><a class="link" href="libnm-util-nm-utils.html#NMUtilsSecurityType"><span class="type">NMUtilsSecurityType</span></a> type</code></em>,
+ <em class="parameter"><code><span class="type">NMDeviceWifiCapabilities</span> wifi_caps</code></em>);
<span class="returnvalue">void</span> <a class="link" href="libnm-util-nm-utils.html#nm-utils-deinit" title="nm_utils_deinit ()">nm_utils_deinit</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
const <span class="returnvalue">char</span> * <a class="link" href="libnm-util-nm-utils.html#nm-utils-escape-ssid" title="nm_utils_escape_ssid ()">nm_utils_escape_ssid</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *ssid</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> len</code></em>);
@@ -58,6 +60,7 @@ const <span class="returnvalue">char</span> * <a class="link" href="libnm
<span class="returnvalue">char</span> * <a class="link" href="libnm-util-nm-utils.html#nm-utils-hwaddr-ntoa" title="nm_utils_hwaddr_ntoa ()">nm_utils_hwaddr_ntoa</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> addr</code></em>,
<em class="parameter"><code><span class="type">int</span> type</code></em>);
<span class="returnvalue">int</span> <a class="link" href="libnm-util-nm-utils.html#nm-utils-hwaddr-type" title="nm_utils_hwaddr_type ()">nm_utils_hwaddr_type</a> (<em class="parameter"><code><span class="type">int</span> len</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="libnm-util-nm-utils.html#nm-utils-iface-valid-name" title="nm_utils_iface_valid_name ()">nm_utils_iface_valid_name</a> (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="libnm-util-nm-utils.html#nm-utils-init" title="nm_utils_init ()">nm_utils_init</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> * <a class="link" href="libnm-util-nm-utils.html#nm-utils-ip4-addresses-from-gvalue" title="nm_utils_ip4_addresses_from_gvalue ()">nm_utils_ip4_addresses_from_gvalue</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);
<span class="returnvalue">void</span> <a class="link" href="libnm-util-nm-utils.html#nm-utils-ip4-addresses-to-gvalue" title="nm_utils_ip4_addresses_to_gvalue ()">nm_utils_ip4_addresses_to_gvalue</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *list</code></em>,
@@ -79,6 +82,7 @@ const <span class="returnvalue">char</span> * <a class="link" href="libnm
<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="libnm-util-nm-utils.html#nm-utils-is-empty-ssid" title="nm_utils_is_empty_ssid ()">nm_utils_is_empty_ssid</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *ssid</code></em>,
<em class="parameter"><code><span class="type">int</span> len</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="libnm-util-nm-utils.html#nm-utils-is-uuid" title="nm_utils_is_uuid ()">nm_utils_is_uuid</a> (<em class="parameter"><code>const <span class="type">char</span> *str</code></em>);
<a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * <a class="link" href="libnm-util-nm-utils.html#nm-utils-rsa-key-encrypt" title="nm_utils_rsa_key_encrypt ()">nm_utils_rsa_key_encrypt</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *data</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *in_password</code></em>,
<em class="parameter"><code><span class="type">char</span> **out_password</code></em>,
@@ -209,6 +213,39 @@ as the size of the buffer passed to <a class="link" href="libnm-util-nm-utils.ht
</div>
<hr>
<div class="refsect2">
+<a name="nm-utils-ap-mode-security-valid"></a><h3>nm_utils_ap_mode_security_valid ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_utils_ap_mode_security_valid (<em class="parameter"><code><a class="link" href="libnm-util-nm-utils.html#NMUtilsSecurityType"><span class="type">NMUtilsSecurityType</span></a> type</code></em>,
+ <em class="parameter"><code><span class="type">NMDeviceWifiCapabilities</span> wifi_caps</code></em>);</pre>
+<p>
+Given a set of device capabilities, and a desired security type to check
+against, determines whether the combination of device capabilities and
+desired security type are valid for AP/Hotspot connections.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
+<td>the security type to check device capabilties against,
+e.g. <a class="link" href="libnm-util-nm-utils.html#NMU-SEC-STATIC-WEP:CAPS"><span class="type">NMU_SEC_STATIC_WEP</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>wifi_caps</code></em> :</span></p></td>
+<td>bitfield of the capabilities of the specific WiFi device, e.g.
+<span class="type">NM_WIFI_DEVICE_CAP_CIPHER_WEP40</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>TRUE if the device capabilities are compatible with the desired
+<em class="parameter"><code>type</code></em>, FALSE if they are not.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
<a name="nm-utils-deinit"></a><h3>nm_utils_deinit ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span> nm_utils_deinit (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
<p>
@@ -433,6 +470,29 @@ the address length was not recognized</td>
</div>
<hr>
<div class="refsect2">
+<a name="nm-utils-iface-valid-name"></a><h3>nm_utils_iface_valid_name ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_utils_iface_valid_name (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
+<p>
+This function is a 1:1 copy of the kernel's interface validation
+function in net/core/dev.c.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
+<td>Name of interface</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if interface name is valid, otherwise <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
<a name="nm-utils-init"></a><h3>nm_utils_init ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_utils_init (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
<p>
@@ -820,6 +880,28 @@ number of known SSID-cloaking methods.
</div>
<hr>
<div class="refsect2">
+<a name="nm-utils-is-uuid"></a><h3>nm_utils_is_uuid ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_utils_is_uuid (<em class="parameter"><code>const <span class="type">char</span> *str</code></em>);</pre>
+<p>
+Checks if <em class="parameter"><code>str</code></em> is a UUID
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
+<td>a string that might be a UUID</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>str</code></em> is a UUID, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if not</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
<a name="nm-utils-rsa-key-encrypt"></a><h3>nm_utils_rsa_key_encrypt ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> * nm_utils_rsa_key_encrypt (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> *data</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *in_password</code></em>,
@@ -912,6 +994,10 @@ Given a set of device capabilities, and a desired security type to check
against, determines whether the combination of device, desired security
type, and AP capabilities intersect.
</p>
+<p>
+NOTE: this function cannot handle checking security for AP/Hotspot mode;
+use <a class="link" href="libnm-util-nm-utils.html#nm-utils-ap-mode-security-valid" title="nm_utils_ap_mode_security_valid ()"><code class="function">nm_utils_ap_mode_security_valid()</code></a> instead.
+</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 5b50abff5..468cd5ea7 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -15,6 +15,8 @@
<sub name="NMSettingGsm" link="NMSettingGsm.html"/>
<sub name="NMSettingWimax" link="NMSettingWimax.html"/>
<sub name="NMSettingBond" link="NMSettingBond.html"/>
+ <sub name="NMSettingBridge" link="NMSettingBridge.html"/>
+ <sub name="NMSettingBridgePort" link="NMSettingBridgePort.html"/>
<sub name="NMSettingInfiniband" link="NMSettingInfiniband.html"/>
<sub name="NMSettingVlan" link="NMSettingVlan.html"/>
<sub name="NMSettingOlpcMesh" link="NMSettingOlpcMesh.html"/>
@@ -54,6 +56,8 @@
<keyword type="function" name="nm_connection_get_setting_adsl ()" link="NMConnection.html#nm-connection-get-setting-adsl"/>
<keyword type="function" name="nm_connection_get_setting_bluetooth ()" link="NMConnection.html#nm-connection-get-setting-bluetooth"/>
<keyword type="function" name="nm_connection_get_setting_bond ()" link="NMConnection.html#nm-connection-get-setting-bond"/>
+ <keyword type="function" name="nm_connection_get_setting_bridge ()" link="NMConnection.html#nm-connection-get-setting-bridge"/>
+ <keyword type="function" name="nm_connection_get_setting_bridge_port ()" link="NMConnection.html#nm-connection-get-setting-bridge-port"/>
<keyword type="function" name="nm_connection_get_setting_by_name ()" link="NMConnection.html#nm-connection-get-setting-by-name"/>
<keyword type="function" name="nm_connection_get_setting_cdma ()" link="NMConnection.html#nm-connection-get-setting-cdma"/>
<keyword type="function" name="nm_connection_get_setting_connection ()" link="NMConnection.html#nm-connection-get-setting-connection"/>
@@ -130,6 +134,7 @@
<keyword type="macro" name="NM_SETTING_CONNECTION_MASTER" link="NMSettingConnection.html#NM-SETTING-CONNECTION-MASTER:CAPS"/>
<keyword type="macro" name="NM_SETTING_CONNECTION_PERMISSIONS" link="NMSettingConnection.html#NM-SETTING-CONNECTION-PERMISSIONS:CAPS"/>
<keyword type="macro" name="NM_SETTING_CONNECTION_READ_ONLY" link="NMSettingConnection.html#NM-SETTING-CONNECTION-READ-ONLY:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_CONNECTION_SECONDARIES" link="NMSettingConnection.html#NM-SETTING-CONNECTION-SECONDARIES:CAPS"/>
<keyword type="macro" name="NM_SETTING_CONNECTION_SETTING_NAME" link="NMSettingConnection.html#NM-SETTING-CONNECTION-SETTING-NAME:CAPS"/>
<keyword type="macro" name="NM_SETTING_CONNECTION_SLAVE_TYPE" link="NMSettingConnection.html#NM-SETTING-CONNECTION-SLAVE-TYPE:CAPS"/>
<keyword type="macro" name="NM_SETTING_CONNECTION_TIMESTAMP" link="NMSettingConnection.html#NM-SETTING-CONNECTION-TIMESTAMP:CAPS"/>
@@ -137,14 +142,17 @@
<keyword type="macro" name="NM_SETTING_CONNECTION_UUID" link="NMSettingConnection.html#NM-SETTING-CONNECTION-UUID:CAPS"/>
<keyword type="macro" name="NM_SETTING_CONNECTION_ZONE" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE:CAPS"/>
<keyword type="function" name="nm_setting_connection_add_permission ()" link="NMSettingConnection.html#nm-setting-connection-add-permission"/>
+ <keyword type="function" name="nm_setting_connection_add_secondary ()" link="NMSettingConnection.html#nm-setting-connection-add-secondary"/>
<keyword type="function" name="nm_setting_connection_error_quark ()" link="NMSettingConnection.html#nm-setting-connection-error-quark"/>
<keyword type="function" name="nm_setting_connection_get_autoconnect ()" link="NMSettingConnection.html#nm-setting-connection-get-autoconnect"/>
<keyword type="function" name="nm_setting_connection_get_connection_type ()" link="NMSettingConnection.html#nm-setting-connection-get-connection-type"/>
<keyword type="function" name="nm_setting_connection_get_id ()" link="NMSettingConnection.html#nm-setting-connection-get-id"/>
<keyword type="function" name="nm_setting_connection_get_master ()" link="NMSettingConnection.html#nm-setting-connection-get-master"/>
<keyword type="function" name="nm_setting_connection_get_num_permissions ()" link="NMSettingConnection.html#nm-setting-connection-get-num-permissions"/>
+ <keyword type="function" name="nm_setting_connection_get_num_secondaries ()" link="NMSettingConnection.html#nm-setting-connection-get-num-secondaries"/>
<keyword type="function" name="nm_setting_connection_get_permission ()" link="NMSettingConnection.html#nm-setting-connection-get-permission"/>
<keyword type="function" name="nm_setting_connection_get_read_only ()" link="NMSettingConnection.html#nm-setting-connection-get-read-only"/>
+ <keyword type="function" name="nm_setting_connection_get_secondary ()" link="NMSettingConnection.html#nm-setting-connection-get-secondary"/>
<keyword type="function" name="nm_setting_connection_get_slave_type ()" link="NMSettingConnection.html#nm-setting-connection-get-slave-type"/>
<keyword type="function" name="nm_setting_connection_get_timestamp ()" link="NMSettingConnection.html#nm-setting-connection-get-timestamp"/>
<keyword type="function" name="nm_setting_connection_get_uuid ()" link="NMSettingConnection.html#nm-setting-connection-get-uuid"/>
@@ -153,11 +161,13 @@
<keyword type="function" name="nm_setting_connection_new ()" link="NMSettingConnection.html#nm-setting-connection-new"/>
<keyword type="function" name="nm_setting_connection_permissions_user_allowed ()" link="NMSettingConnection.html#nm-setting-connection-permissions-user-allowed"/>
<keyword type="function" name="nm_setting_connection_remove_permission ()" link="NMSettingConnection.html#nm-setting-connection-remove-permission"/>
+ <keyword type="function" name="nm_setting_connection_remove_secondary ()" link="NMSettingConnection.html#nm-setting-connection-remove-secondary"/>
<keyword type="property" name="The &quot;autoconnect&quot; property" link="NMSettingConnection.html#NMSettingConnection--autoconnect"/>
<keyword type="property" name="The &quot;id&quot; property" link="NMSettingConnection.html#NMSettingConnection--id"/>
<keyword type="property" name="The &quot;master&quot; property" link="NMSettingConnection.html#NMSettingConnection--master"/>
<keyword type="property" name="The &quot;permissions&quot; property" link="NMSettingConnection.html#NMSettingConnection--permissions"/>
<keyword type="property" name="The &quot;read-only&quot; property" link="NMSettingConnection.html#NMSettingConnection--read-only"/>
+ <keyword type="property" name="The &quot;secondaries&quot; property" link="NMSettingConnection.html#NMSettingConnection--secondaries"/>
<keyword type="property" name="The &quot;slave-type&quot; property" link="NMSettingConnection.html#NMSettingConnection--slave-type"/>
<keyword type="property" name="The &quot;timestamp&quot; property" link="NMSettingConnection.html#NMSettingConnection--timestamp"/>
<keyword type="property" name="The &quot;type&quot; property" link="NMSettingConnection.html#NMSettingConnection--type"/>
@@ -220,6 +230,7 @@
<keyword type="macro" name="NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MAC-ADDRESS-BLACKLIST:CAPS"/>
<keyword type="macro" name="NM_SETTING_WIRELESS_MODE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE:CAPS"/>
<keyword type="macro" name="NM_SETTING_WIRELESS_MODE_ADHOC" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_AP" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-AP:CAPS"/>
<keyword type="macro" name="NM_SETTING_WIRELESS_MODE_INFRA" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS"/>
<keyword type="macro" name="NM_SETTING_WIRELESS_MTU" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MTU:CAPS"/>
<keyword type="macro" name="NM_SETTING_WIRELESS_RATE" link="NMSettingWireless.html#NM-SETTING-WIRELESS-RATE:CAPS"/>
@@ -466,6 +477,50 @@
<keyword type="function" name="nm_setting_bond_remove_option ()" link="NMSettingBond.html#nm-setting-bond-remove-option"/>
<keyword type="property" name="The &quot;interface-name&quot; property" link="NMSettingBond.html#NMSettingBond--interface-name"/>
<keyword type="property" name="The &quot;options&quot; property" link="NMSettingBond.html#NMSettingBond--options"/>
+ <keyword type="struct" name="NMSettingBridge" link="NMSettingBridge.html#NMSettingBridge-struct"/>
+ <keyword type="struct" name="NMSettingBridgeClass" link="NMSettingBridge.html#NMSettingBridgeClass"/>
+ <keyword type="enum" name="enum NMSettingBridgeError" link="NMSettingBridge.html#NMSettingBridgeError-enum"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_AGEING_TIME" link="NMSettingBridge.html#NM-SETTING-BRIDGE-AGEING-TIME:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_ERROR" link="NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_FORWARD_DELAY" link="NMSettingBridge.html#NM-SETTING-BRIDGE-FORWARD-DELAY:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_HELLO_TIME" link="NMSettingBridge.html#NM-SETTING-BRIDGE-HELLO-TIME:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_INTERFACE_NAME" link="NMSettingBridge.html#NM-SETTING-BRIDGE-INTERFACE-NAME:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_MAX_AGE" link="NMSettingBridge.html#NM-SETTING-BRIDGE-MAX-AGE:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_PRIORITY" link="NMSettingBridge.html#NM-SETTING-BRIDGE-PRIORITY:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_SETTING_NAME" link="NMSettingBridge.html#NM-SETTING-BRIDGE-SETTING-NAME:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_STP" link="NMSettingBridge.html#NM-SETTING-BRIDGE-STP:CAPS"/>
+ <keyword type="function" name="nm_setting_bridge_error_quark ()" link="NMSettingBridge.html#nm-setting-bridge-error-quark"/>
+ <keyword type="function" name="nm_setting_bridge_get_ageing_time ()" link="NMSettingBridge.html#nm-setting-bridge-get-ageing-time"/>
+ <keyword type="function" name="nm_setting_bridge_get_forward_delay ()" link="NMSettingBridge.html#nm-setting-bridge-get-forward-delay"/>
+ <keyword type="function" name="nm_setting_bridge_get_hello_time ()" link="NMSettingBridge.html#nm-setting-bridge-get-hello-time"/>
+ <keyword type="function" name="nm_setting_bridge_get_interface_name ()" link="NMSettingBridge.html#nm-setting-bridge-get-interface-name"/>
+ <keyword type="function" name="nm_setting_bridge_get_max_age ()" link="NMSettingBridge.html#nm-setting-bridge-get-max-age"/>
+ <keyword type="function" name="nm_setting_bridge_get_priority ()" link="NMSettingBridge.html#nm-setting-bridge-get-priority"/>
+ <keyword type="function" name="nm_setting_bridge_get_stp ()" link="NMSettingBridge.html#nm-setting-bridge-get-stp"/>
+ <keyword type="function" name="nm_setting_bridge_new ()" link="NMSettingBridge.html#nm-setting-bridge-new"/>
+ <keyword type="property" name="The &quot;ageing-time&quot; property" link="NMSettingBridge.html#NMSettingBridge--ageing-time"/>
+ <keyword type="property" name="The &quot;forward-delay&quot; property" link="NMSettingBridge.html#NMSettingBridge--forward-delay"/>
+ <keyword type="property" name="The &quot;hello-time&quot; property" link="NMSettingBridge.html#NMSettingBridge--hello-time"/>
+ <keyword type="property" name="The &quot;interface-name&quot; property" link="NMSettingBridge.html#NMSettingBridge--interface-name"/>
+ <keyword type="property" name="The &quot;max-age&quot; property" link="NMSettingBridge.html#NMSettingBridge--max-age"/>
+ <keyword type="property" name="The &quot;priority&quot; property" link="NMSettingBridge.html#NMSettingBridge--priority"/>
+ <keyword type="property" name="The &quot;stp&quot; property" link="NMSettingBridge.html#NMSettingBridge--stp"/>
+ <keyword type="struct" name="NMSettingBridgePort" link="NMSettingBridgePort.html#NMSettingBridgePort-struct"/>
+ <keyword type="struct" name="NMSettingBridgePortClass" link="NMSettingBridgePort.html#NMSettingBridgePortClass"/>
+ <keyword type="enum" name="enum NMSettingBridgePortError" link="NMSettingBridgePort.html#NMSettingBridgePortError-enum"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_ERROR" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_PATH_COST" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_PRIORITY" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_SETTING_NAME" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS"/>
+ <keyword type="function" name="nm_setting_bridge_port_error_quark ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-error-quark"/>
+ <keyword type="function" name="nm_setting_bridge_port_get_hairpin_mode ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-hairpin-mode"/>
+ <keyword type="function" name="nm_setting_bridge_port_get_path_cost ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-path-cost"/>
+ <keyword type="function" name="nm_setting_bridge_port_get_priority ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-priority"/>
+ <keyword type="function" name="nm_setting_bridge_port_new ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-new"/>
+ <keyword type="property" name="The &quot;hairpin-mode&quot; property" link="NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode"/>
+ <keyword type="property" name="The &quot;path-cost&quot; property" link="NMSettingBridgePort.html#NMSettingBridgePort--path-cost"/>
+ <keyword type="property" name="The &quot;priority&quot; property" link="NMSettingBridgePort.html#NMSettingBridgePort--priority"/>
<keyword type="struct" name="NMSettingInfiniband" link="NMSettingInfiniband.html#NMSettingInfiniband-struct"/>
<keyword type="struct" name="NMSettingInfinibandClass" link="NMSettingInfiniband.html#NMSettingInfinibandClass"/>
<keyword type="enum" name="enum NMSettingInfinibandError" link="NMSettingInfiniband.html#NMSettingInfinibandError-enum"/>
@@ -794,6 +849,7 @@
<keyword type="enum" name="enum NMSettingIP6ConfigError" link="NMSettingIP6Config.html#NMSettingIP6ConfigError-enum"/>
<keyword type="enum" name="enum NMSettingIP6ConfigPrivacy" link="NMSettingIP6Config.html#NMSettingIP6ConfigPrivacy-enum"/>
<keyword type="macro" name="NM_SETTING_IP6_CONFIG_ADDRESSES" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ADDRESSES:CAPS"/>
+ <keyword type="macro" name="NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-DHCP-HOSTNAME:CAPS"/>
<keyword type="macro" name="NM_SETTING_IP6_CONFIG_DNS" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-DNS:CAPS"/>
<keyword type="macro" name="NM_SETTING_IP6_CONFIG_DNS_SEARCH" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-DNS-SEARCH:CAPS"/>
<keyword type="macro" name="NM_SETTING_IP6_CONFIG_ERROR" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ERROR:CAPS"/>
@@ -845,6 +901,7 @@
<keyword type="function" name="nm_setting_ip6_config_clear_routes ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-clear-routes"/>
<keyword type="function" name="nm_setting_ip6_config_error_quark ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-error-quark"/>
<keyword type="function" name="nm_setting_ip6_config_get_address ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-get-address"/>
+ <keyword type="function" name="nm_setting_ip6_config_get_dhcp_hostname ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-get-dhcp-hostname"/>
<keyword type="function" name="nm_setting_ip6_config_get_dns ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-get-dns"/>
<keyword type="function" name="nm_setting_ip6_config_get_dns_search ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-get-dns-search"/>
<keyword type="function" name="nm_setting_ip6_config_get_ignore_auto_dns ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-get-ignore-auto-dns"/>
@@ -864,6 +921,7 @@
<keyword type="function" name="nm_setting_ip6_config_remove_dns_search ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-remove-dns-search"/>
<keyword type="function" name="nm_setting_ip6_config_remove_route ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-remove-route"/>
<keyword type="property" name="The &quot;addresses&quot; property" link="NMSettingIP6Config.html#NMSettingIP6Config--addresses"/>
+ <keyword type="property" name="The &quot;dhcp-hostname&quot; property" link="NMSettingIP6Config.html#NMSettingIP6Config--dhcp-hostname"/>
<keyword type="property" name="The &quot;dns&quot; property" link="NMSettingIP6Config.html#NMSettingIP6Config--dns"/>
<keyword type="property" name="The &quot;dns-search&quot; property" link="NMSettingIP6Config.html#NMSettingIP6Config--dns-search"/>
<keyword type="property" name="The &quot;ignore-auto-dns&quot; property" link="NMSettingIP6Config.html#NMSettingIP6Config--ignore-auto-dns"/>
@@ -983,6 +1041,7 @@
<keyword type="property" name="The &quot;user-name&quot; property" link="NMSettingVPN.html#NMSettingVPN--user-name"/>
<keyword type="enum" name="enum NMUtilsSecurityType" link="libnm-util-nm-utils.html#NMUtilsSecurityType-enum"/>
<keyword type="macro" name="NM_UTILS_HWADDR_LEN_MAX" link="libnm-util-nm-utils.html#NM-UTILS-HWADDR-LEN-MAX:CAPS"/>
+ <keyword type="function" name="nm_utils_ap_mode_security_valid ()" link="libnm-util-nm-utils.html#nm-utils-ap-mode-security-valid"/>
<keyword type="function" name="nm_utils_deinit ()" link="libnm-util-nm-utils.html#nm-utils-deinit"/>
<keyword type="function" name="nm_utils_escape_ssid ()" link="libnm-util-nm-utils.html#nm-utils-escape-ssid"/>
<keyword type="function" name="nm_utils_file_is_pkcs12 ()" link="libnm-util-nm-utils.html#nm-utils-file-is-pkcs12"/>
@@ -992,6 +1051,7 @@
<keyword type="function" name="nm_utils_hwaddr_len ()" link="libnm-util-nm-utils.html#nm-utils-hwaddr-len"/>
<keyword type="function" name="nm_utils_hwaddr_ntoa ()" link="libnm-util-nm-utils.html#nm-utils-hwaddr-ntoa"/>
<keyword type="function" name="nm_utils_hwaddr_type ()" link="libnm-util-nm-utils.html#nm-utils-hwaddr-type"/>
+ <keyword type="function" name="nm_utils_iface_valid_name ()" link="libnm-util-nm-utils.html#nm-utils-iface-valid-name"/>
<keyword type="function" name="nm_utils_init ()" link="libnm-util-nm-utils.html#nm-utils-init"/>
<keyword type="function" name="nm_utils_ip4_addresses_from_gvalue ()" link="libnm-util-nm-utils.html#nm-utils-ip4-addresses-from-gvalue"/>
<keyword type="function" name="nm_utils_ip4_addresses_to_gvalue ()" link="libnm-util-nm-utils.html#nm-utils-ip4-addresses-to-gvalue"/>
@@ -1007,6 +1067,7 @@
<keyword type="function" name="nm_utils_ip6_routes_from_gvalue ()" link="libnm-util-nm-utils.html#nm-utils-ip6-routes-from-gvalue"/>
<keyword type="function" name="nm_utils_ip6_routes_to_gvalue ()" link="libnm-util-nm-utils.html#nm-utils-ip6-routes-to-gvalue"/>
<keyword type="function" name="nm_utils_is_empty_ssid ()" link="libnm-util-nm-utils.html#nm-utils-is-empty-ssid"/>
+ <keyword type="function" name="nm_utils_is_uuid ()" link="libnm-util-nm-utils.html#nm-utils-is-uuid"/>
<keyword type="function" name="nm_utils_rsa_key_encrypt ()" link="libnm-util-nm-utils.html#nm-utils-rsa-key-encrypt"/>
<keyword type="function" name="nm_utils_same_ssid ()" link="libnm-util-nm-utils.html#nm-utils-same-ssid"/>
<keyword type="function" name="nm_utils_security_valid ()" link="libnm-util-nm-utils.html#nm-utils-security-valid"/>
@@ -1102,6 +1163,8 @@
<keyword type="constant" name="NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-GPRS-EDGE:CAPS"/>
<keyword type="constant" name="NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-UMTS-HSPA:CAPS"/>
<keyword type="constant" name="NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-GPRS-EDGE:CAPS"/>
+ <keyword type="constant" name="NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-PREFER-4G:CAPS"/>
+ <keyword type="constant" name="NM_SETTING_GSM_NETWORK_TYPE_4G" link="NMSettingGsm.html#NM-SETTING-GSM-NETWORK-TYPE-4G:CAPS"/>
<keyword type="constant" name="NM_SETTING_WIMAX_ERROR_UNKNOWN" link="NMSettingWimax.html#NM-SETTING-WIMAX-ERROR-UNKNOWN:CAPS"/>
<keyword type="constant" name="NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY" link="NMSettingWimax.html#NM-SETTING-WIMAX-ERROR-INVALID-PROPERTY:CAPS"/>
<keyword type="constant" name="NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY" link="NMSettingWimax.html#NM-SETTING-WIMAX-ERROR-MISSING-PROPERTY:CAPS"/>
@@ -1110,12 +1173,19 @@
<keyword type="constant" name="NM_SETTING_BOND_ERROR_MISSING_PROPERTY" link="NMSettingBond.html#NM-SETTING-BOND-ERROR-MISSING-PROPERTY:CAPS"/>
<keyword type="constant" name="NM_SETTING_BOND_ERROR_INVALID_OPTION" link="NMSettingBond.html#NM-SETTING-BOND-ERROR-INVALID-OPTION:CAPS"/>
<keyword type="constant" name="NM_SETTING_BOND_ERROR_MISSING_OPTION" link="NMSettingBond.html#NM-SETTING-BOND-ERROR-MISSING-OPTION:CAPS"/>
+ <keyword type="constant" name="NM_SETTING_BRIDGE_ERROR_UNKNOWN" link="NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR-UNKNOWN:CAPS"/>
+ <keyword type="constant" name="NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY" link="NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR-INVALID-PROPERTY:CAPS"/>
+ <keyword type="constant" name="NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY" link="NMSettingBridge.html#NM-SETTING-BRIDGE-ERROR-MISSING-PROPERTY:CAPS"/>
+ <keyword type="constant" name="NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR-UNKNOWN:CAPS"/>
+ <keyword type="constant" name="NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR-INVALID-PROPERTY:CAPS"/>
+ <keyword type="constant" name="NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-ERROR-MISSING-PROPERTY:CAPS"/>
<keyword type="constant" name="NM_SETTING_INFINIBAND_ERROR_UNKNOWN" link="NMSettingInfiniband.html#NM-SETTING-INFINIBAND-ERROR-UNKNOWN:CAPS"/>
<keyword type="constant" name="NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY" link="NMSettingInfiniband.html#NM-SETTING-INFINIBAND-ERROR-INVALID-PROPERTY:CAPS"/>
<keyword type="constant" name="NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY" link="NMSettingInfiniband.html#NM-SETTING-INFINIBAND-ERROR-MISSING-PROPERTY:CAPS"/>
<keyword type="constant" name="NM_SETTING_VLAN_ERROR_UNKNOWN" link="NMSettingVlan.html#NM-SETTING-VLAN-ERROR-UNKNOWN:CAPS"/>
<keyword type="constant" name="NM_SETTING_VLAN_ERROR_INVALID_PROPERTY" link="NMSettingVlan.html#NM-SETTING-VLAN-ERROR-INVALID-PROPERTY:CAPS"/>
<keyword type="constant" name="NM_SETTING_VLAN_ERROR_MISSING_PROPERTY" link="NMSettingVlan.html#NM-SETTING-VLAN-ERROR-MISSING-PROPERTY:CAPS"/>
+ <keyword type="constant" name="NM_SETTING_VLAN_ERROR_INVALID_PARENT" link="NMSettingVlan.html#NM-SETTING-VLAN-ERROR-INVALID-PARENT:CAPS"/>
<keyword type="constant" name="NM_VLAN_FLAG_REORDER_HEADERS" link="NMSettingVlan.html#NM-VLAN-FLAG-REORDER-HEADERS:CAPS"/>
<keyword type="constant" name="NM_VLAN_FLAG_GVRP" link="NMSettingVlan.html#NM-VLAN-FLAG-GVRP:CAPS"/>
<keyword type="constant" name="NM_VLAN_FLAG_LOOSE_BINDING" link="NMSettingVlan.html#NM-VLAN-FLAG-LOOSE-BINDING:CAPS"/>
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index ea1caff31..e6ea328c1 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -24,28 +24,30 @@
<a name="object-tree"></a>Object Hierarchy</h2></div></div></div>
<pre class="screen">
<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
- <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
<a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
<a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a>
<a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth">NMSettingBluetooth</a>
<a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
- <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
+ <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+ <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
<a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
- <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
<a class="link" href="NMSettingInfiniband.html" title="NMSettingInfiniband">NMSettingInfiniband</a>
<a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
+ <a class="link" href="NMSettingVlan.html" title="NMSettingVlan">NMSettingVlan</a>
<a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
- <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">NMSettingOlpcMesh</a>
<a class="link" href="NMSettingPPP.html" title="NMSettingPPP">NMSettingPPP</a>
<a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE">NMSettingPPPOE</a>
<a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
- <a class="link" href="NMSettingVlan.html" title="NMSettingVlan">NMSettingVlan</a>
- <a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
+ <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+ <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
+ <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">NMSettingOlpcMesh</a>
<a class="link" href="NMSettingWimax.html" title="NMSettingWimax">NMSettingWimax</a>
<a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
<a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
<a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+ <a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
+ <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
GEnum
<a class="link" href="NMConnection.html#NMConnectionError">NMConnectionError</a>
<a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat">NMSetting8021xCKFormat</a>
@@ -54,6 +56,8 @@
<a class="link" href="NMSettingAdsl.html#NMSettingAdslError">NMSettingAdslError</a>
<a class="link" href="NMSettingBluetooth.html#NMSettingBluetoothError">NMSettingBluetoothError</a>
<a class="link" href="NMSettingBond.html#NMSettingBondError">NMSettingBondError</a>
+ <a class="link" href="NMSettingBridge.html#NMSettingBridgeError">NMSettingBridgeError</a>
+ <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePortError">NMSettingBridgePortError</a>
<a class="link" href="NMSettingCdma.html#NMSettingCdmaError">NMSettingCdmaError</a>
<a class="link" href="NMSetting.html#NMSettingCompareFlags">NMSettingCompareFlags</a>
<a class="link" href="NMSettingConnection.html#NMSettingConnectionError">NMSettingConnectionError</a>
diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml
index 66b402c30..eaef26233 100644
--- a/docs/libnm-util/libnm-util-docs.sgml
+++ b/docs/libnm-util/libnm-util-docs.sgml
@@ -56,6 +56,8 @@
<xi:include href="xml/nm-setting-gsm.xml"/>
<xi:include href="xml/nm-setting-wimax.xml"/>
<xi:include href="xml/nm-setting-bond.xml"/>
+ <xi:include href="xml/nm-setting-bridge.xml"/>
+ <xi:include href="xml/nm-setting-bridge-port.xml"/>
<xi:include href="xml/nm-setting-infiniband.xml"/>
<xi:include href="xml/nm-setting-vlan.xml"/>
<xi:include href="xml/nm-setting-olpc-mesh.xml"/>
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index 1218f8d39..7515e23aa 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -23,6 +23,8 @@ nm_connection_get_setting_802_1x
nm_connection_get_setting_adsl
nm_connection_get_setting_bluetooth
nm_connection_get_setting_bond
+nm_connection_get_setting_bridge
+nm_connection_get_setting_bridge_port
nm_connection_get_setting_by_name
nm_connection_get_setting_cdma
nm_connection_get_setting_connection
@@ -65,11 +67,6 @@ nm_connection_get_type
</SECTION>
<SECTION>
-<FILE>nm-connection-private</FILE>
-
-</SECTION>
-
-<SECTION>
<FILE>nm-setting</FILE>
<TITLE>NMSetting</TITLE>
NMSetting
@@ -334,6 +331,66 @@ nm_setting_bond_get_type
</SECTION>
<SECTION>
+<FILE>nm-setting-bridge</FILE>
+<TITLE>NMSettingBridge</TITLE>
+NMSettingBridge
+NMSettingBridgeClass
+NMSettingBridgeError
+NM_SETTING_BRIDGE_AGEING_TIME
+NM_SETTING_BRIDGE_ERROR
+NM_SETTING_BRIDGE_FORWARD_DELAY
+NM_SETTING_BRIDGE_HELLO_TIME
+NM_SETTING_BRIDGE_INTERFACE_NAME
+NM_SETTING_BRIDGE_MAX_AGE
+NM_SETTING_BRIDGE_PRIORITY
+NM_SETTING_BRIDGE_SETTING_NAME
+NM_SETTING_BRIDGE_STP
+nm_setting_bridge_error_quark
+nm_setting_bridge_get_ageing_time
+nm_setting_bridge_get_forward_delay
+nm_setting_bridge_get_hello_time
+nm_setting_bridge_get_interface_name
+nm_setting_bridge_get_max_age
+nm_setting_bridge_get_priority
+nm_setting_bridge_get_stp
+nm_setting_bridge_new
+<SUBSECTION Standard>
+NM_IS_SETTING_BRIDGE
+NM_IS_SETTING_BRIDGE_CLASS
+NM_SETTING_BRIDGE
+NM_SETTING_BRIDGE_CLASS
+NM_SETTING_BRIDGE_GET_CLASS
+NM_TYPE_SETTING_BRIDGE
+nm_setting_bridge_get_type
+</SECTION>
+
+<SECTION>
+<FILE>nm-setting-bridge-port</FILE>
+<TITLE>NMSettingBridgePort</TITLE>
+NMSettingBridgePort
+NMSettingBridgePortClass
+NMSettingBridgePortError
+NM_SETTING_BRIDGE_PORT_ERROR
+NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
+NM_SETTING_BRIDGE_PORT_PATH_COST
+NM_SETTING_BRIDGE_PORT_PRIORITY
+NM_SETTING_BRIDGE_PORT_SETTING_NAME
+nm_setting_bridge_port_error_quark
+nm_setting_bridge_port_get_hairpin_mode
+nm_setting_bridge_port_get_path_cost
+nm_setting_bridge_port_get_priority
+nm_setting_bridge_port_new
+<SUBSECTION Standard>
+NM_IS_SETTING_BRIDGE_PORT
+NM_IS_SETTING_BRIDGE_PORT_CLASS
+NM_SETTING_BRIDGE_PORT
+NM_SETTING_BRIDGE_PORT_CLASS
+NM_SETTING_BRIDGE_PORT_GET_CLASS
+NM_TYPE_SETTING_BRIDGE_PORT
+nm_setting_bridge_port_get_type
+</SECTION>
+
+<SECTION>
<FILE>nm-setting-cdma</FILE>
<TITLE>NMSettingCdma</TITLE>
NMSettingCdma
@@ -373,6 +430,7 @@ NM_SETTING_CONNECTION_ID
NM_SETTING_CONNECTION_MASTER
NM_SETTING_CONNECTION_PERMISSIONS
NM_SETTING_CONNECTION_READ_ONLY
+NM_SETTING_CONNECTION_SECONDARIES
NM_SETTING_CONNECTION_SETTING_NAME
NM_SETTING_CONNECTION_SLAVE_TYPE
NM_SETTING_CONNECTION_TIMESTAMP
@@ -380,14 +438,17 @@ NM_SETTING_CONNECTION_TYPE
NM_SETTING_CONNECTION_UUID
NM_SETTING_CONNECTION_ZONE
nm_setting_connection_add_permission
+nm_setting_connection_add_secondary
nm_setting_connection_error_quark
nm_setting_connection_get_autoconnect
nm_setting_connection_get_connection_type
nm_setting_connection_get_id
nm_setting_connection_get_master
nm_setting_connection_get_num_permissions
+nm_setting_connection_get_num_secondaries
nm_setting_connection_get_permission
nm_setting_connection_get_read_only
+nm_setting_connection_get_secondary
nm_setting_connection_get_slave_type
nm_setting_connection_get_timestamp
nm_setting_connection_get_uuid
@@ -396,6 +457,7 @@ nm_setting_connection_is_slave_type
nm_setting_connection_new
nm_setting_connection_permissions_user_allowed
nm_setting_connection_remove_permission
+nm_setting_connection_remove_secondary
<SUBSECTION Standard>
NM_IS_SETTING_CONNECTION
NM_IS_SETTING_CONNECTION_CLASS
@@ -579,6 +641,7 @@ NMSettingIP6ConfigClass
NMSettingIP6ConfigError
NMSettingIP6ConfigPrivacy
NM_SETTING_IP6_CONFIG_ADDRESSES
+NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
NM_SETTING_IP6_CONFIG_DNS
NM_SETTING_IP6_CONFIG_DNS_SEARCH
NM_SETTING_IP6_CONFIG_ERROR
@@ -630,6 +693,7 @@ nm_setting_ip6_config_clear_dns_searches
nm_setting_ip6_config_clear_routes
nm_setting_ip6_config_error_quark
nm_setting_ip6_config_get_address
+nm_setting_ip6_config_get_dhcp_hostname
nm_setting_ip6_config_get_dns
nm_setting_ip6_config_get_dns_search
nm_setting_ip6_config_get_ignore_auto_dns
@@ -772,6 +836,7 @@ nm_setting_pppoe_get_type
<SECTION>
<FILE>nm-setting-private</FILE>
+NM_SETTING_REGISTER_TYPE
NM_SETTING_SECRET_FLAGS_ALL
</SECTION>
@@ -966,6 +1031,7 @@ NM_SETTING_WIRELESS_MAC_ADDRESS
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
NM_SETTING_WIRELESS_MODE
NM_SETTING_WIRELESS_MODE_ADHOC
+NM_SETTING_WIRELESS_MODE_AP
NM_SETTING_WIRELESS_MODE_INFRA
NM_SETTING_WIRELESS_MTU
NM_SETTING_WIRELESS_RATE
@@ -1072,6 +1138,7 @@ nm_setting_wireless_security_get_type
<FILE>nm-utils</FILE>
NMUtilsSecurityType
NM_UTILS_HWADDR_LEN_MAX
+nm_utils_ap_mode_security_valid
nm_utils_deinit
nm_utils_escape_ssid
nm_utils_file_is_pkcs12
@@ -1081,6 +1148,7 @@ nm_utils_hwaddr_aton
nm_utils_hwaddr_len
nm_utils_hwaddr_ntoa
nm_utils_hwaddr_type
+nm_utils_iface_valid_name
nm_utils_init
nm_utils_ip4_addresses_from_gvalue
nm_utils_ip4_addresses_to_gvalue
@@ -1096,6 +1164,7 @@ nm_utils_ip6_dns_to_gvalue
nm_utils_ip6_routes_from_gvalue
nm_utils_ip6_routes_to_gvalue
nm_utils_is_empty_ssid
+nm_utils_is_uuid
nm_utils_rsa_key_encrypt
nm_utils_same_ssid
nm_utils_security_valid
@@ -1119,6 +1188,8 @@ NM_TYPE_SETTING_802_1X_ERROR
NM_TYPE_SETTING_ADSL_ERROR
NM_TYPE_SETTING_BLUETOOTH_ERROR
NM_TYPE_SETTING_BOND_ERROR
+NM_TYPE_SETTING_BRIDGE_ERROR
+NM_TYPE_SETTING_BRIDGE_PORT_ERROR
NM_TYPE_SETTING_CDMA_ERROR
NM_TYPE_SETTING_COMPARE_FLAGS
NM_TYPE_SETTING_CONNECTION_ERROR
@@ -1154,6 +1225,8 @@ nm_setting_802_1x_error_get_type
nm_setting_adsl_error_get_type
nm_setting_bluetooth_error_get_type
nm_setting_bond_error_get_type
+nm_setting_bridge_error_get_type
+nm_setting_bridge_port_error_get_type
nm_setting_cdma_error_get_type
nm_setting_compare_flags_get_type
nm_setting_connection_error_get_type
diff --git a/docs/libnm-util/libnm-util.types b/docs/libnm-util/libnm-util.types
index 511e539da..ae007747d 100644
--- a/docs/libnm-util/libnm-util.types
+++ b/docs/libnm-util/libnm-util.types
@@ -14,6 +14,10 @@ nm_setting_bluetooth_error_get_type
nm_setting_bluetooth_get_type
nm_setting_bond_error_get_type
nm_setting_bond_get_type
+nm_setting_bridge_error_get_type
+nm_setting_bridge_get_type
+nm_setting_bridge_port_error_get_type
+nm_setting_bridge_port_get_type
nm_setting_cdma_error_get_type
nm_setting_cdma_get_type
nm_setting_compare_flags_get_type
diff --git a/docs/libnm-util/tmpl/nm-connection-private.sgml b/docs/libnm-util/tmpl/nm-connection-private.sgml
deleted file mode 100644
index 0ceaa4030..000000000
--- a/docs/libnm-util/tmpl/nm-connection-private.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nm-connection-private
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
index fa0b5d8bd..89fd38c45 100644
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -9,13 +9,11 @@ NMConnection
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
@@ -239,6 +237,24 @@ NMConnection
@Returns:
+<!-- ##### FUNCTION nm_connection_get_setting_bridge ##### -->
+<para>
+
+</para>
+
+@connection:
+@Returns:
+
+
+<!-- ##### FUNCTION nm_connection_get_setting_bridge_port ##### -->
+<para>
+
+</para>
+
+@connection:
+@Returns:
+
+
<!-- ##### FUNCTION nm_connection_get_setting_by_name ##### -->
<para>
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
index f8ab2c77b..107752243 100644
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
@@ -9,13 +9,11 @@ NMSetting8021x
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-adsl.sgml b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
index 0e209bc26..d81ae07f5 100644
--- a/docs/libnm-util/tmpl/nm-setting-adsl.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
@@ -9,13 +9,11 @@ NMSettingAdsl
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
index cc64b574f..9ab1b4b2d 100644
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
@@ -9,13 +9,11 @@ NMSettingBluetooth
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml
index caa8b37a5..8f7dbfc1c 100644
--- a/docs/libnm-util/tmpl/nm-setting-bond.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bond.sgml
@@ -9,13 +9,11 @@ NMSettingBond
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
new file mode 100644
index 000000000..c86142ee0
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
@@ -0,0 +1,143 @@
+<!-- ##### SECTION Title ##### -->
+NMSettingBridgePort
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT NMSettingBridgePort ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingBridgePort:hairpin-mode ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingBridgePort:path-cost ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingBridgePort:priority ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT NMSettingBridgePortClass ##### -->
+<para>
+
+</para>
+
+@parent:
+@_reserved1:
+@_reserved2:
+@_reserved3:
+@_reserved4:
+
+<!-- ##### ENUM NMSettingBridgePortError ##### -->
+<para>
+
+</para>
+
+@NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN:
+@NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY:
+@NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY:
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_ERROR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_PATH_COST ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_PRIORITY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_PORT_SETTING_NAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION nm_setting_bridge_port_error_quark ##### -->
+<para>
+
+</para>
+
+@void:
+@Returns:
+
+
+<!-- ##### FUNCTION nm_setting_bridge_port_get_hairpin_mode ##### -->
+<para>
+
+</para>
+
+@setting:
+@Returns:
+
+
+<!-- ##### FUNCTION nm_setting_bridge_port_get_path_cost ##### -->
+<para>
+
+</para>
+
+@setting:
+@Returns:
+
+
+<!-- ##### FUNCTION nm_setting_bridge_port_get_priority ##### -->
+<para>
+
+</para>
+
+@setting:
+@Returns:
+
+
+<!-- ##### FUNCTION nm_setting_bridge_port_new ##### -->
+<para>
+
+</para>
+
+@void:
+@Returns:
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge.sgml b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
new file mode 100644
index 000000000..690205379
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
@@ -0,0 +1,227 @@
+<!-- ##### SECTION Title ##### -->
+NMSettingBridge
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT NMSettingBridge ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingBridge:ageing-time ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingBridge:forward-delay ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingBridge:hello-time ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingBridge:interface-name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingBridge:max-age ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingBridge:priority ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingBridge:stp ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT NMSettingBridgeClass ##### -->
+<para>
+
+</para>
+
+@parent:
+@_reserved1:
+@_reserved2:
+@_reserved3:
+@_reserved4:
+
+<!-- ##### ENUM NMSettingBridgeError ##### -->
+<para>
+
+</para>
+
+@NM_SETTING_BRIDGE_ERROR_UNKNOWN:
+@NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY:
+@NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY:
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_AGEING_TIME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_ERROR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_FORWARD_DELAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_HELLO_TIME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_INTERFACE_NAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_MAX_AGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_PRIORITY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_SETTING_NAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BRIDGE_STP ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION nm_setting_bridge_error_quark ##### -->
+<para>
+
+</para>
+
+@void:
+@Returns:
+
+
+<!-- ##### FUNCTION nm_setting_bridge_get_ageing_time ##### -->
+<para>
+
+</para>
+
+@setting:
+@Returns:
+
+
+<!-- ##### FUNCTION nm_setting_bridge_get_forward_delay ##### -->
+<para>
+
+</para>
+
+@setting:
+@Returns:
+
+
+<!-- ##### FUNCTION nm_setting_bridge_get_hello_time ##### -->
+<para>
+
+</para>
+
+@setting:
+@Returns:
+
+
+<!-- ##### FUNCTION nm_setting_bridge_get_interface_name ##### -->
+<para>
+
+</para>
+
+@setting:
+@Returns:
+
+
+<!-- ##### FUNCTION nm_setting_bridge_get_max_age ##### -->
+<para>
+
+</para>
+
+@setting:
+@Returns:
+
+
+<!-- ##### FUNCTION nm_setting_bridge_get_priority ##### -->
+<para>
+
+</para>
+
+@setting:
+@Returns:
+
+
+<!-- ##### FUNCTION nm_setting_bridge_get_stp ##### -->
+<para>
+
+</para>
+
+@setting:
+@Returns:
+
+
+<!-- ##### FUNCTION nm_setting_bridge_new ##### -->
+<para>
+
+</para>
+
+@void:
+@Returns:
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
index 5d065170a..7837016d3 100644
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
@@ -9,13 +9,11 @@ NMSettingCdma
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
index d4f568006..13cd70551 100644
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -9,13 +9,11 @@ NMSettingConnection
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
@@ -53,6 +51,11 @@ NMSettingConnection
</para>
+<!-- ##### ARG NMSettingConnection:secondaries ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG NMSettingConnection:slave-type ##### -->
<para>
@@ -142,6 +145,13 @@ NMSettingConnection
+<!-- ##### MACRO NM_SETTING_CONNECTION_SECONDARIES ##### -->
+<para>
+
+</para>
+
+
+
<!-- ##### MACRO NM_SETTING_CONNECTION_SETTING_NAME ##### -->
<para>
@@ -196,6 +206,16 @@ NMSettingConnection
@Returns:
+<!-- ##### FUNCTION nm_setting_connection_add_secondary ##### -->
+<para>
+
+</para>
+
+@setting:
+@sec_uuid:
+@Returns:
+
+
<!-- ##### FUNCTION nm_setting_connection_error_quark ##### -->
<para>
@@ -250,6 +270,15 @@ NMSettingConnection
@Returns:
+<!-- ##### FUNCTION nm_setting_connection_get_num_secondaries ##### -->
+<para>
+
+</para>
+
+@setting:
+@Returns:
+
+
<!-- ##### FUNCTION nm_setting_connection_get_permission ##### -->
<para>
@@ -272,6 +301,16 @@ NMSettingConnection
@Returns:
+<!-- ##### FUNCTION nm_setting_connection_get_secondary ##### -->
+<para>
+
+</para>
+
+@setting:
+@idx:
+@Returns:
+
+
<!-- ##### FUNCTION nm_setting_connection_get_slave_type ##### -->
<para>
@@ -346,3 +385,12 @@ NMSettingConnection
@idx:
+<!-- ##### FUNCTION nm_setting_connection_remove_secondary ##### -->
+<para>
+
+</para>
+
+@setting:
+@idx:
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
index 0c9bdeb04..96327a4a0 100644
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
@@ -9,13 +9,11 @@ NMSettingGsm
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
@@ -135,6 +133,8 @@ NMSettingGsm
@NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE:
@NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA:
@NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE:
+@NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G:
+@NM_SETTING_GSM_NETWORK_TYPE_4G:
<!-- ##### MACRO NM_SETTING_GSM_ALLOWED_BANDS ##### -->
<para>
diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
index 02a59881c..ba7117c01 100644
--- a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
@@ -9,13 +9,11 @@ NMSettingInfiniband
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
index 4b915f2b1..fbc1b4ccb 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
@@ -9,13 +9,11 @@ NMSettingIP4Config
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
index ad9c1b634..275827a71 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
@@ -9,13 +9,11 @@ NMSettingIP6Config
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
@@ -45,6 +43,11 @@ NMSettingIP6Config
</para>
+<!-- ##### ARG NMSettingIP6Config:dhcp-hostname ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG NMSettingIP6Config:dns ##### -->
<para>
@@ -128,6 +131,13 @@ NMSettingIP6Config
+<!-- ##### MACRO NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME ##### -->
+<para>
+
+</para>
+
+
+
<!-- ##### MACRO NM_SETTING_IP6_CONFIG_DNS ##### -->
<para>
@@ -552,6 +562,15 @@ NMSettingIP6Config
@Returns:
+<!-- ##### FUNCTION nm_setting_ip6_config_get_dhcp_hostname ##### -->
+<para>
+
+</para>
+
+@setting:
+@Returns:
+
+
<!-- ##### FUNCTION nm_setting_ip6_config_get_dns ##### -->
<para>
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
index 9a1e720ef..744c87e30 100644
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
@@ -9,13 +9,11 @@ NMSettingOlpcMesh
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
index 90815380f..f26d56fa4 100644
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
@@ -9,13 +9,11 @@ NMSettingPPP
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
index 3c0221699..942b5a049 100644
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
@@ -9,13 +9,11 @@ NMSettingPPPOE
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-private.sgml b/docs/libnm-util/tmpl/nm-setting-private.sgml
index b97401650..fdafc21b3 100644
--- a/docs/libnm-util/tmpl/nm-setting-private.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-private.sgml
@@ -9,19 +9,25 @@ nm-setting-private
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
+<!-- ##### MACRO NM_SETTING_REGISTER_TYPE ##### -->
+<para>
+
+</para>
+
+@x:
+
+
<!-- ##### MACRO NM_SETTING_SECRET_FLAGS_ALL ##### -->
<para>
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
index f0313441e..542b9fbcf 100644
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-serial.sgml
@@ -9,13 +9,11 @@ NMSettingSerial
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
index 49f40d1d4..ff8bea014 100644
--- a/docs/libnm-util/tmpl/nm-setting-vlan.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
@@ -9,13 +9,11 @@ NMSettingVlan
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
@@ -77,6 +75,7 @@ NMSettingVlan
@NM_SETTING_VLAN_ERROR_UNKNOWN:
@NM_SETTING_VLAN_ERROR_INVALID_PROPERTY:
@NM_SETTING_VLAN_ERROR_MISSING_PROPERTY:
+@NM_SETTING_VLAN_ERROR_INVALID_PARENT:
<!-- ##### ENUM NMVlanFlags ##### -->
<para>
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
index 567776c1c..e29dfff99 100644
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
@@ -9,13 +9,11 @@ NMSettingVPN
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
index 0b96fa9f6..9225504a5 100644
--- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
@@ -9,13 +9,11 @@ NMSettingWimax
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
index 09fb963ac..cff79594b 100644
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml
@@ -9,13 +9,11 @@ NMSettingWired
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
index 01b16ce92..d653c6825 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
@@ -9,13 +9,11 @@ NMSettingWirelessSecurity
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
index fdadf8b97..039f57874 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -9,13 +9,11 @@ NMSettingWireless
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
@@ -190,6 +188,13 @@ NMSettingWireless
+<!-- ##### MACRO NM_SETTING_WIRELESS_MODE_AP ##### -->
+<para>
+
+</para>
+
+
+
<!-- ##### MACRO NM_SETTING_WIRELESS_MODE_INFRA ##### -->
<para>
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
index 2067408af..a5198c104 100644
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ b/docs/libnm-util/tmpl/nm-setting.sgml
@@ -9,13 +9,11 @@ NMSetting
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
index 820258228..5171db340 100644
--- a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
+++ b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
@@ -9,13 +9,11 @@ nm-utils-enum-types
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
index 8a822fcfc..d148c4446 100644
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ b/docs/libnm-util/tmpl/nm-utils.sgml
@@ -9,13 +9,11 @@ nm-utils
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
@@ -44,6 +42,16 @@ nm-utils
+<!-- ##### FUNCTION nm_utils_ap_mode_security_valid ##### -->
+<para>
+
+</para>
+
+@type:
+@wifi_caps:
+@Returns:
+
+
<!-- ##### FUNCTION nm_utils_deinit ##### -->
<para>
@@ -129,6 +137,15 @@ nm-utils
@Returns:
+<!-- ##### FUNCTION nm_utils_iface_valid_name ##### -->
+<para>
+
+</para>
+
+@name:
+@Returns:
+
+
<!-- ##### FUNCTION nm_utils_init ##### -->
<para>
@@ -265,6 +282,15 @@ nm-utils
@Returns:
+<!-- ##### FUNCTION nm_utils_is_uuid ##### -->
+<para>
+
+</para>
+
+@str:
+@Returns:
+
+
<!-- ##### FUNCTION nm_utils_rsa_key_encrypt ##### -->
<para>
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index f6c687fe8..fa572dcfa 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-0.9.6.4
+0.9.7.995