From 9c202e3e860b3be9e1f8882630b69affbb130102 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 3 Feb 2013 14:49:22 +0100 Subject: Imported Upstream version 0.9.7.995 --- docs/libnm-util/Makefile.am | 3 +- docs/libnm-util/Makefile.in | 62 +-- docs/libnm-util/html/NMConnection.html | 50 +++ docs/libnm-util/html/NMSetting.html | 12 +- docs/libnm-util/html/NMSettingBond.html | 4 +- docs/libnm-util/html/NMSettingBridge.html | 472 +++++++++++++++++++++ docs/libnm-util/html/NMSettingBridgePort.html | 314 ++++++++++++++ docs/libnm-util/html/NMSettingConnection.html | 126 ++++++ docs/libnm-util/html/NMSettingGsm.html | 18 +- docs/libnm-util/html/NMSettingIP4Config.html | 4 +- docs/libnm-util/html/NMSettingIP6Config.html | 45 ++ docs/libnm-util/html/NMSettingInfiniband.html | 4 +- docs/libnm-util/html/NMSettingVlan.html | 11 +- docs/libnm-util/html/NMSettingWireless.html | 27 +- docs/libnm-util/html/api-index-full.html | 240 +++++++++++ docs/libnm-util/html/ch01.html | 8 +- docs/libnm-util/html/index.html | 10 +- docs/libnm-util/html/index.sgml | 84 ++++ docs/libnm-util/html/libnm-util-nm-utils.html | 86 ++++ docs/libnm-util/html/libnm-util.devhelp2 | 70 +++ docs/libnm-util/html/object-tree.html | 16 +- docs/libnm-util/libnm-util-docs.sgml | 2 + docs/libnm-util/libnm-util-sections.txt | 83 +++- docs/libnm-util/libnm-util.types | 4 + docs/libnm-util/tmpl/nm-connection-private.sgml | 24 -- docs/libnm-util/tmpl/nm-connection.sgml | 20 +- docs/libnm-util/tmpl/nm-setting-8021x.sgml | 2 - docs/libnm-util/tmpl/nm-setting-adsl.sgml | 2 - docs/libnm-util/tmpl/nm-setting-bluetooth.sgml | 2 - docs/libnm-util/tmpl/nm-setting-bond.sgml | 2 - docs/libnm-util/tmpl/nm-setting-bridge-port.sgml | 143 +++++++ docs/libnm-util/tmpl/nm-setting-bridge.sgml | 227 ++++++++++ docs/libnm-util/tmpl/nm-setting-cdma.sgml | 2 - docs/libnm-util/tmpl/nm-setting-connection.sgml | 52 ++- docs/libnm-util/tmpl/nm-setting-gsm.sgml | 4 +- docs/libnm-util/tmpl/nm-setting-infiniband.sgml | 2 - docs/libnm-util/tmpl/nm-setting-ip4-config.sgml | 2 - docs/libnm-util/tmpl/nm-setting-ip6-config.sgml | 23 +- docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml | 2 - docs/libnm-util/tmpl/nm-setting-ppp.sgml | 2 - docs/libnm-util/tmpl/nm-setting-pppoe.sgml | 2 - docs/libnm-util/tmpl/nm-setting-private.sgml | 10 +- docs/libnm-util/tmpl/nm-setting-serial.sgml | 2 - docs/libnm-util/tmpl/nm-setting-vlan.sgml | 3 +- docs/libnm-util/tmpl/nm-setting-vpn.sgml | 2 - docs/libnm-util/tmpl/nm-setting-wimax.sgml | 2 - docs/libnm-util/tmpl/nm-setting-wired.sgml | 2 - .../tmpl/nm-setting-wireless-security.sgml | 2 - docs/libnm-util/tmpl/nm-setting-wireless.sgml | 9 +- docs/libnm-util/tmpl/nm-setting.sgml | 2 - docs/libnm-util/tmpl/nm-utils-enum-types.sgml | 2 - docs/libnm-util/tmpl/nm-utils.sgml | 30 +- docs/libnm-util/version.xml | 2 +- 53 files changed, 2199 insertions(+), 137 deletions(-) create mode 100644 docs/libnm-util/html/NMSettingBridge.html create mode 100644 docs/libnm-util/html/NMSettingBridgePort.html delete mode 100644 docs/libnm-util/tmpl/nm-connection-private.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-bridge-port.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-bridge.sgml (limited to 'docs/libnm-util') diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am index be1bdeeb..8b8b5aa1 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 a8edfffc..59d4179b 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 9e62ec8a..3f55caf8 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -82,6 +82,9 @@ const char * NMSettingBluetooth * nm_connection_get_setting_bluetooth (NMConnection *connection); NMSettingBond * nm_connection_get_setting_bond (NMConnection *connection); +NMSettingBridge * nm_connection_get_setting_bridge (NMConnection *connection); +NMSettingBridgePort * nm_connection_get_setting_bridge_port + (NMConnection *connection); NMSetting * nm_connection_get_setting_by_name (NMConnection *connection, const char *name); NMSettingCdma * nm_connection_get_setting_cdma (NMConnection *connection); @@ -700,6 +703,53 @@ A shortcut to return any +

nm_connection_get_setting_bridge ()

+
NMSettingBridge *   nm_connection_get_setting_bridge    (NMConnection *connection);
+

+A shortcut to return any NMSettingBridge the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingBridge if the connection contains one, otherwise NULL. [transfer none] +
+ +
+
+

nm_connection_get_setting_bridge_port ()

+
NMSettingBridgePort * nm_connection_get_setting_bridge_port
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingBridgePort the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingBridgePort if the connection contains one, otherwise NULL. [transfer none] +
+
+
+

nm_connection_get_setting_by_name ()

NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
                                                          const char *name);
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html index 8a8b2b8c..12b826b1 100644 --- a/docs/libnm-util/html/NMSetting.html +++ b/docs/libnm-util/html/NMSetting.html @@ -116,22 +116,24 @@ const char * NMSettingAdsl +----NMSettingBluetooth +----NMSettingBond - +----NMSettingCdma + +----NMSettingBridge + +----NMSettingBridgePort +----NMSettingConnection - +----NMSettingGsm +----NMSettingInfiniband +----NMSettingIP4Config + +----NMSettingVlan +----NMSettingIP6Config - +----NMSettingOlpcMesh +----NMSettingPPP +----NMSettingPPPOE +----NMSettingSerial - +----NMSettingVlan - +----NMSettingVPN + +----NMSettingGsm + +----NMSettingCdma + +----NMSettingOlpcMesh +----NMSettingWimax +----NMSettingWired +----NMSettingWireless +----NMSettingWirelessSecurity + +----NMSettingVPN 
   GEnum
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index e29bca05..ff77e102 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -18,7 +18,7 @@
 Up
 Home
 libnm-util Reference Manual
-Next
+Next
 
 
 Top
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
new file mode 100644
index 00000000..4e52f8ed
--- /dev/null
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -0,0 +1,472 @@
+
+
+
+
+NMSettingBridge
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMSettingBridge

+
NMSettingBridge — Describes connection properties for bridges

+

+

+
Synopsis

+
+#include <nm-setting-bridge.h>
+
+                    NMSettingBridge;
+                    NMSettingBridgeClass;
+enum                NMSettingBridgeError;
+#define             NM_SETTING_BRIDGE_AGEING_TIME
+#define             NM_SETTING_BRIDGE_ERROR
+#define             NM_SETTING_BRIDGE_FORWARD_DELAY
+#define             NM_SETTING_BRIDGE_HELLO_TIME
+#define             NM_SETTING_BRIDGE_INTERFACE_NAME
+#define             NM_SETTING_BRIDGE_MAX_AGE
+#define             NM_SETTING_BRIDGE_PRIORITY
+#define             NM_SETTING_BRIDGE_SETTING_NAME
+#define             NM_SETTING_BRIDGE_STP
+GQuark              nm_setting_bridge_error_quark       (void);
+guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);
+const char *        nm_setting_bridge_get_interface_name
+                                                        (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);
+gboolean            nm_setting_bridge_get_stp           (NMSettingBridge *setting);
+NMSetting *         nm_setting_bridge_new               (void);
+

+

+

+
Object Hierarchy

+
+  GObject
+   +----NMSetting
+         +----NMSettingBridge
+

+
+  GEnum
+   +----NMSettingBridgeError
+

+

+

+
Properties

+
+  "ageing-time"              guint                 : Read / Write / Construct
+  "forward-delay"            guint                 : Read / Write / Construct
+  "hello-time"               guint                 : Read / Write / Construct
+  "interface-name"           gchar*                : Read / Write
+  "max-age"                  guint                 : Read / Write / Construct
+  "priority"                 guint                 : Read / Write / Construct
+  "stp"                      gboolean              : Read / Write / Construct
+

+

+

+
Description

+

+The NMSettingBridge object is a NMSetting subclass that describes properties
+necessary for bridging connections.
+

+

+

+
Details

+

+
NMSettingBridge

+
typedef struct _NMSettingBridge NMSettingBridge;

+

+

+

+

+

+
NMSettingBridgeClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBridgeClass;
+

+

+

+

+

+

+
enum NMSettingBridgeError

+
typedef enum {
+	NM_SETTING_BRIDGE_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
+} NMSettingBridgeError;
+

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


NM_SETTING_BRIDGE_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY
the property was missing and is
+required
+

+

+

+

+
NM_SETTING_BRIDGE_AGEING_TIME

+
#define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_ERROR

+
#define NM_SETTING_BRIDGE_ERROR nm_setting_bridge_error_quark ()
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_FORWARD_DELAY

+
#define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_HELLO_TIME

+
#define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_INTERFACE_NAME

+
#define NM_SETTING_BRIDGE_INTERFACE_NAME "interface-name"
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_MAX_AGE

+
#define NM_SETTING_BRIDGE_MAX_AGE        "max-age"
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_PRIORITY

+
#define NM_SETTING_BRIDGE_PRIORITY       "priority"
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_SETTING_NAME

+
#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_STP

+
#define NM_SETTING_BRIDGE_STP            "stp"
+

+

+

+

+

+

+
nm_setting_bridge_error_quark ()

+
GQuark              nm_setting_bridge_error_quark       (void);

+

+Registers an error quark for NMSettingBridge if necessary.
+

+

++
+
+
+
+


Returns :
the error quark used for NMSettingBridge errors.

+

+

+

+
nm_setting_bridge_get_ageing_time ()

+
guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingBridge
+
Returns :
the "ageing-time" property of the setting

+

+

+

+
nm_setting_bridge_get_forward_delay ()

+
guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingBridge
+
Returns :
the "forward-delay" property of the setting

+

+

+

+
nm_setting_bridge_get_hello_time ()

+
guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingBridge
+
Returns :
the "hello-time" property of the setting

+

+

+

+
nm_setting_bridge_get_interface_name ()

+
const char *        nm_setting_bridge_get_interface_name
+                                                        (NMSettingBridge *setting);

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingBridge
+
Returns :
the "interface-name" property of the setting

+

+

+

+
nm_setting_bridge_get_max_age ()

+
guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingBridge
+
Returns :
the "max-age" property of the setting

+

+

+

+
nm_setting_bridge_get_priority ()

+
guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingBridge
+
Returns :
the "priority" property of the setting

+

+

+

+
nm_setting_bridge_get_stp ()

+
gboolean            nm_setting_bridge_get_stp           (NMSettingBridge *setting);

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingBridge
+
Returns :
the "stp" property of the setting

+

+

+

+
nm_setting_bridge_new ()

+
NMSetting *         nm_setting_bridge_new               (void);

+

+Creates a new NMSettingBridge object with default values.
+

+

++
+
+
+
+


Returns :
the new empty NMSettingBridge object. [transfer full]
+

+

+

+

+
Property Details

+

+
The "ageing-time" property

+
  "ageing-time"              guint                 : Read / Write / Construct

+

+The ethernet MAC address aging time, in seconds.
+

+
Allowed values: <= 1000000

+
Default value: 300

+

+

+

+
The "forward-delay" property

+
  "forward-delay"            guint                 : Read / Write / Construct

+

+The Spanning Tree Protocol (STP) forwarding delay, in seconds.
+

+
Allowed values: <= 30

+
Default value: 15

+

+

+

+
The "hello-time" property

+
  "hello-time"               guint                 : Read / Write / Construct

+

+The Spanning Tree Protocol (STP) hello time, in seconds.
+

+
Allowed values: <= 10

+
Default value: 2

+

+

+

+
The "interface-name" property

+
  "interface-name"           gchar*                : Read / Write

+

+The name of the virtual in-kernel briding network interface
+

+
Default value: NULL

+

+

+

+
The "max-age" property

+
  "max-age"                  guint                 : Read / Write / Construct

+

+The Spanning Tree Protocol (STP) maximum message age, in seconds.
+

+
Allowed values: <= 40

+
Default value: 20

+

+

+

+
The "priority" property

+
  "priority"                 guint                 : Read / Write / Construct

+

+Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower
+values are "better"; the lowest priority bridge will be elected the root
+bridge.
+

+
Allowed values: <= 65535

+
Default value: 128

+

+

+

+
The "stp" property

+
  "stp"                      gboolean              : Read / Write / Construct

+

+Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
+

+
Default value: TRUE

+

+

+

+

+

+          Generated by GTK-Doc V1.18

+
+
\ 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 00000000..e5ce3b47
--- /dev/null
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -0,0 +1,314 @@
+
+
+
+
+NMSettingBridgePort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMSettingBridgePort

+
NMSettingBridgePort — Describes connection properties for bridge ports

+

+

+
Synopsis

+
+#include <nm-setting-bridge-port.h>
+
+                    NMSettingBridgePort;
+                    NMSettingBridgePortClass;
+enum                NMSettingBridgePortError;
+#define             NM_SETTING_BRIDGE_PORT_ERROR
+#define             NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
+#define             NM_SETTING_BRIDGE_PORT_PATH_COST
+#define             NM_SETTING_BRIDGE_PORT_PRIORITY
+#define             NM_SETTING_BRIDGE_PORT_SETTING_NAME
+GQuark              nm_setting_bridge_port_error_quark  (void);
+gboolean            nm_setting_bridge_port_get_hairpin_mode
+                                                        (NMSettingBridgePort *setting);
+guint16             nm_setting_bridge_port_get_path_cost
+                                                        (NMSettingBridgePort *setting);
+guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);
+NMSetting *         nm_setting_bridge_port_new          (void);
+

+

+

+
Object Hierarchy

+
+  GObject
+   +----NMSetting
+         +----NMSettingBridgePort
+

+
+  GEnum
+   +----NMSettingBridgePortError
+

+

+

+
Properties

+
+  "hairpin-mode"             gboolean              : Read / Write
+  "path-cost"                guint                 : Read / Write / Construct
+  "priority"                 guint                 : Read / Write / Construct
+

+

+

+
Description

+

+The NMSettingBridgePort object is a NMSetting subclass that describes
+optional properties that apply to bridge ports.
+

+

+

+
Details

+

+
NMSettingBridgePort

+
typedef struct _NMSettingBridgePort NMSettingBridgePort;

+

+

+

+

+

+
NMSettingBridgePortClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBridgePortClass;
+

+

+

+

+

+

+
enum NMSettingBridgePortError

+
typedef enum {
+	NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
+} NMSettingBridgePortError;
+

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY
the property was missing and
+is required
+

+

+

+

+
NM_SETTING_BRIDGE_PORT_ERROR

+
#define NM_SETTING_BRIDGE_PORT_ERROR nm_setting_bridge_port_error_quark ()
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE

+
#define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_PORT_PATH_COST

+
#define NM_SETTING_BRIDGE_PORT_PATH_COST    "path-cost"
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_PORT_PRIORITY

+
#define NM_SETTING_BRIDGE_PORT_PRIORITY     "priority"
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_PORT_SETTING_NAME

+
#define NM_SETTING_BRIDGE_PORT_SETTING_NAME "bridge-port"
+

+

+

+

+

+

+
nm_setting_bridge_port_error_quark ()

+
GQuark              nm_setting_bridge_port_error_quark  (void);

+

+Registers an error quark for NMSettingBridgePort if necessary.
+

+

++
+
+
+
+


Returns :
the error quark used for NMSettingBridgePort errors.

+

+

+

+
nm_setting_bridge_port_get_hairpin_mode ()

+
gboolean            nm_setting_bridge_port_get_hairpin_mode
+                                                        (NMSettingBridgePort *setting);

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingBridgePort
+
Returns :
the "hairpin-mode" property of the setting

+

+

+

+
nm_setting_bridge_port_get_path_cost ()

+
guint16             nm_setting_bridge_port_get_path_cost
+                                                        (NMSettingBridgePort *setting);

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingBridgePort
+
Returns :
the "path-cost" property of the setting

+

+

+

+
nm_setting_bridge_port_get_priority ()

+
guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingBridgePort
+
Returns :
the "priority" property of the setting

+

+

+

+
nm_setting_bridge_port_new ()

+
NMSetting *         nm_setting_bridge_port_new          (void);

+

+Creates a new NMSettingBridgePort object with default values.
+

+

++
+
+
+
+


Returns :
the new empty NMSettingBridgePort object. [transfer full]
+

+

+

+

+
Property Details

+

+
The "hairpin-mode" property

+
  "hairpin-mode"             gboolean              : Read / Write

+

+Enables or disabled 'hairpin mode' for the port, which allows frames to
+be sent back out through the port the frame was received on.
+

+
Default value: FALSE

+

+

+

+
The "path-cost" property

+
  "path-cost"                guint                 : Read / Write / Construct

+

+The Spanning Tree Protocol (STP) port cost for destinations via this port.
+

+
Allowed values: <= 65535

+
Default value: 100

+

+

+

+
The "priority" property

+
  "priority"                 guint                 : Read / Write / Construct

+

+The Spanning Tree Protocol (STP) priority of this bridge port.
+

+
Allowed values: <= 63

+
Default value: 32

+

+

+

+

+

+          Generated by GTK-Doc V1.18

+
+
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index f83cfc86..bb1014e5 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -53,6 +53,7 @@ enum                NM_SETTING_CONNECTION_MASTER
 #define             NM_SETTING_CONNECTION_PERMISSIONS
 #define             NM_SETTING_CONNECTION_READ_ONLY
+#define             NM_SETTING_CONNECTION_SECONDARIES
 #define             NM_SETTING_CONNECTION_SETTING_NAME
 #define             NM_SETTING_CONNECTION_SLAVE_TYPE
 #define             NM_SETTING_CONNECTION_TIMESTAMP
@@ -64,6 +65,8 @@ enum                const char *ptype,
                                                          const char *pitem,
                                                          const char *detail);
+gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
+                                                         const char *sec_uuid);
 GQuark              nm_setting_connection_error_quark   (void);
 gboolean            nm_setting_connection_get_autoconnect
                                                         (NMSettingConnection *setting);
@@ -73,6 +76,8 @@ const char *        char *        nm_setting_connection_get_master    (NMSettingConnection *setting);
 guint32             nm_setting_connection_get_num_permissions
                                                         (NMSettingConnection *setting);
+guint32             nm_setting_connection_get_num_secondaries
+                                                        (NMSettingConnection *setting);
 gboolean            nm_setting_connection_get_permission
                                                         (NMSettingConnection *setting,
                                                          guint32 idx,
@@ -80,6 +85,8 @@ const char *        const char **out_pitem,
                                                          const char **out_detail);
 gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);
+const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
+                                                         guint32 idx);
 const char *        nm_setting_connection_get_slave_type
                                                         (NMSettingConnection *setting);
 guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);
@@ -94,6 +101,9 @@ const char *        void                nm_setting_connection_remove_permission
                                                         (NMSettingConnection *setting,
                                                          guint32 idx);
+void                nm_setting_connection_remove_secondary
+                                                        (NMSettingConnection *setting,
+                                                         guint32 idx);
@@ -116,6 +126,7 @@ const char * master" gchar* : Read / Write "permissions" GSList_gchararray_* : Read / Write "read-only" gboolean : Read / Write / Construct + "secondaries" GSList_gchararray_* : Read / Write "slave-type" gchar* : Read / Write "timestamp" guint64 : Read / Write / Construct "type" gchar* : Read / Write @@ -259,6 +270,14 @@ Describes errors that may result from operations involving a
+

NM_SETTING_CONNECTION_SECONDARIES

+
#define NM_SETTING_CONNECTION_SECONDARIES "secondaries"
+
+

+

+
+
+

NM_SETTING_CONNECTION_SETTING_NAME

#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
@@ -351,6 +370,35 @@ present in the list
+

nm_setting_connection_add_secondary ()

+
gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
+                                                         const char *sec_uuid);
+

+Adds a new secondary connetion UUID to the setting. +

+
++ + + + + + + + + + + + + + +

setting :

the NMSettingConnection +

sec_uuid :

the secondary connection UUID to add

Returns :

 +TRUE if the secondary connection UUID was added; FALSE if the UUID +was already present
+
+
+

nm_setting_connection_error_quark ()

GQuark              nm_setting_connection_error_quark   (void);

@@ -481,6 +529,26 @@ property of this setting.

+

nm_setting_connection_get_num_secondaries ()

+
guint32             nm_setting_connection_get_num_secondaries
+                                                        (NMSettingConnection *setting);
+
++ + + + + + + + + + +

setting :

the NMSettingConnection +

Returns :

the number of configured secondary connection UUIDs
+
+
+

nm_setting_connection_get_permission ()

gboolean            nm_setting_connection_get_permission
                                                         (NMSettingConnection *setting,
@@ -550,6 +618,31 @@ Returns the 
+
nm_setting_connection_get_secondary ()

+
const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
+                                                         guint32 idx);

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingConnection
+
idx :
the zero-based index of the secondary connection UUID entry
Returns :
the secondary connection UUID at index idx
+

+
+
+

nm_setting_connection_get_slave_type ()

const char *        nm_setting_connection_get_slave_type
                                                         (NMSettingConnection *setting);
@@ -732,6 +825,30 @@ Removes the permission at index idx from
+
+
+

nm_setting_connection_remove_secondary ()

+
void                nm_setting_connection_remove_secondary
+                                                        (NMSettingConnection *setting,
+                                                         guint32 idx);
+

+Removes the secondary coonnection UUID at index idx. +

+
++ + + + + + + + + + +

setting :

the NMSettingConnection +

idx :

index number of the secondary connection UUID
+

Property Details

@@ -800,6 +917,15 @@ if the connection is read-only and cannot be modified.
+

The "secondaries" property

+
  "secondaries"              GSList_gchararray_*   : Read / Write
+

+List of connection UUIDs that should be activated when the base connection +itself is activated. +

+
+
+

The "slave-type" property

  "slave-type"               gchar*                : Read / Write

diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html index f2522cdc..d10521ac 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;

@@ -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 + +

NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G

+4G/LTE-type technologies are +preferred but 3G/2/-type technologies may be used as a fallback + + + +

NM_SETTING_GSM_NETWORK_TYPE_4G

+only 4G/LTE type +technologies may be used + +
@@ -746,7 +760,7 @@ technologies. Permitted values are those specified by NMSettingGsmNetworkType. Note that not all devices allow network preference control.

-

Allowed values: [G_MAXULONG,3]

+

Allowed values: [G_MAXULONG,5]

Default value: -1

diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html index 1f9e666b..df6762af 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. 
  "dhcp-client-id"           gchar*                : Read / Write

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.

Default value: NULL

@@ -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.

diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html index b053bd27..b467336f 100644 --- a/docs/libnm-util/html/NMSettingIP6Config.html +++ b/docs/libnm-util/html/NMSettingIP6Config.html @@ -51,6 +51,7 @@ typedef NM enum NMSettingIP6ConfigError; enum NMSettingIP6ConfigPrivacy; #define NM_SETTING_IP6_CONFIG_ADDRESSES +#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME #define NM_SETTING_IP6_CONFIG_DNS #define NM_SETTING_IP6_CONFIG_DNS_SEARCH #define NM_SETTING_IP6_CONFIG_ERROR @@ -119,6 +120,8 @@ const struct in6_addr * GQuark nm_setting_ip6_config_error_quark (void); NMIP6Address * nm_setting_ip6_config_get_address (NMSettingIP6Config *setting, guint32 i); +const char * nm_setting_ip6_config_get_dhcp_hostname + (NMSettingIP6Config *setting); const struct in6_addr * nm_setting_ip6_config_get_dns (NMSettingIP6Config *setting, guint32 i); const char * nm_setting_ip6_config_get_dns_search @@ -184,6 +187,7 @@ const char *

Properties

   "addresses"                GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*  : Read / Write
+  "dhcp-hostname"            gchar*                : Read / Write
   "dns"                      GPtrArray_GArray_guchar__*  : Read / Write
   "dns-search"               GSList_gchararray_*   : Read / Write
   "ignore-auto-dns"          gboolean              : Read / Write / Construct
@@ -332,6 +336,14 @@ are enabled and temporary addresses are preferred over public addresses
 
 

 

+
NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME

+
#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
+

+

+

+

+

+

 
NM_SETTING_IP6_CONFIG_DNS

 
#define NM_SETTING_IP6_CONFIG_DNS                "dns"
 

@@ -1227,6 +1239,30 @@ Registers an error quark for 
 

 

+
nm_setting_ip6_config_get_dhcp_hostname ()

+
const char *        nm_setting_ip6_config_get_dhcp_hostname
+                                                        (NMSettingIP6Config *setting);

+

+Returns the value contained in the "dhcp-hostname"
+property.
+

+

++
+
+
+
+
+
+
+
+
+
+


setting :
the NMSettingIP6Config
+
Returns :
the configured hostname to send to the DHCP server

+

+

+

 
nm_setting_ip6_config_get_dns ()

 
const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
                                                          guint32 i);

@@ -1657,6 +1693,15 @@ assigned an address with these methods.
 

 

 

+
The "dhcp-hostname" property

+
  "dhcp-hostname"            gchar*                : Read / Write

+

+The specified name will be sent to the DHCP server when acquiring a lease.
+

+
Default value: NULL

+

+

+

 
The "dns" property

 
  "dns"                      GPtrArray_GArray_guchar__*  : Read / Write

 

diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index a208bff1..03755208 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -14,7 +14,7 @@
 
 
-
+
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index 013c31f1..b1edb3ad 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.
 
typedef enum {
 	NM_SETTING_VLAN_ERROR_UNKNOWN = 0,      /*< nick=Unknown >*/
 	NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
-	NM_SETTING_VLAN_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
+	NM_SETTING_VLAN_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
+	NM_SETTING_VLAN_ERROR_INVALID_PARENT    /*< nick=InvalidParent >*/
 } NMSettingVlanError;
 

@@ -171,7 +172,13 @@ necessary for connection to VLAN interfaces.
 
+
+
+
+
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 85e17c1d..e3d964a4 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -57,6 +57,7 @@ enum                NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
 #define             NM_SETTING_WIRELESS_MODE
 #define             NM_SETTING_WIRELESS_MODE_ADHOC
+#define             NM_SETTING_WIRELESS_MODE_AP
 #define             NM_SETTING_WIRELESS_MODE_INFRA
 #define             NM_SETTING_WIRELESS_MTU
 #define             NM_SETTING_WIRELESS_RATE
@@ -287,6 +288,16 @@ Indicates Ad-Hoc mode where no access point is expected to be present.
 

+
NM_SETTING_WIRELESS_MODE_AP

+
#define NM_SETTING_WIRELESS_MODE_AP     "ap"
+

+

+Indicates AP/master mode where the wireless device is started as an access
+point/hotspot.
+

+

+

+

 
NM_SETTING_WIRELESS_MODE_INFRA

 
#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
 

@@ -357,9 +368,10 @@ for this connection.
 
gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
                                                          const char *bssid);

 

-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.
 

 

 
NM_SETTING_VLAN_ERROR_MISSING_PROPERTY

 the property was missing and is
-required
+  required
+
NM_SETTING_VLAN_ERROR_INVALID_PARENT
the VLAN parent was specified
+  inconsistently
 
 

 
 
 
@@ -853,7 +865,7 @@ MAC address is in the standard hex-digits-and-colons notation.
 
The "mode" property
  "mode"                     gchar*                : Read / Write

-WiFi network mode; one of 'infrastructure' or 'adhoc'.  If blank,
+WiFi network mode; one of 'infrastructure', 'adhoc' or 'ap'.  If blank,
 infrastructure is assumed.
 
Default value: NULL

@@ -897,9 +909,10 @@ the connection contains a valid 802-11-wireless-security setting.
 
  "seen-bssids"              GSList_gchararray_*   : Read / Write

 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.
 

diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 2e5d124d..807aea99 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -135,6 +135,14 @@
 

+nm_connection_get_setting_bridge, function in NMConnection
+

+

+

+nm_connection_get_setting_bridge_port, function in NMConnection
+

+

+

 nm_connection_get_setting_by_name, function in NMConnection
 

@@ -701,6 +709,70 @@
 

+NMSettingBridge, struct in NMSettingBridge
+

+

+

+NMSettingBridge:ageing-time, object property in NMSettingBridge
+

+

+

+NMSettingBridge:forward-delay, object property in NMSettingBridge
+

+

+

+NMSettingBridge:hello-time, object property in NMSettingBridge
+

+

+

+NMSettingBridge:interface-name, object property in NMSettingBridge
+

+

+

+NMSettingBridge:max-age, object property in NMSettingBridge
+

+

+

+NMSettingBridge:priority, object property in NMSettingBridge
+

+

+

+NMSettingBridge:stp, object property in NMSettingBridge
+

+

+

+NMSettingBridgeClass, struct in NMSettingBridge
+

+

+

+NMSettingBridgeError, enum in NMSettingBridge
+

+

+

+NMSettingBridgePort, struct in NMSettingBridgePort
+

+

+

+NMSettingBridgePort:hairpin-mode, object property in NMSettingBridgePort
+

+

+

+NMSettingBridgePort:path-cost, object property in NMSettingBridgePort
+

+

+

+NMSettingBridgePort:priority, object property in NMSettingBridgePort
+

+

+

+NMSettingBridgePortClass, struct in NMSettingBridgePort
+

+

+

+NMSettingBridgePortError, enum in NMSettingBridgePort
+

+

+

 NMSettingCdma, struct in NMSettingCdma
 

@@ -765,6 +837,10 @@
 

+NMSettingConnection:secondaries, object property in NMSettingConnection
+

+

+

 NMSettingConnection:slave-type, object property in NMSettingConnection
 

@@ -961,6 +1037,10 @@
 

+NMSettingIP6Config:dhcp-hostname, object property in NMSettingIP6Config
+

+

+

 NMSettingIP6Config:dns, object property in NMSettingIP6Config
 

@@ -2085,6 +2165,118 @@
 

+NM_SETTING_BRIDGE_AGEING_TIME, macro in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_ERROR, macro in NMSettingBridge
+

+

+

+nm_setting_bridge_error_quark, function in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_FORWARD_DELAY, macro in NMSettingBridge
+

+

+

+nm_setting_bridge_get_ageing_time, function in NMSettingBridge
+

+

+

+nm_setting_bridge_get_forward_delay, function in NMSettingBridge
+

+

+

+nm_setting_bridge_get_hello_time, function in NMSettingBridge
+

+

+

+nm_setting_bridge_get_interface_name, function in NMSettingBridge
+

+

+

+nm_setting_bridge_get_max_age, function in NMSettingBridge
+

+

+

+nm_setting_bridge_get_priority, function in NMSettingBridge
+

+

+

+nm_setting_bridge_get_stp, function in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_HELLO_TIME, macro in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_INTERFACE_NAME, macro in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_MAX_AGE, macro in NMSettingBridge
+

+

+

+nm_setting_bridge_new, function in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_PORT_ERROR, macro in NMSettingBridgePort
+

+

+

+nm_setting_bridge_port_error_quark, function in NMSettingBridgePort
+

+

+

+nm_setting_bridge_port_get_hairpin_mode, function in NMSettingBridgePort
+

+

+

+nm_setting_bridge_port_get_path_cost, function in NMSettingBridgePort
+

+

+

+nm_setting_bridge_port_get_priority, function in NMSettingBridgePort
+

+

+

+NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, macro in NMSettingBridgePort
+

+

+

+nm_setting_bridge_port_new, function in NMSettingBridgePort
+

+

+

+NM_SETTING_BRIDGE_PORT_PATH_COST, macro in NMSettingBridgePort
+

+

+

+NM_SETTING_BRIDGE_PORT_PRIORITY, macro in NMSettingBridgePort
+

+

+

+NM_SETTING_BRIDGE_PORT_SETTING_NAME, macro in NMSettingBridgePort
+

+

+

+NM_SETTING_BRIDGE_PRIORITY, macro in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_SETTING_NAME, macro in NMSettingBridge
+

+

+

+NM_SETTING_BRIDGE_STP, macro in NMSettingBridge
+

+

+

 NM_SETTING_CDMA_ERROR, macro in NMSettingCdma
 

@@ -2149,6 +2341,10 @@
 

+nm_setting_connection_add_secondary, function in NMSettingConnection
+

+

+

 NM_SETTING_CONNECTION_AUTOCONNECT, macro in NMSettingConnection
 

@@ -2181,6 +2377,10 @@
 

+nm_setting_connection_get_num_secondaries, function in NMSettingConnection
+

+

+

 nm_setting_connection_get_permission, function in NMSettingConnection
 

@@ -2189,6 +2389,10 @@
 

+nm_setting_connection_get_secondary, function in NMSettingConnection
+

+

+

 nm_setting_connection_get_slave_type, function in NMSettingConnection
 

@@ -2237,6 +2441,14 @@
 

+nm_setting_connection_remove_secondary, function in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_SECONDARIES, macro in NMSettingConnection
+

+

+

 NM_SETTING_CONNECTION_SETTING_NAME, macro in NMSettingConnection
 

@@ -2669,6 +2881,10 @@
 

+NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME, macro in NMSettingIP6Config
+

+

+

 NM_SETTING_IP6_CONFIG_DNS, macro in NMSettingIP6Config
 

@@ -2689,6 +2905,10 @@
 

+nm_setting_ip6_config_get_dhcp_hostname, function in NMSettingIP6Config
+

+

+

 nm_setting_ip6_config_get_dns, function in NMSettingIP6Config
 

@@ -3093,6 +3313,10 @@
 

+NM_SETTING_REGISTER_TYPE, macro in nm-setting-private
+

+

+

 NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

@@ -3597,6 +3821,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_WIRELESS_MODE_AP, macro in NMSettingWireless
+

+

+

 NM_SETTING_WIRELESS_MODE_INFRA, macro in NMSettingWireless
 

@@ -3830,6 +4058,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+nm_utils_ap_mode_security_valid, function in nm-utils
+

+

+

 nm_utils_deinit, function in nm-utils
 

@@ -3870,6 +4102,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+nm_utils_iface_valid_name, function in nm-utils
+

+

+

 nm_utils_init, function in nm-utils
 

@@ -3930,6 +4166,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+nm_utils_is_uuid, function in nm-utils
+

+

+

 nm_utils_rsa_key_encrypt, function in nm-utils
 

diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index c3f6cd8e..cba034e1 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -21,7 +21,7 @@
 

 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 

 

-libnm-util API Reference

+libnm-util API Reference

 

 

 NMConnection — Describes a connection to specific network or provider
@@ -62,6 +62,12 @@ serial communications
 NMSettingBond — Describes connection properties for bonds
 

 

+NMSettingBridge — Describes connection properties for bridges
+

+

+NMSettingBridgePort — Describes connection properties for bridge ports
+

+

 NMSettingInfiniband — Describes connection properties for IP-over-InfiniBand networks
 

 

diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 9273a726..1da1ad01 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,14 +15,14 @@
 

 

 

-      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
       http://projects.gnome.org/NetworkManager/developers/libnm-util/09/.
     

 
Copyright © 2012 The NetworkManager Authors

 

-

+

 	Permission is granted to copy, distribute and/or modify this
 	document under the terms of the GNU Free
 	Documentation License, Version 1.1 or any later
@@ -88,6 +88,12 @@ serial communications
 NMSettingBond — Describes connection properties for bonds
 

 

+NMSettingBridge — Describes connection properties for bridges
+

+

+NMSettingBridgePort — Describes connection properties for bridge ports
+

+

 NMSettingInfiniband — Describes connection properties for IP-over-InfiniBand networks
 

 

diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index 2fa04eaf..330e08a9 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -33,6 +33,8 @@
 
 
 
+
+
 
 
 
@@ -155,6 +157,7 @@
 
 
 
+
 
 
 
@@ -162,14 +165,17 @@
 
 
 
+
 
 
 
 
 
 
+
 
 
+
 
 
 
@@ -178,12 +184,14 @@
 
 
 
+
 
 
 
 
 
 
+
 
 
 
@@ -269,6 +277,7 @@
 
 
 
+
 
 
 
@@ -530,6 +539,8 @@
 
 
 
+
+
 
 
 
@@ -630,6 +641,72 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -672,6 +749,7 @@
 
 
 
+
 
 
 
@@ -1061,6 +1139,7 @@
 
 
 
+
 
 
 
@@ -1112,6 +1191,7 @@
 
 
 
+
 
 
 
@@ -1132,6 +1212,7 @@
 
 
 
+
 
 
 
@@ -1301,6 +1382,7 @@
 
 
 
+
 
 
 
@@ -1310,6 +1392,7 @@
 
 
 
+
 
 
 
@@ -1325,6 +1408,7 @@
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 694287db..eaa3def1 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                NMUtilsSecurityType;
 #define             NM_UTILS_HWADDR_LEN_MAX
+gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps);
 void                nm_utils_deinit                     (void);
 const char *        nm_utils_escape_ssid                (const guint8 *ssid,
                                                          guint32 len);
@@ -58,6 +60,7 @@ const char *        char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
                                                          int type);
 int                 nm_utils_hwaddr_type                (int len);
+gboolean            nm_utils_iface_valid_name           (const char *name);
 gboolean            nm_utils_init                       (GError **error);
 GSList *            nm_utils_ip4_addresses_from_gvalue  (const GValue *value);
 void                nm_utils_ip4_addresses_to_gvalue    (GSList *list,
@@ -79,6 +82,7 @@ const char *        GValue *value);
 gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
                                                          int len);
+gboolean            nm_utils_is_uuid                    (const char *str);
 GByteArray *        nm_utils_rsa_key_encrypt            (const GByteArray *data,
                                                          const char *in_password,
                                                          char **out_password,
@@ -209,6 +213,39 @@ as the size of the buffer passed to 
+
nm_utils_ap_mode_security_valid ()

+
gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps);

+

+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.
+

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


type :
the security type to check device capabilties against,
+e.g. NMU_SEC_STATIC_WEP
+
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
+NM_WIFI_DEVICE_CAP_CIPHER_WEP40
+
Returns :
TRUE if the device capabilities are compatible with the desired
+type, FALSE if they are not.

+

+

+

 
nm_utils_deinit ()

 
void                nm_utils_deinit                     (void);

 

@@ -433,6 +470,29 @@ the address length was not recognized
 

 

 

+
nm_utils_iface_valid_name ()

+
gboolean            nm_utils_iface_valid_name           (const char *name);

+

+This function is a 1:1 copy of the kernel's interface validation
+function in net/core/dev.c.
+

+

++
+
+
+
+
+
+
+
+
+
+


name :
Name of interface
Returns :

+TRUE if interface name is valid, otherwise FALSE is returned.

+

+

+

 
nm_utils_init ()

 
gboolean            nm_utils_init                       (GError **error);

 

@@ -820,6 +880,28 @@ number of known SSID-cloaking methods.
 

 

 

+
nm_utils_is_uuid ()

+
gboolean            nm_utils_is_uuid                    (const char *str);

+

+Checks if str is a UUID
+

+

++
+
+
+
+
+
+
+
+
+
+


str :
a string that might be a UUID
Returns :

+TRUE if str is a UUID, FALSE if not

+

+

+

 
nm_utils_rsa_key_encrypt ()

 
GByteArray *        nm_utils_rsa_key_encrypt            (const GByteArray *data,
                                                          const char *in_password,
@@ -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.
 

+

+NOTE: this function cannot handle checking security for AP/Hotspot mode;
+use nm_utils_ap_mode_security_valid() instead.
+

 

diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 5b50abff..468cd5ea 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -15,6 +15,8 @@
       
       
       
+      
+      
       
       
       
@@ -54,6 +56,8 @@
     
     
     
+    
+    
     
     
     
@@ -130,6 +134,7 @@
     
     
     
+    
     
     
     
@@ -137,14 +142,17 @@
     
     
     
+    
     
     
     
     
     
     
+    
     
     
+    
     
     
     
@@ -153,11 +161,13 @@
     
     
     
+    
     
     
     
     
     
+    
     
     
     
@@ -220,6 +230,7 @@
     
     
     
+    
     
     
     
@@ -466,6 +477,50 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -794,6 +849,7 @@
     
     
     
+    
     
     
     
@@ -845,6 +901,7 @@
     
     
     
+    
     
     
     
@@ -864,6 +921,7 @@
     
     
     
+    
     
     
     
@@ -983,6 +1041,7 @@
     
     
     
+    
     
     
     
@@ -992,6 +1051,7 @@
     
     
     
+    
     
     
     
@@ -1007,6 +1067,7 @@
     
     
     
+    
     
     
     
@@ -1102,6 +1163,8 @@
     
     
     
+    
+    
     
     
     
@@ -1110,12 +1173,19 @@
     
     
     
+    
+    
+    
+    
+    
+    
     
     
     
     
     
     
+    
     
     
     
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index ea1caff3..e6ea328c 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -24,28 +24,30 @@
 Object Hierarchy
 
     GObject
-        NMConnection
         NMSetting
             NMSetting8021x
             NMSettingAdsl
             NMSettingBluetooth
             NMSettingBond
-            NMSettingCdma
+            NMSettingBridge
+            NMSettingBridgePort
             NMSettingConnection
-            NMSettingGsm
             NMSettingInfiniband
             NMSettingIP4Config
+            NMSettingVlan
             NMSettingIP6Config
-            NMSettingOlpcMesh
             NMSettingPPP
             NMSettingPPPOE
             NMSettingSerial
-            NMSettingVlan
-            NMSettingVPN
+            NMSettingGsm
+            NMSettingCdma
+            NMSettingOlpcMesh
             NMSettingWimax
             NMSettingWired
             NMSettingWireless
             NMSettingWirelessSecurity
+            NMSettingVPN
+        NMConnection
     GEnum
         NMConnectionError
         NMSetting8021xCKFormat
@@ -54,6 +56,8 @@
         NMSettingAdslError
         NMSettingBluetoothError
         NMSettingBondError
+        NMSettingBridgeError
+        NMSettingBridgePortError
         NMSettingCdmaError
         NMSettingCompareFlags
         NMSettingConnectionError
diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml
index 66b402c3..eaef2623 100644
--- a/docs/libnm-util/libnm-util-docs.sgml
+++ b/docs/libnm-util/libnm-util-docs.sgml
@@ -56,6 +56,8 @@
     
     
     
+    
+    
     
     
     
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index 1218f8d3..7515e23a 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
@@ -64,11 +66,6 @@ NM_TYPE_CONNECTION
 nm_connection_get_type
 
 
-

-nm-connection-private
-
-

-
 

 nm-setting
 NMSetting
@@ -333,6 +330,66 @@ NM_TYPE_SETTING_BOND
 nm_setting_bond_get_type
 

 
+

+nm-setting-bridge
+NMSettingBridge
+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
+
+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
+

+
+

+nm-setting-bridge-port
+NMSettingBridgePort
+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
+
+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
+

+
 

 nm-setting-cdma
 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
 
 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
 
 

 nm-setting-private
+NM_SETTING_REGISTER_TYPE
 NM_SETTING_SECRET_FLAGS_ALL
 

 
@@ -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
 nm-utils
 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 511e539d..ae007747 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 0ceaa403..00000000
--- a/docs/libnm-util/tmpl/nm-connection-private.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-nm-connection-private
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
index fa0b5d8b..89fd38c4 100644
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -9,13 +9,11 @@ NMConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -239,6 +237,24 @@ NMConnection
 @Returns: 
 
 
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
index f8ab2c77..10775224 100644
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
@@ -9,13 +9,11 @@ NMSetting8021x
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-adsl.sgml b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
index 0e209bc2..d81ae07f 100644
--- a/docs/libnm-util/tmpl/nm-setting-adsl.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
@@ -9,13 +9,11 @@ NMSettingAdsl
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
index cc64b574..9ab1b4b2 100644
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
@@ -9,13 +9,11 @@ NMSettingBluetooth
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml
index caa8b37a..8f7dbfc1 100644
--- a/docs/libnm-util/tmpl/nm-setting-bond.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bond.sgml
@@ -9,13 +9,11 @@ NMSettingBond
 
 
 
-
 
 
 
 
 
-
 
 
 
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 00000000..c86142ee
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
@@ -0,0 +1,143 @@
+
+NMSettingBridgePort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN: 
+@NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@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 00000000..69020537
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
@@ -0,0 +1,227 @@
+
+NMSettingBridge
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_BRIDGE_ERROR_UNKNOWN: 
+@NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
index 5d065170..7837016d 100644
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
@@ -9,13 +9,11 @@ NMSettingCdma
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
index d4f56800..13cd7055 100644
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -9,13 +9,11 @@ NMSettingConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -53,6 +51,11 @@ NMSettingConnection
 
 
 
+
+
+
+
+
 
 
 
@@ -142,6 +145,13 @@ NMSettingConnection
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -196,6 +206,16 @@ NMSettingConnection
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@sec_uuid: 
+@Returns: 
+
+
 
 
 
@@ -250,6 +270,15 @@ NMSettingConnection
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
 
 
 
@@ -272,6 +301,16 @@ NMSettingConnection
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@idx: 
+@Returns: 
+
+
 
 
 
@@ -346,3 +385,12 @@ NMSettingConnection
 @idx: 
 
 
+
+
+
+
+
+@setting: 
+@idx: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
index 0c9bdeb0..96327a4a 100644
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
@@ -9,13 +9,11 @@ NMSettingGsm
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -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: 
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
index 02a59881..ba7117c0 100644
--- a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
@@ -9,13 +9,11 @@ NMSettingInfiniband
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
index 4b915f2b..fbc1b4cc 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
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
index ad9c1b63..275827a7 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
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -45,6 +43,11 @@ NMSettingIP6Config
 
 
 
+
+
+
+
+
 
 
 
@@ -128,6 +131,13 @@ NMSettingIP6Config
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -552,6 +562,15 @@ NMSettingIP6Config
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
index 9a1e720e..744c87e3 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
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
index 90815380..f26d56fa 100644
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
@@ -9,13 +9,11 @@ NMSettingPPP
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
index 3c022169..942b5a04 100644
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
@@ -9,13 +9,11 @@ NMSettingPPPOE
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-private.sgml b/docs/libnm-util/tmpl/nm-setting-private.sgml
index b9740165..fdafc21b 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
 
 
 
-
 
 
 
 
 
-
 
 
 
 
 
 
+
+
+
+
+
+@x: 
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
index f0313441..542b9fbc 100644
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-serial.sgml
@@ -9,13 +9,11 @@ NMSettingSerial
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
index 49f40d1d..ff8bea01 100644
--- a/docs/libnm-util/tmpl/nm-setting-vlan.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
@@ -9,13 +9,11 @@ NMSettingVlan
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -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: 
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
index 567776c1..e29dfff9 100644
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
@@ -9,13 +9,11 @@ NMSettingVPN
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
index 0b96fa9f..9225504a 100644
--- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
@@ -9,13 +9,11 @@ NMSettingWimax
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
index 09fb963a..cff79594 100644
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml
@@ -9,13 +9,11 @@ NMSettingWired
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
index 01b16ce9..d653c682 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
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
index fdadf8b9..039f5787 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -9,13 +9,11 @@ NMSettingWireless
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -190,6 +188,13 @@ NMSettingWireless
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
index 2067408a..a5198c10 100644
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ b/docs/libnm-util/tmpl/nm-setting.sgml
@@ -9,13 +9,11 @@ NMSetting
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
index 82025822..5171db34 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
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
index 8a822fcf..d148c444 100644
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ b/docs/libnm-util/tmpl/nm-utils.sgml
@@ -9,13 +9,11 @@ nm-utils
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -44,6 +42,16 @@ nm-utils
 
 
 
+
+
+
+
+
+@type: 
+@wifi_caps: 
+@Returns: 
+
+
 
 
 
@@ -129,6 +137,15 @@ nm-utils
 @Returns: 
 
 
+
+
+
+
+
+@name: 
+@Returns: 
+
+
 
 
 
@@ -265,6 +282,15 @@ nm-utils
 @Returns: 
 
 
+
+
+
+
+
+@str: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index f6c687fe..fa572dcf 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-0.9.6.4
+0.9.7.995
-- 
cgit 1.3.0-6-gf8a5