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/Makefile.am | 3 +- docs/Makefile.in | 59 +- docs/api/Makefile.am | 12 +- docs/api/Makefile.in | 639 +++++++++++---------- docs/api/generate-settings-spec.c | 8 +- docs/api/html/NetworkManager.devhelp2 | 28 +- docs/api/html/index.html | 32 +- docs/api/html/ix01.html | 2 +- docs/api/html/ref-migrating.html | 58 +- docs/api/html/ref-settings.html | 247 +++++++- docs/api/html/spec.html | 81 ++- docs/api/settings-spec.xml | 187 +++++- docs/api/spec.html | 81 ++- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.am | 6 +- docs/libnm-glib/Makefile.in | 65 ++- docs/libnm-glib/html/NMAccessPoint.html | 4 +- docs/libnm-glib/html/NMClient.html | 10 +- docs/libnm-glib/html/NMDevice.html | 1 + docs/libnm-glib/html/NMDeviceBond.html | 4 +- docs/libnm-glib/html/NMDeviceBridge.html | 331 +++++++++++ docs/libnm-glib/html/NMDeviceInfiniband.html | 4 +- docs/libnm-glib/html/NMDeviceWifi.html | 2 +- docs/libnm-glib/html/NMSecretAgent.html | 20 +- docs/libnm-glib/html/api-index-full.html | 60 ++ docs/libnm-glib/html/ch02.html | 5 +- docs/libnm-glib/html/index.html | 7 +- docs/libnm-glib/html/index.sgml | 27 + docs/libnm-glib/html/libnm-glib.devhelp2 | 20 + docs/libnm-glib/html/object-tree.html | 1 + docs/libnm-glib/libnm-glib-docs.xml | 1 + docs/libnm-glib/libnm-glib-sections.txt | 27 + docs/libnm-glib/libnm-glib.types | 2 + docs/libnm-glib/tmpl/libnm_glib.sgml | 2 - docs/libnm-glib/tmpl/nm-access-point.sgml | 2 - docs/libnm-glib/tmpl/nm-active-connection.sgml | 2 - docs/libnm-glib/tmpl/nm-client.sgml | 2 - docs/libnm-glib/tmpl/nm-device-adsl.sgml | 2 - docs/libnm-glib/tmpl/nm-device-bond.sgml | 2 - docs/libnm-glib/tmpl/nm-device-bridge.sgml | 140 +++++ docs/libnm-glib/tmpl/nm-device-bt.sgml | 2 - docs/libnm-glib/tmpl/nm-device-ethernet.sgml | 2 - docs/libnm-glib/tmpl/nm-device-infiniband.sgml | 2 - docs/libnm-glib/tmpl/nm-device-modem.sgml | 2 - docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml | 2 - docs/libnm-glib/tmpl/nm-device-vlan.sgml | 2 - docs/libnm-glib/tmpl/nm-device-wifi.sgml | 2 - docs/libnm-glib/tmpl/nm-device-wimax.sgml | 2 - docs/libnm-glib/tmpl/nm-device.sgml | 2 - docs/libnm-glib/tmpl/nm-dhcp4-config.sgml | 2 - docs/libnm-glib/tmpl/nm-dhcp6-config.sgml | 2 - docs/libnm-glib/tmpl/nm-glib-enum-types.sgml | 2 - docs/libnm-glib/tmpl/nm-glib-marshal.sgml | 2 - docs/libnm-glib/tmpl/nm-ip4-config.sgml | 2 - docs/libnm-glib/tmpl/nm-ip6-config.sgml | 2 - docs/libnm-glib/tmpl/nm-object.sgml | 2 - docs/libnm-glib/tmpl/nm-remote-connection.sgml | 2 - docs/libnm-glib/tmpl/nm-remote-settings.sgml | 2 - docs/libnm-glib/tmpl/nm-secret-agent.sgml | 2 - docs/libnm-glib/tmpl/nm-types.sgml | 2 - docs/libnm-glib/tmpl/nm-vpn-connection.sgml | 2 - docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml | 2 - .../tmpl/nm-vpn-plugin-ui-interface.sgml | 2 - docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml | 2 - docs/libnm-glib/tmpl/nm-vpn-plugin.sgml | 2 - docs/libnm-glib/tmpl/nm-wimax-nsp.sgml | 2 - docs/libnm-glib/version.xml | 2 +- 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 +- 120 files changed, 3877 insertions(+), 701 deletions(-) create mode 100644 docs/libnm-glib/html/NMDeviceBridge.html create mode 100644 docs/libnm-glib/tmpl/nm-device-bridge.sgml 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') diff --git a/docs/Makefile.am b/docs/Makefile.am index a1d1b9b3..ee889220 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,6 +1,5 @@ -if WITH_DOCS +if ENABLE_DOC SUBDIRS = api libnm-glib libnm-util endif - diff --git a/docs/Makefile.in b/docs/Makefile.in index 05b6fe7d..1f11c8ed 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -54,16 +54,18 @@ subdir = docs DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 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 @@ -136,6 +138,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@ @@ -150,9 +156,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@ @@ -162,17 +166,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@ @@ -213,6 +214,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@ @@ -229,11 +231,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@ @@ -248,6 +246,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@ @@ -257,6 +257,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@ @@ -283,13 +284,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@ @@ -344,6 +346,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@ @@ -358,7 +365,11 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@WITH_DOCS_TRUE@SUBDIRS = api libnm-glib libnm-util +with_dhclient = @with_dhclient@ +with_dhcpcd = @with_dhcpcd@ +with_netconfig = @with_netconfig@ +with_resolvconf = @with_resolvconf@ +@ENABLE_DOC_TRUE@SUBDIRS = api libnm-glib libnm-util all: all-recursive .SUFFIXES: diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index 571926f5..ba98f168 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -2,11 +2,13 @@ GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c AUTOMAKE_OPTIONS = 1.7 -if WITH_DOCS +if ENABLE_DOC INCLUDES = \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/libnm-util + -I$(top_builddir)/include \ + -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util noinst_PROGRAMS = \ generate-settings-spec @@ -85,6 +87,6 @@ CLEANFILES = endif EXTRA_DIST += version.xml.in - -CLEANFILES += html/* tmpl/* xml/* - +CLEANFILES += html/* tmpl/* xml/* \ + NetworkManager-sections.txt \ + NetworkManager-overrides.txt diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index d1553258..8266f3a5 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -57,22 +57,24 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@WITH_DOCS_TRUE@noinst_PROGRAMS = generate-settings-spec$(EXEEXT) +@ENABLE_DOC_TRUE@noinst_PROGRAMS = generate-settings-spec$(EXEEXT) DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make subdir = docs/api 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 @@ -83,12 +85,12 @@ PROGRAMS = $(noinst_PROGRAMS) am__generate_settings_spec_SOURCES_DIST = generate-settings-spec.c am__objects_1 = \ generate_settings_spec-generate-settings-spec.$(OBJEXT) -@WITH_DOCS_TRUE@am_generate_settings_spec_OBJECTS = $(am__objects_1) +@ENABLE_DOC_TRUE@am_generate_settings_spec_OBJECTS = $(am__objects_1) generate_settings_spec_OBJECTS = $(am_generate_settings_spec_OBJECTS) am__DEPENDENCIES_1 = -@WITH_DOCS_TRUE@generate_settings_spec_DEPENDENCIES = \ -@WITH_DOCS_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ -@WITH_DOCS_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@ENABLE_DOC_TRUE@generate_settings_spec_DEPENDENCIES = \ +@ENABLE_DOC_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ +@ENABLE_DOC_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -140,6 +142,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@ @@ -154,9 +160,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@ @@ -166,17 +170,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@ @@ -217,6 +218,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@ @@ -233,11 +235,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@ @@ -252,6 +250,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@ @@ -261,6 +261,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@ @@ -287,13 +288,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@ @@ -348,6 +350,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@ @@ -362,108 +369,117 @@ 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@ GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c AUTOMAKE_OPTIONS = 1.7 -@WITH_DOCS_TRUE@INCLUDES = \ -@WITH_DOCS_TRUE@ -I$(top_srcdir)/include \ -@WITH_DOCS_TRUE@ -I$(top_srcdir)/libnm-util - -@WITH_DOCS_TRUE@generate_settings_spec_SOURCES = \ -@WITH_DOCS_TRUE@ $(GENERATE_SETTINGS_SPEC_SOURCE) - -@WITH_DOCS_TRUE@generate_settings_spec_CPPFLAGS = \ -@WITH_DOCS_TRUE@ $(GLIB_CFLAGS) \ -@WITH_DOCS_TRUE@ $(DBUS_CFLAGS) - -@WITH_DOCS_TRUE@generate_settings_spec_LDADD = \ -@WITH_DOCS_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ -@WITH_DOCS_TRUE@ $(GLIB_LIBS) \ -@WITH_DOCS_TRUE@ $(DBUS_LIBS) - -@WITH_DOCS_TRUE@XSLTPROC = xsltproc --xinclude --nonet -@WITH_DOCS_TRUE@XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) -@WITH_DOCS_TRUE@OTHER_FILES = \ -@WITH_DOCS_TRUE@ $(top_builddir)/introspection/all.xml \ -@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/generic-types.xml \ -@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/errors.xml \ -@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/vpn-errors.xml \ -@WITH_DOCS_TRUE@ $(top_srcdir)/tools/doc-generator.xsl \ -@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/generic-types.xml - -@WITH_DOCS_TRUE@GENERATED_FILES = spec.html settings-spec.xml +@ENABLE_DOC_TRUE@INCLUDES = \ +@ENABLE_DOC_TRUE@ -I$(top_srcdir)/include \ +@ENABLE_DOC_TRUE@ -I$(top_builddir)/include \ +@ENABLE_DOC_TRUE@ -I$(top_srcdir)/libnm-util \ +@ENABLE_DOC_TRUE@ -I$(top_builddir)/libnm-util + +@ENABLE_DOC_TRUE@generate_settings_spec_SOURCES = \ +@ENABLE_DOC_TRUE@ $(GENERATE_SETTINGS_SPEC_SOURCE) + +@ENABLE_DOC_TRUE@generate_settings_spec_CPPFLAGS = \ +@ENABLE_DOC_TRUE@ $(GLIB_CFLAGS) \ +@ENABLE_DOC_TRUE@ $(DBUS_CFLAGS) + +@ENABLE_DOC_TRUE@generate_settings_spec_LDADD = \ +@ENABLE_DOC_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ +@ENABLE_DOC_TRUE@ $(GLIB_LIBS) \ +@ENABLE_DOC_TRUE@ $(DBUS_LIBS) + +@ENABLE_DOC_TRUE@XSLTPROC = xsltproc --xinclude --nonet +@ENABLE_DOC_TRUE@XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) +@ENABLE_DOC_TRUE@OTHER_FILES = \ +@ENABLE_DOC_TRUE@ $(top_builddir)/introspection/all.xml \ +@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/generic-types.xml \ +@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/errors.xml \ +@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/vpn-errors.xml \ +@ENABLE_DOC_TRUE@ $(top_srcdir)/tools/doc-generator.xsl \ +@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/generic-types.xml + +@ENABLE_DOC_TRUE@GENERATED_FILES = spec.html settings-spec.xml #################################### # The name of the module. -@WITH_DOCS_TRUE@DOC_MODULE = NetworkManager +@ENABLE_DOC_TRUE@DOC_MODULE = NetworkManager # The top-level SGML file. -@WITH_DOCS_TRUE@DOC_MAIN_SGML_FILE = network-manager-docs.xml -@WITH_DOCS_TRUE@DOC_SOURCE_DIR = $(srcdir) +@ENABLE_DOC_TRUE@DOC_MAIN_SGML_FILE = network-manager-docs.xml +@ENABLE_DOC_TRUE@DOC_SOURCE_DIR = $(srcdir) # Extra options to supply to gtkdoc-mkdb -@WITH_DOCS_TRUE@MKDB_OPTIONS = --sgml-mode --output-format=xml +@ENABLE_DOC_TRUE@MKDB_OPTIONS = --sgml-mode --output-format=xml # Extra options to supply to gtkdoc-mktmpl -@WITH_DOCS_TRUE@MKTMPL_OPTIONS = +@ENABLE_DOC_TRUE@MKTMPL_OPTIONS = # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) -@WITH_DOCS_TRUE@content_files = \ -@WITH_DOCS_TRUE@ version.xml \ -@WITH_DOCS_TRUE@ settings-spec.xml \ -@WITH_DOCS_TRUE@ migrating-to-09.xml \ -@WITH_DOCS_TRUE@ $(NULL) - -@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_RUN = -@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute +@ENABLE_DOC_TRUE@content_files = \ +@ENABLE_DOC_TRUE@ version.xml \ +@ENABLE_DOC_TRUE@ settings-spec.xml \ +@ENABLE_DOC_TRUE@ migrating-to-09.xml \ +@ENABLE_DOC_TRUE@ $(NULL) + +@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = +@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute # We set GPATH here; this gives us semantics for GNU make # which are more like other make's VPATH, when it comes to # whether a source that is a target of one rule is then # searched for in VPATH/GPATH. # -@WITH_DOCS_TRUE@GPATH = $(srcdir) -@WITH_DOCS_TRUE@TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) -@WITH_DOCS_TRUE@SETUP_FILES = \ -@WITH_DOCS_TRUE@ $(content_files) \ -@WITH_DOCS_TRUE@ $(DOC_MAIN_SGML_FILE) \ -@WITH_DOCS_TRUE@ $(DOC_MODULE)-sections.txt \ -@WITH_DOCS_TRUE@ $(DOC_MODULE)-overrides.txt +@ENABLE_DOC_TRUE@GPATH = $(srcdir) +@ENABLE_DOC_TRUE@TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +@ENABLE_DOC_TRUE@SETUP_FILES = \ +@ENABLE_DOC_TRUE@ $(content_files) \ +@ENABLE_DOC_TRUE@ $(DOC_MAIN_SGML_FILE) \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE)-sections.txt \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE)-overrides.txt -@WITH_DOCS_FALSE@EXTRA_DIST = $(GENERATE_SETTINGS_SPEC_SOURCE) \ -@WITH_DOCS_FALSE@ version.xml.in +@ENABLE_DOC_FALSE@EXTRA_DIST = $(GENERATE_SETTINGS_SPEC_SOURCE) \ +@ENABLE_DOC_FALSE@ version.xml.in #################################### -@WITH_DOCS_TRUE@EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) \ -@WITH_DOCS_TRUE@ $(GENERATED_FILES) version.xml.in -@WITH_DOCS_TRUE@DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ -@WITH_DOCS_TRUE@ html-build.stamp pdf-build.stamp \ -@WITH_DOCS_TRUE@ tmpl.stamp sgml.stamp html.stamp pdf.stamp - -@WITH_DOCS_TRUE@SCANOBJ_FILES = \ -@WITH_DOCS_TRUE@ $(DOC_MODULE).args \ -@WITH_DOCS_TRUE@ $(DOC_MODULE).hierarchy \ -@WITH_DOCS_TRUE@ $(DOC_MODULE).interfaces \ -@WITH_DOCS_TRUE@ $(DOC_MODULE).prerequisites \ -@WITH_DOCS_TRUE@ $(DOC_MODULE).signals - -@WITH_DOCS_TRUE@REPORT_FILES = \ -@WITH_DOCS_TRUE@ $(DOC_MODULE)-undocumented.txt \ -@WITH_DOCS_TRUE@ $(DOC_MODULE)-undeclared.txt \ -@WITH_DOCS_TRUE@ $(DOC_MODULE)-unused.txt - -@WITH_DOCS_FALSE@CLEANFILES = html/* tmpl/* xml/* -@WITH_DOCS_TRUE@CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) \ -@WITH_DOCS_TRUE@ $(DOC_STAMPS) $(GENERATED_FILES) html/* tmpl/* \ -@WITH_DOCS_TRUE@ xml/* -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@@WITH_DOCS_TRUE@HTML_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@@WITH_DOCS_TRUE@HTML_BUILD_STAMP = html-build.stamp -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@@WITH_DOCS_TRUE@PDF_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@@WITH_DOCS_TRUE@PDF_BUILD_STAMP = pdf-build.stamp +@ENABLE_DOC_TRUE@EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) \ +@ENABLE_DOC_TRUE@ $(GENERATED_FILES) version.xml.in +@ENABLE_DOC_TRUE@DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ +@ENABLE_DOC_TRUE@ html-build.stamp pdf-build.stamp \ +@ENABLE_DOC_TRUE@ tmpl.stamp sgml.stamp html.stamp pdf.stamp + +@ENABLE_DOC_TRUE@SCANOBJ_FILES = \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE).args \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE).hierarchy \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE).interfaces \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE).prerequisites \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE).signals + +@ENABLE_DOC_TRUE@REPORT_FILES = \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE)-undocumented.txt \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE)-undeclared.txt \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE)-unused.txt + +@ENABLE_DOC_FALSE@CLEANFILES = html/* tmpl/* xml/* \ +@ENABLE_DOC_FALSE@ NetworkManager-sections.txt \ +@ENABLE_DOC_FALSE@ NetworkManager-overrides.txt +@ENABLE_DOC_TRUE@CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) \ +@ENABLE_DOC_TRUE@ $(DOC_STAMPS) $(GENERATED_FILES) html/* \ +@ENABLE_DOC_TRUE@ tmpl/* xml/* NetworkManager-sections.txt \ +@ENABLE_DOC_TRUE@ NetworkManager-overrides.txt +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp all: all-am .SUFFIXES: @@ -523,25 +539,22 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generate_settings_spec-generate-settings-spec.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< @@ -617,7 +630,7 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@WITH_DOCS_FALSE@dist-hook: +@ENABLE_DOC_FALSE@dist-hook: distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -654,7 +667,7 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-am -@WITH_DOCS_FALSE@all-local: +@ENABLE_DOC_FALSE@all-local: all-am: Makefile $(PROGRAMS) all-local installdirs: install: install-am @@ -688,11 +701,11 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@WITH_DOCS_FALSE@uninstall-local: -@WITH_DOCS_FALSE@distclean-local: -@WITH_DOCS_FALSE@install-data-local: -@WITH_DOCS_FALSE@maintainer-clean-local: -@WITH_DOCS_FALSE@clean-local: +@ENABLE_DOC_FALSE@uninstall-local: +@ENABLE_DOC_FALSE@distclean-local: +@ENABLE_DOC_FALSE@install-data-local: +@ENABLE_DOC_FALSE@maintainer-clean-local: +@ENABLE_DOC_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ @@ -783,227 +796,227 @@ uninstall-am: uninstall-local tags uninstall uninstall-am uninstall-local -@WITH_DOCS_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp -@WITH_DOCS_TRUE@ $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > $@ -@WITH_DOCS_TRUE@ mkdir -p $(builddir)/html/ -@WITH_DOCS_TRUE@ cp $@ $(builddir)/html/ +@ENABLE_DOC_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp +@ENABLE_DOC_TRUE@ $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > $@ +@ENABLE_DOC_TRUE@ mkdir -p $(builddir)/html/ +@ENABLE_DOC_TRUE@ cp $@ $(builddir)/html/ -@WITH_DOCS_TRUE@settings-spec.xml: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la -@WITH_DOCS_TRUE@ rm -f $(builddir)/$@ -@WITH_DOCS_TRUE@ $(builddir)/generate-settings-spec $(builddir)/$@ +@ENABLE_DOC_TRUE@settings-spec.xml: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la +@ENABLE_DOC_TRUE@ rm -f $(builddir)/$@ +@ENABLE_DOC_TRUE@ $(builddir)/generate-settings-spec $(builddir)/$@ -@WITH_DOCS_TRUE@all: $(GENERATED_FILES) +@ENABLE_DOC_TRUE@all: $(GENERATED_FILES) -@ENABLE_GTK_DOC_TRUE@@WITH_DOCS_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_GTK_DOC_FALSE@@WITH_DOCS_TRUE@all-local: +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@all-local: -@WITH_DOCS_TRUE@docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +@ENABLE_DOC_TRUE@docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@WITH_DOCS_TRUE@$(REPORT_FILES): sgml-build.stamp +@ENABLE_DOC_TRUE@$(REPORT_FILES): sgml-build.stamp #### setup #### -@WITH_DOCS_TRUE@setup-build.stamp: -@WITH_DOCS_TRUE@ -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@WITH_DOCS_TRUE@ echo ' DOC Preparing build'; \ -@WITH_DOCS_TRUE@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ -@WITH_DOCS_TRUE@ if test "x$$files" != "x" ; then \ -@WITH_DOCS_TRUE@ for file in $$files ; do \ -@WITH_DOCS_TRUE@ test -f $(abs_srcdir)/$$file && \ -@WITH_DOCS_TRUE@ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ -@WITH_DOCS_TRUE@ done; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ test -d $(abs_srcdir)/tmpl && \ -@WITH_DOCS_TRUE@ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ -@WITH_DOCS_TRUE@ chmod -R u+w $(abs_builddir)/tmpl; } \ -@WITH_DOCS_TRUE@ fi -@WITH_DOCS_TRUE@ @touch setup-build.stamp +@ENABLE_DOC_TRUE@setup-build.stamp: +@ENABLE_DOC_TRUE@ -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +@ENABLE_DOC_TRUE@ echo ' DOC Preparing build'; \ +@ENABLE_DOC_TRUE@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ +@ENABLE_DOC_TRUE@ if test "x$$files" != "x" ; then \ +@ENABLE_DOC_TRUE@ for file in $$files ; do \ +@ENABLE_DOC_TRUE@ test -f $(abs_srcdir)/$$file && \ +@ENABLE_DOC_TRUE@ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ +@ENABLE_DOC_TRUE@ done; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ test -d $(abs_srcdir)/tmpl && \ +@ENABLE_DOC_TRUE@ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ +@ENABLE_DOC_TRUE@ chmod -R u+w $(abs_builddir)/tmpl; } \ +@ENABLE_DOC_TRUE@ fi +@ENABLE_DOC_TRUE@ @touch setup-build.stamp #### scan #### -@WITH_DOCS_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@WITH_DOCS_TRUE@ @echo ' DOC Scanning header files' -@WITH_DOCS_TRUE@ @_source_dir='' ; \ -@WITH_DOCS_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ -@WITH_DOCS_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ -@WITH_DOCS_TRUE@ done ; \ -@WITH_DOCS_TRUE@ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) -@WITH_DOCS_TRUE@ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ -@WITH_DOCS_TRUE@ echo " DOC Introspecting gobjects"; \ -@WITH_DOCS_TRUE@ scanobj_options=""; \ -@WITH_DOCS_TRUE@ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@WITH_DOCS_TRUE@ if test "$(?)" = "0"; then \ -@WITH_DOCS_TRUE@ if test "x$(V)" = "x1"; then \ -@WITH_DOCS_TRUE@ scanobj_options="--verbose"; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ -@WITH_DOCS_TRUE@ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ -@WITH_DOCS_TRUE@ else \ -@WITH_DOCS_TRUE@ for i in $(SCANOBJ_FILES) ; do \ -@WITH_DOCS_TRUE@ test -f $$i || touch $$i ; \ -@WITH_DOCS_TRUE@ done \ -@WITH_DOCS_TRUE@ fi -@WITH_DOCS_TRUE@ @touch scan-build.stamp - -@WITH_DOCS_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp -@WITH_DOCS_TRUE@ @true +@ENABLE_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +@ENABLE_DOC_TRUE@ @echo ' DOC Scanning header files' +@ENABLE_DOC_TRUE@ @_source_dir='' ; \ +@ENABLE_DOC_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ +@ENABLE_DOC_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ +@ENABLE_DOC_TRUE@ done ; \ +@ENABLE_DOC_TRUE@ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) +@ENABLE_DOC_TRUE@ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ +@ENABLE_DOC_TRUE@ echo " DOC Introspecting gobjects"; \ +@ENABLE_DOC_TRUE@ scanobj_options=""; \ +@ENABLE_DOC_TRUE@ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ +@ENABLE_DOC_TRUE@ if test "x$(V)" = "x1"; then \ +@ENABLE_DOC_TRUE@ scanobj_options="--verbose"; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ +@ENABLE_DOC_TRUE@ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ +@ENABLE_DOC_TRUE@ else \ +@ENABLE_DOC_TRUE@ for i in $(SCANOBJ_FILES) ; do \ +@ENABLE_DOC_TRUE@ test -f $$i || touch $$i ; \ +@ENABLE_DOC_TRUE@ done \ +@ENABLE_DOC_TRUE@ fi +@ENABLE_DOC_TRUE@ @touch scan-build.stamp + +@ENABLE_DOC_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp +@ENABLE_DOC_TRUE@ @true #### templates #### -@WITH_DOCS_TRUE@tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@WITH_DOCS_TRUE@ @echo ' DOC Rebuilding template files' -@WITH_DOCS_TRUE@ @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -@WITH_DOCS_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@WITH_DOCS_TRUE@ if test -w $(abs_srcdir) ; then \ -@WITH_DOCS_TRUE@ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ -@WITH_DOCS_TRUE@ fi \ -@WITH_DOCS_TRUE@ fi -@WITH_DOCS_TRUE@ @touch tmpl-build.stamp +@ENABLE_DOC_TRUE@tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +@ENABLE_DOC_TRUE@ @echo ' DOC Rebuilding template files' +@ENABLE_DOC_TRUE@ @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +@ENABLE_DOC_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +@ENABLE_DOC_TRUE@ if test -w $(abs_srcdir) ; then \ +@ENABLE_DOC_TRUE@ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ +@ENABLE_DOC_TRUE@ fi \ +@ENABLE_DOC_TRUE@ fi +@ENABLE_DOC_TRUE@ @touch tmpl-build.stamp -@WITH_DOCS_TRUE@tmpl.stamp: tmpl-build.stamp -@WITH_DOCS_TRUE@ @true +@ENABLE_DOC_TRUE@tmpl.stamp: tmpl-build.stamp +@ENABLE_DOC_TRUE@ @true -@WITH_DOCS_TRUE@$(srcdir)/tmpl/*.sgml: -@WITH_DOCS_TRUE@ @true +@ENABLE_DOC_TRUE@$(srcdir)/tmpl/*.sgml: +@ENABLE_DOC_TRUE@ @true #### xml #### -@WITH_DOCS_TRUE@sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) -@WITH_DOCS_TRUE@ @echo ' DOC Building XML' -@WITH_DOCS_TRUE@ @-chmod -R u+w $(srcdir) -@WITH_DOCS_TRUE@ @_source_dir='' ; \ -@WITH_DOCS_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ -@WITH_DOCS_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ -@WITH_DOCS_TRUE@ done ; \ -@WITH_DOCS_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) -@WITH_DOCS_TRUE@ @touch sgml-build.stamp +@ENABLE_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) +@ENABLE_DOC_TRUE@ @echo ' DOC Building XML' +@ENABLE_DOC_TRUE@ @-chmod -R u+w $(srcdir) +@ENABLE_DOC_TRUE@ @_source_dir='' ; \ +@ENABLE_DOC_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ +@ENABLE_DOC_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ +@ENABLE_DOC_TRUE@ done ; \ +@ENABLE_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) +@ENABLE_DOC_TRUE@ @touch sgml-build.stamp -@WITH_DOCS_TRUE@sgml.stamp: sgml-build.stamp -@WITH_DOCS_TRUE@ @true +@ENABLE_DOC_TRUE@sgml.stamp: sgml-build.stamp +@ENABLE_DOC_TRUE@ @true #### html #### -@WITH_DOCS_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@WITH_DOCS_TRUE@ @echo ' DOC Building HTML' -@WITH_DOCS_TRUE@ @rm -rf html -@WITH_DOCS_TRUE@ @mkdir html -@WITH_DOCS_TRUE@ @mkhtml_options=""; \ -@WITH_DOCS_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@WITH_DOCS_TRUE@ if test "$(?)" = "0"; then \ -@WITH_DOCS_TRUE@ if test "x$(V)" = "x1"; then \ -@WITH_DOCS_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ -@WITH_DOCS_TRUE@ if test "$(?)" = "0"; then \ -@WITH_DOCS_TRUE@ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@WITH_DOCS_TRUE@ -@test "x$(HTML_IMAGES)" = "x" || \ -@WITH_DOCS_TRUE@ for file in $(HTML_IMAGES) ; do \ -@WITH_DOCS_TRUE@ if test -f $(abs_srcdir)/$$file ; then \ -@WITH_DOCS_TRUE@ cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ if test -f $(abs_builddir)/$$file ; then \ -@WITH_DOCS_TRUE@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ done; -@WITH_DOCS_TRUE@ @echo ' DOC Fixing cross-references' -@WITH_DOCS_TRUE@ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -@WITH_DOCS_TRUE@ @touch html-build.stamp +@ENABLE_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +@ENABLE_DOC_TRUE@ @echo ' DOC Building HTML' +@ENABLE_DOC_TRUE@ @rm -rf html +@ENABLE_DOC_TRUE@ @mkdir html +@ENABLE_DOC_TRUE@ @mkhtml_options=""; \ +@ENABLE_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ +@ENABLE_DOC_TRUE@ if test "x$(V)" = "x1"; then \ +@ENABLE_DOC_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ +@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ +@ENABLE_DOC_TRUE@ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +@ENABLE_DOC_TRUE@ -@test "x$(HTML_IMAGES)" = "x" || \ +@ENABLE_DOC_TRUE@ for file in $(HTML_IMAGES) ; do \ +@ENABLE_DOC_TRUE@ if test -f $(abs_srcdir)/$$file ; then \ +@ENABLE_DOC_TRUE@ cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ if test -f $(abs_builddir)/$$file ; then \ +@ENABLE_DOC_TRUE@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ done; +@ENABLE_DOC_TRUE@ @echo ' DOC Fixing cross-references' +@ENABLE_DOC_TRUE@ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +@ENABLE_DOC_TRUE@ @touch html-build.stamp #### pdf #### -@WITH_DOCS_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@WITH_DOCS_TRUE@ @echo ' DOC Building PDF' -@WITH_DOCS_TRUE@ @rm -f $(DOC_MODULE).pdf -@WITH_DOCS_TRUE@ @mkpdf_options=""; \ -@WITH_DOCS_TRUE@ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@WITH_DOCS_TRUE@ if test "$(?)" = "0"; then \ -@WITH_DOCS_TRUE@ if test "x$(V)" = "x1"; then \ -@WITH_DOCS_TRUE@ mkpdf_options="$$mkpdf_options --verbose"; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ if test "x$(HTML_IMAGES)" != "x"; then \ -@WITH_DOCS_TRUE@ for img in $(HTML_IMAGES); do \ -@WITH_DOCS_TRUE@ part=`dirname $$img`; \ -@WITH_DOCS_TRUE@ echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ -@WITH_DOCS_TRUE@ if test $$? != 0; then \ -@WITH_DOCS_TRUE@ mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ done; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) -@WITH_DOCS_TRUE@ @touch pdf-build.stamp +@ENABLE_DOC_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +@ENABLE_DOC_TRUE@ @echo ' DOC Building PDF' +@ENABLE_DOC_TRUE@ @rm -f $(DOC_MODULE).pdf +@ENABLE_DOC_TRUE@ @mkpdf_options=""; \ +@ENABLE_DOC_TRUE@ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ +@ENABLE_DOC_TRUE@ if test "x$(V)" = "x1"; then \ +@ENABLE_DOC_TRUE@ mkpdf_options="$$mkpdf_options --verbose"; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ if test "x$(HTML_IMAGES)" != "x"; then \ +@ENABLE_DOC_TRUE@ for img in $(HTML_IMAGES); do \ +@ENABLE_DOC_TRUE@ part=`dirname $$img`; \ +@ENABLE_DOC_TRUE@ echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ +@ENABLE_DOC_TRUE@ if test $$? != 0; then \ +@ENABLE_DOC_TRUE@ mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ done; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) +@ENABLE_DOC_TRUE@ @touch pdf-build.stamp ############## -@WITH_DOCS_TRUE@clean-local: -@WITH_DOCS_TRUE@ @rm -f *~ *.bak -@WITH_DOCS_TRUE@ @rm -rf .libs - -@WITH_DOCS_TRUE@distclean-local: -@WITH_DOCS_TRUE@ @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ -@WITH_DOCS_TRUE@ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt -@WITH_DOCS_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@WITH_DOCS_TRUE@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ -@WITH_DOCS_TRUE@ rm -rf tmpl; \ -@WITH_DOCS_TRUE@ fi - -@WITH_DOCS_TRUE@maintainer-clean-local: clean -@WITH_DOCS_TRUE@ @rm -rf xml html - -@WITH_DOCS_TRUE@install-data-local: -@WITH_DOCS_TRUE@ @installfiles=`echo $(builddir)/html/*`; \ -@WITH_DOCS_TRUE@ if test "$$installfiles" = '$(builddir)/html/*'; \ -@WITH_DOCS_TRUE@ then echo 1>&2 'Nothing to install' ; \ -@WITH_DOCS_TRUE@ else \ -@WITH_DOCS_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ -@WITH_DOCS_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -@WITH_DOCS_TRUE@ else \ -@WITH_DOCS_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ $(mkinstalldirs) $${installdir} ; \ -@WITH_DOCS_TRUE@ for i in $$installfiles; do \ -@WITH_DOCS_TRUE@ echo ' $(INSTALL_DATA) '$$i ; \ -@WITH_DOCS_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \ -@WITH_DOCS_TRUE@ done; \ -@WITH_DOCS_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ -@WITH_DOCS_TRUE@ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ -@WITH_DOCS_TRUE@ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ -@WITH_DOCS_TRUE@ fi - -@WITH_DOCS_TRUE@uninstall-local: -@WITH_DOCS_TRUE@ @if test -n "$(DOC_MODULE_VERSION)"; then \ -@WITH_DOCS_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -@WITH_DOCS_TRUE@ else \ -@WITH_DOCS_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ rm -rf $${installdir} +@ENABLE_DOC_TRUE@clean-local: +@ENABLE_DOC_TRUE@ @rm -f *~ *.bak +@ENABLE_DOC_TRUE@ @rm -rf .libs + +@ENABLE_DOC_TRUE@distclean-local: +@ENABLE_DOC_TRUE@ @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ +@ENABLE_DOC_TRUE@ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt +@ENABLE_DOC_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +@ENABLE_DOC_TRUE@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ +@ENABLE_DOC_TRUE@ rm -rf tmpl; \ +@ENABLE_DOC_TRUE@ fi + +@ENABLE_DOC_TRUE@maintainer-clean-local: clean +@ENABLE_DOC_TRUE@ @rm -rf xml html + +@ENABLE_DOC_TRUE@install-data-local: +@ENABLE_DOC_TRUE@ @installfiles=`echo $(builddir)/html/*`; \ +@ENABLE_DOC_TRUE@ if test "$$installfiles" = '$(builddir)/html/*'; \ +@ENABLE_DOC_TRUE@ then echo 1>&2 'Nothing to install' ; \ +@ENABLE_DOC_TRUE@ else \ +@ENABLE_DOC_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ +@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +@ENABLE_DOC_TRUE@ else \ +@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ $(mkinstalldirs) $${installdir} ; \ +@ENABLE_DOC_TRUE@ for i in $$installfiles; do \ +@ENABLE_DOC_TRUE@ echo ' $(INSTALL_DATA) '$$i ; \ +@ENABLE_DOC_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \ +@ENABLE_DOC_TRUE@ done; \ +@ENABLE_DOC_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ +@ENABLE_DOC_TRUE@ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ +@ENABLE_DOC_TRUE@ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ +@ENABLE_DOC_TRUE@ fi + +@ENABLE_DOC_TRUE@uninstall-local: +@ENABLE_DOC_TRUE@ @if test -n "$(DOC_MODULE_VERSION)"; then \ +@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +@ENABLE_DOC_TRUE@ else \ +@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@ENABLE_DOC_TRUE@ fi; \ +@ENABLE_DOC_TRUE@ rm -rf $${installdir} # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@@WITH_DOCS_TRUE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@@WITH_DOCS_TRUE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@@WITH_DOCS_TRUE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" -@ENABLE_GTK_DOC_FALSE@@WITH_DOCS_TRUE@ @false - -@WITH_DOCS_TRUE@dist-hook: dist-check-gtkdoc dist-hook-local -@WITH_DOCS_TRUE@ @mkdir $(distdir)/tmpl -@WITH_DOCS_TRUE@ @mkdir $(distdir)/html -@WITH_DOCS_TRUE@ @-cp ./tmpl/*.sgml $(distdir)/tmpl -@WITH_DOCS_TRUE@ @cp ./html/* $(distdir)/html -@WITH_DOCS_TRUE@ @-cp ./$(DOC_MODULE).pdf $(distdir)/ -@WITH_DOCS_TRUE@ @-cp ./$(DOC_MODULE).types $(distdir)/ -@WITH_DOCS_TRUE@ @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ -@WITH_DOCS_TRUE@ @cd $(distdir) && rm -f $(DISTCLEANFILES) -@WITH_DOCS_TRUE@ @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html - -@WITH_DOCS_TRUE@.PHONY : dist-hook-local docs +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" +@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@ @false + +@ENABLE_DOC_TRUE@dist-hook: dist-check-gtkdoc dist-hook-local +@ENABLE_DOC_TRUE@ @mkdir $(distdir)/tmpl +@ENABLE_DOC_TRUE@ @mkdir $(distdir)/html +@ENABLE_DOC_TRUE@ @-cp ./tmpl/*.sgml $(distdir)/tmpl +@ENABLE_DOC_TRUE@ @cp ./html/* $(distdir)/html +@ENABLE_DOC_TRUE@ @-cp ./$(DOC_MODULE).pdf $(distdir)/ +@ENABLE_DOC_TRUE@ @-cp ./$(DOC_MODULE).types $(distdir)/ +@ENABLE_DOC_TRUE@ @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ +@ENABLE_DOC_TRUE@ @cd $(distdir) && rm -f $(DISTCLEANFILES) +@ENABLE_DOC_TRUE@ @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + +@ENABLE_DOC_TRUE@.PHONY : dist-hook-local docs # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/docs/api/generate-settings-spec.c b/docs/api/generate-settings-spec.c index 7a540e3b..b07bd345 100644 --- a/docs/api/generate-settings-spec.c +++ b/docs/api/generate-settings-spec.c @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2009 - 2010 Red Hat, Inc. + * (C) Copyright 2009 - 2012 Red Hat, Inc. */ #include @@ -30,6 +30,7 @@ #include "config.h" #include +#include #include #include #include @@ -48,6 +49,8 @@ #include #include #include +#include +#include #include #include @@ -56,8 +59,11 @@ typedef NMSetting* (*SettingNewFunc) (void); static SettingNewFunc funcs[] = { nm_setting_802_1x_new, + nm_setting_adsl_new, nm_setting_bluetooth_new, nm_setting_bond_new, + nm_setting_bridge_new, + nm_setting_bridge_port_new, nm_setting_cdma_new, nm_setting_connection_new, nm_setting_gsm_new, diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 09582676..22bace81 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -4,23 +4,23 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 78f850c7..4ad09274 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -14,11 +14,11 @@
-

Version 0.9.6.4 +

Version 0.9.7.995

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 @@ -46,25 +46,25 @@

D-Bus API Reference
Network Configuration Setting Specification
-
Configuration Settings
+
Configuration Settings
Secret flag types
Migrating from NetworkManager 0.8 to NetworkManager 0.9
-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed
Index
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index 72dc9c03..ce62fb55 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -21,7 +21,7 @@

-Index

+Index
diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html index 0b2b16d0..665f9bfb 100644 --- a/docs/api/html/ref-migrating.html +++ b/docs/api/html/ref-migrating.html @@ -23,20 +23,20 @@

Migrating from NetworkManager 0.8 to NetworkManager 0.9

-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed

@@ -50,14 +50,14 @@

-Architecture and D-Bus API Changes in 0.9

+Architecture and D-Bus API Changes in 0.9

This section details the architectural and D-Bus API changes in NetworkManager 0.9.

-Elimination of the User Settings Service

+Elimination of the User Settings Service

Previously there were two "settings services", or D-Bus services that provided and saved network configuration information. NetworkManager @@ -103,7 +103,7 @@

-User Secret Agents

+User Secret Agents

Even with the elimination of the user settings service, in some cases it is still desirable to store secrets in the user's session and not in @@ -152,7 +152,7 @@

-Settings Service Interface Changes

+Settings Service Interface Changes

With the elimination of the user settings service, the old org.freedesktop.NetworkManagerUserSettings and @@ -190,7 +190,7 @@

-Connection Object Interface Changes

+Connection Object Interface Changes

Consistent with the interface changes to the Settings object, the Connection object's D-Bus interface has changed to @@ -224,7 +224,7 @@

-Permissions Methods Consolidation

+Permissions Methods Consolidation

Previously there were two D-Bus method calls to retrieve the list of operations that a user client could perform, and two signals notifying @@ -256,7 +256,7 @@ are now string-based permissions. The mapping is as follows:

-

Table 20. 

+

Table 23. 

@@ -307,7 +307,7 @@

-AddConnection Returns Object Path of New Connection

+AddConnection Returns Object Path of New Connection

The org.freedesktop.NetworkManager.Settings.AddConnection @@ -325,7 +325,7 @@

-Support for WiMAX Devices

+Support for WiMAX Devices

NetworkManager now supports Intel WiMAX mobile broadband devices. A corresponding device type (NM_DEVICE_TYPE_WIMAX) and @@ -348,7 +348,7 @@

-New Device States

+New Device States

A few new device states have been added, and all device states have been renumbered for flexibility. @@ -363,7 +363,7 @@

-New Active Connection State

+New Active Connection State

Along with the new device states, an additional @@ -379,7 +379,7 @@

-Consolidated Modem Devices

+Consolidated Modem Devices

Many new mobile broadband devices support multiple access families, like Qualcomm Gobi cards (CDMA/EVDO and GSM/UMTS), or multi-mode EVDO/LTE @@ -415,7 +415,7 @@

-Secret Property Flags

+Secret Property Flags

In the Connection object's configuration properties, each setting's secret properties (like WiFi passphrases, or public key passwords, etc) now has @@ -424,7 +424,7 @@ following values:

-

Table 21. 

+

Table 24. 

@@ -486,7 +486,7 @@

-Deprecated Methods Removed

+Deprecated Methods Removed

A few methods and signals of the org.freedesktop.NetworkManager interface deprecated in version 0.7 have been removed. All the @@ -496,7 +496,7 @@ their replacements:

-

Table 22. 

+

Table 25. 

diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index d87ab35c..8373c83b 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -23,7 +23,7 @@

Network Configuration Setting Specification

-
Configuration Settings
+
Configuration Settings
Secret flag types

@@ -35,11 +35,11 @@

-Configuration Settings

+Configuration Settings

-

Table 1. 802-1x setting

+

Table 1. 802-1x setting

@@ -246,7 +246,76 @@


-

Table 2. bluetooth setting

+

Table 2. adsl setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
name
string
adsl
The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name.
username
string
Username used to authenticate with the pppoa service.
password
string
Password used to authenticate with the pppoa service.
password-flags
uint32
0
Flags indicating how to handle the ADSL password. (see the section called “Secret flag types” for flag values)
protocol
string
ADSL connection protocol.
encapsulation
string
Encapsulation of ADSL connection
vpi
uint32
0
VPI of ADSL connection
vci
uint32
0
VCI of ADSL connection

+

+


+

+

+
Table 3. bluetooth setting

 
@@ -285,7 +354,7 @@
 


 

-
Table 3. bond setting

+
Table 4. bond setting

 

 
 

 
@@ -324,7 +393,121 @@
 


 

-
Table 4. cdma setting

+
Table 5. bridge setting

+

 
 

 

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






Key NameValue TypeDefault ValueValue Description
name
string
bridge
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
interface-name
string
The name of the virtual in-kernel bridging network interface
stp
boolean
TRUE
Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
priority
uint32
128
Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are 'better'; the lowest priority bridge will be elected the root bridge.
forward-delay
uint32
15
The Spanning Tree Protocol (STP) forwarding delay, in seconds.
hello-time
uint32
2
The Spanning Tree Protocol (STP) hello time, in seconds.
max-age
uint32
20
The Spanning Tree Protocol (STP) maximum message age, in seconds.
ageing-time
uint32
300
The ethernet MAC address aging time, in seconds.

+

+


+

+

+
Table 6. bridge-port setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
bridge-port
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
priority
uint32
32
The Spanning Tree Protocol (STP) priority of this bridge port
path-cost
uint32
100
The Spanning Tree Protocol (STP) port cost for destinations via this port.
hairpin-mode
boolean
FALSE
Enables or disabled 'hairpin mode' for the port, which allows frames to be sent back out through the port the frame was received on.

+

+


+

+

+
Table 7. cdma setting

 
@@ -375,7 +558,7 @@
 


 

-
Table 5. connection setting

+
Table 8. connection setting

 

 
 

 
@@ -456,13 +639,19 @@
 
+
+
+
+
+
+

 
 


 Setting name describing the type of slave this connection is (ie, 'bond') or NULL if this connection is not a slave.
 
secondaries
array of string
[]
List of connection UUIDs that should be activated when the base connection itself is activated.

 
 

 

 


 

 

-
Table 6. gsm setting

+
Table 9. gsm setting

 
@@ -523,7 +712,7 @@
 
-
+
@@ -555,7 +744,7 @@
 


 

-
Table 7. infiniband setting

+
Table 10. infiniband setting

 

 
 

network-type

 
int32

 
-1
Network preference to force the device to only use specific network technologies.  The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, and 3: prefer 2G.  Note that not all devices allow network preference control.Network preference to force the device to only use specific network technologies.  The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, 3: prefer 2G, 4: prefer 4G/LTE, 5: 4G/LTE only. Note that not all devices allow network preference control.
 

 

 
pin

 
@@ -600,7 +789,7 @@
 


 

-
Table 8. ipv4 setting

+
Table 11. ipv4 setting

 

 
 

 
@@ -631,7 +820,7 @@
 
-
+
@@ -667,7 +856,7 @@
 
-
+
@@ -699,7 +888,7 @@
 


 

-
Table 9. ipv6 setting

+
Table 12. ipv6 setting

 

 
 

dns

 
array of uint32

 
[]
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 methods, these DNS servers are used as the only DNS servers for this connection.List of DNS servers (network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.
 

 

 
dns-search
dhcp-client-id

 
string

 
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.A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options.
 

 

 
dhcp-send-hostname

 
@@ -727,6 +916,12 @@
 
+
+
+
+
+
+
@@ -786,7 +981,7 @@
 


 

-
Table 10. 802-11-olpc-mesh setting

+
Table 13. 802-11-olpc-mesh setting

 

 
 

IPv6 configuration method.  If 'auto' is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset.  To force the use of DHCP only, specify 'dhcp'; this method is only valid for ethernet-based hardware.  If 'link-local' is specified, then an IPv6 link-local address will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in  the 'addresses' property.  If 'ignored' is specified, IPv6 configuration is not done. This property must be set.  NOTE: the 'shared' methodis not yet supported.
 

 
dhcp-hostname
string
The specified name will be sent to the DHCP server when acquiring a lease.

 
dns

 
array of byte array

 
[]

 
@@ -831,7 +1026,7 @@
 


 

-
Table 11. ppp setting

+
Table 14. ppp setting

 

 
 

 
@@ -966,7 +1161,7 @@
 


 

-
Table 12. pppoe setting

+
Table 15. pppoe setting

 

 
 

 
@@ -1017,7 +1212,7 @@
 


 

-
Table 13. serial setting

+
Table 16. serial setting

 

 
 

 
@@ -1074,7 +1269,7 @@
 


 

-
Table 14. vlan setting

+
Table 17. vlan setting

 

 
 

 
@@ -1137,7 +1332,7 @@
 


 

-
Table 15. vpn setting

+
Table 18. vpn setting

 

 
 

 
@@ -1188,7 +1383,7 @@
 


 

-
Table 16. wimax setting

+
Table 19. wimax setting

 

 
 

 
@@ -1227,7 +1422,7 @@
 


 

-
Table 17. 802-3-ethernet setting

+
Table 20. 802-3-ethernet setting

 

 
 

 
@@ -1320,7 +1515,7 @@
 


 

-
Table 18. 802-11-wireless setting

+
Table 21. 802-11-wireless setting

 

 
 

 
@@ -1351,7 +1546,7 @@
 
-
+
@@ -1411,7 +1606,7 @@
 
-
+
@@ -1431,7 +1626,7 @@
 


 

-
Table 19. 802-11-wireless-security setting

+
Table 22. 802-11-wireless-security setting

 

 
 

mode

 
string

 
WiFi network mode; one of 'infrastructure' or 'adhoc'.  If blank, infrastructure is assumed.WiFi network mode; one of 'infrastructure', 'adhoc' or 'ap'.  If blank, infrastructure is assumed.
 

 

 
band
seen-bssids

 
array of string

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

 

 
security

 
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index 119b02a5..1ff031f6 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -1,5 +1,5 @@
 
-NetworkManager D-Bus Interface Specification version 0.9.6.4
NetworkManager D-Bus Interface Specification
Version 0.9.6.4
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

+        
NetworkManager D-Bus Interface Specification
Version 0.9.7.995
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

 
This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -112,7 +112,7 @@ General Public License for more details.

 
You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-
Interfaces

+
Interfaces
org.freedesktop.NetworkManager
Methods:
GetDevices (
         
         ) →
@@ -255,11 +255,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.s

           A combination of logging domains separated by commas (','), or "NONE"
           to disable logging.  Each domain enables logging for operations
-          related to that domain.  Available domains are: [NONE, HW, RFKILL,
-          ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4,
-          DNS, VPN, SHARING, SUPPLICANT, USER_SET, SYS_SET, SUSPEND, CORE,
-          DEVICE, OLPC].  If an empty string is given, the log level is changed
-          but the current set of log domains remains unchanged.
+          related to that domain.  Available domains are: [HW, RFKILL, ETHER,
+          WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS,
+          VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE,
+          OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN].  In addition to
+          these domains, the following special domains can be used: [NONE, ALL,
+          DEFAULT, DHCP, IP].  If an empty string is given, the log level is
+          changed but the current set of log domains remains unchanged.
+        
GetLogging (
+        
+        ) →
+        s, s

+        Get current logging verbosity level and operations domains.
+      
Returns
level -
+      s

+          One of [ERR, WARN, INFO, DEBUG].
+        
domains -
+      s

+          For available domains see SetLogging() call.
         
state (
         
         ) →
@@ -538,6 +551,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.NM_DEVICE_TYPE)
     

         The general type of the network device; ie Ethernet, WiFi, etc.
+      
AvailableConnections -
+      ao -
+      (read)

+        An array of object paths of every configured connection that is currently 'available' through this device.
       
Enumerated types:
NM_DEVICE_STATE
NM_DEVICE_STATE_UNKNOWN = 0

           The device is in an unknown state.
         
NM_DEVICE_STATE_UNMANAGED = 10

@@ -588,6 +605,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_TYPE_ADSL = 12

           The device is an ADSL device supporting PPPoE and PPPoATM protocols.
+        
NM_DEVICE_TYPE_BRIDGE = 13

+          The device is a bridge interface.
         
NM_DEVICE_STATE_REASON
NM_DEVICE_STATE_REASON_UNKNOWN = 0

           The reason for the device state change is unknown.
         
NM_DEVICE_STATE_REASON_NONE = 1

@@ -692,6 +711,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_STATE_REASON_BR2684_FAILED = 51

           Problem with the RFC 2684 Ethernet over ADSL bridge.
+        
NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE = 52

+          ModemManager was not running or quit unexpectedly.
+        
NM_DEVICE_STATE_REASON_SSID_NOT_FOUND = 53

+          The 802.11 Wi-Fi network could not be found.
+        
NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED = 54

+          A secondary connection of the base connection failed.
         
Sets of flags:
NM_DEVICE_CAP
NM_DEVICE_CAP_NONE = 0x0
Null capability.
NM_DEVICE_CAP_NM_SUPPORTED = 0x1
The device is supported by NetworkManager.
NM_DEVICE_CAP_CARRIER_DETECT = 0x2
The device supports carrier detection.
Structure types:
NM_DEVICE_STATE_REASON_STRUCT - (
         u: state, u: reason
         )
@@ -1001,6 +1026,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+  
org.freedesktop.NetworkManager.Device.Bridge
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Hardware address of the device.
+      
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      
Slaves -
+      ao -
+      (read)

+        Array of object paths representing devices which are currently
+	slaved to this device.
+      

+
   
org.freedesktop.NetworkManager.Device.Vlan
Interface has no methods.
Signals:
PropertiesChanged (
         a{sv}: properties
         )
Parameters
properties -
@@ -1283,6 +1330,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_ACTIVE_CONNECTION_STATE_DEACTIVATING = 3

           The connection is being torn down and cleaned up.
+        
NM_ACTIVE_CONNECTION_STATE_DEACTIVATED = 4

+          The connection is no longer active.
         

 
   
org.freedesktop.NetworkManager.AgentManager
Methods:
Register (
@@ -1643,7 +1692,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG = 2

           Invalid IP configuration returned from the VPN plugin.
         

-
Generic types:
Enumerated types:
NM_802_11_MODE
NM_802_11_MODE_UNKNOWN = 0
Mode is unknown.
NM_802_11_MODE_ADHOC = 1
Uncoordinated network without central infrastructure.
NM_802_11_MODE_INFRA = 2
Coordinated network with one or more central controllers.
Mapping types:
String_Variant_Map - a{
+
Generic types:
Enumerated types:
NM_802_11_MODE
NM_802_11_MODE_UNKNOWN = 0
Mode is unknown.
NM_802_11_MODE_ADHOC = 1

+        For both devices and access point objects, indicates the object is
+        part of an Ad-Hoc 802.11 network without a central coordinating access
+        point.
+      
NM_802_11_MODE_INFRA = 2

+        The wireless device or access point is in infrastructure mode.  For
+        devices, this indicates the device is an 802.11 client/station.  For
+        access point objects, this indicates the object is an access point that
+        provides connectivity to clients.
+      
NM_802_11_MODE_AP = 3

+        The device is an access point/hotspot.  Not valid for access point
+        objects themselves.
+      
Mapping types:
String_Variant_Map - a{
         s: Key → v: Value
         }
       
A mapping from strings to variants representing extra
@@ -1687,7 +1748,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.org.freedesktop.NetworkManager.VPN.Error.BadArgumentsInvalid arguments were passed with the request.  FIXME: too general.
   
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.
   
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.
-
Index
Index of interfaces
Index of types

 
 

   

+
+  adsl setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        adsl
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        username
+        string
+        
+        Username used to authenticate with the pppoa service.
+      
+      
+        password
+        string
+        
+        Password used to authenticate with the pppoa service.
+      
+      
+        password-flags
+        uint32
+        0
+        Flags indicating how to handle the ADSL password. (see  for flag values)
+      
+      
+        protocol
+        string
+        
+        ADSL connection protocol.
+      
+      
+        encapsulation
+        string
+        
+        Encapsulation of ADSL connection
+      
+      
+        vpi
+        uint32
+        0
+        VPI of ADSL connection
+      
+      
+        vci
+        uint32
+        0
+        VCI of ADSL connection
+      
+    
+  
+

 bluetooth setting
@@ -271,6 +334,108 @@
     
   

   
   
 

+
+  bridge setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        bridge
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        interface-name
+        string
+        
+        The name of the virtual in-kernel bridging network interface
+      
+      
+        stp
+        boolean
+        TRUE
+        Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
+      
+      
+        priority
+        uint32
+        128
+        Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are 'better'; the lowest priority bridge will be elected the root bridge.
+      
+      
+        forward-delay
+        uint32
+        15
+        The Spanning Tree Protocol (STP) forwarding delay, in seconds.
+      
+      
+        hello-time
+        uint32
+        2
+        The Spanning Tree Protocol (STP) hello time, in seconds.
+      
+      
+        max-age
+        uint32
+        20
+        The Spanning Tree Protocol (STP) maximum message age, in seconds.
+      
+      
+        ageing-time
+        uint32
+        300
+        The ethernet MAC address aging time, in seconds.
+      
+    
+  
+

+
+  bridge-port setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        bridge-port
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        priority
+        uint32
+        32
+        The Spanning Tree Protocol (STP) priority of this bridge port
+      
+      
+        path-cost
+        uint32
+        100
+        The Spanning Tree Protocol (STP) port cost for destinations via this port.
+      
+      
+        hairpin-mode
+        boolean
+        FALSE
+        Enables or disabled 'hairpin mode' for the port, which allows frames to be sent back out through the port the frame was received on.
+      
+    
+  
+

 cdma setting
@@ -394,6 +559,12 @@
         
         Setting name describing the type of slave this connection is (ie, 'bond') or NULL if this connection is not a slave.
       
+      
+        secondaries
+        array of string
+        []
+        List of connection UUIDs that should be activated when the base connection itself is activated.
+      
     
   

   
   
 

@@ -455,7 +626,7 @@
         network-type
         int32
         -1
-        Network preference to force the device to only use specific network technologies.  The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, and 3: prefer 2G.  Note that not all devices allow network preference control.
+        Network preference to force the device to only use specific network technologies.  The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, 3: prefer 2G, 4: prefer 4G/LTE, 5: 4G/LTE only. Note that not all devices allow network preference control.
       
       
         pin
@@ -551,7 +722,7 @@
         dns
         array of uint32
         []
-        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 methods, these DNS servers are used as the only DNS servers for this connection.
+        List of DNS servers (network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.
       
       
         dns-search
@@ -587,7 +758,7 @@
         dhcp-client-id
         string
         
-        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.
+        A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options.
       
       
         dhcp-send-hostname
@@ -640,6 +811,12 @@
         
         IPv6 configuration method.  If 'auto' is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset.  To force the use of DHCP only, specify 'dhcp'; this method is only valid for ethernet-based hardware.  If 'link-local' is specified, then an IPv6 link-local address will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in  the 'addresses' property.  If 'ignored' is specified, IPv6 configuration is not done. This property must be set.  NOTE: the 'shared' methodis not yet supported.
       
+      
+        dhcp-hostname
+        string
+        
+        The specified name will be sent to the DHCP server when acquiring a lease.
+      
       
         dns
         array of byte array
@@ -1211,7 +1388,7 @@
         mode
         string
         
-        WiFi network mode; one of 'infrastructure' or 'adhoc'.  If blank, infrastructure is assumed.
+        WiFi network mode; one of 'infrastructure', 'adhoc' or 'ap'.  If blank, infrastructure is assumed.
       
       
         band
@@ -1271,7 +1448,7 @@
         seen-bssids
         array of string
         []
-        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.
+        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. 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.
       
       
         security
diff --git a/docs/api/spec.html b/docs/api/spec.html
index 119b02a5..1ff031f6 100644
--- a/docs/api/spec.html
+++ b/docs/api/spec.html
@@ -1,5 +1,5 @@
 
-NetworkManager D-Bus Interface Specification version 0.9.6.4
NetworkManager D-Bus Interface Specification
Version 0.9.6.4
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

+        
NetworkManager D-Bus Interface Specification
Version 0.9.7.995
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

 
This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -112,7 +112,7 @@ General Public License for more details.

 
You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-
Interfaces

+
Interfaces

   
org.freedesktop.NetworkManager
Methods:
GetDevices (
         
         ) →
@@ -255,11 +255,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.s

           A combination of logging domains separated by commas (','), or "NONE"
           to disable logging.  Each domain enables logging for operations
-          related to that domain.  Available domains are: [NONE, HW, RFKILL,
-          ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4,
-          DNS, VPN, SHARING, SUPPLICANT, USER_SET, SYS_SET, SUSPEND, CORE,
-          DEVICE, OLPC].  If an empty string is given, the log level is changed
-          but the current set of log domains remains unchanged.
+          related to that domain.  Available domains are: [HW, RFKILL, ETHER,
+          WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS,
+          VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE,
+          OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN].  In addition to
+          these domains, the following special domains can be used: [NONE, ALL,
+          DEFAULT, DHCP, IP].  If an empty string is given, the log level is
+          changed but the current set of log domains remains unchanged.
+        
GetLogging (
+        
+        ) →
+        s, s

+        Get current logging verbosity level and operations domains.
+      
Returns
level -
+      s

+          One of [ERR, WARN, INFO, DEBUG].
+        
domains -
+      s

+          For available domains see SetLogging() call.
         
state (
         
         ) →
@@ -538,6 +551,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.NM_DEVICE_TYPE)
     

         The general type of the network device; ie Ethernet, WiFi, etc.
+      
AvailableConnections -
+      ao -
+      (read)

+        An array of object paths of every configured connection that is currently 'available' through this device.
       
Enumerated types:
NM_DEVICE_STATE
NM_DEVICE_STATE_UNKNOWN = 0

           The device is in an unknown state.
         
NM_DEVICE_STATE_UNMANAGED = 10

@@ -588,6 +605,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_TYPE_ADSL = 12

           The device is an ADSL device supporting PPPoE and PPPoATM protocols.
+        
NM_DEVICE_TYPE_BRIDGE = 13

+          The device is a bridge interface.
         
NM_DEVICE_STATE_REASON
NM_DEVICE_STATE_REASON_UNKNOWN = 0

           The reason for the device state change is unknown.
         
NM_DEVICE_STATE_REASON_NONE = 1

@@ -692,6 +711,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_STATE_REASON_BR2684_FAILED = 51

           Problem with the RFC 2684 Ethernet over ADSL bridge.
+        
NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE = 52

+          ModemManager was not running or quit unexpectedly.
+        
NM_DEVICE_STATE_REASON_SSID_NOT_FOUND = 53

+          The 802.11 Wi-Fi network could not be found.
+        
NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED = 54

+          A secondary connection of the base connection failed.
         
Sets of flags:
NM_DEVICE_CAP
NM_DEVICE_CAP_NONE = 0x0
Null capability.
NM_DEVICE_CAP_NM_SUPPORTED = 0x1
The device is supported by NetworkManager.
NM_DEVICE_CAP_CARRIER_DETECT = 0x2
The device supports carrier detection.
Structure types:
NM_DEVICE_STATE_REASON_STRUCT - (
         u: state, u: reason
         )
@@ -1001,6 +1026,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+  
org.freedesktop.NetworkManager.Device.Bridge
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Hardware address of the device.
+      
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      
Slaves -
+      ao -
+      (read)

+        Array of object paths representing devices which are currently
+	slaved to this device.
+      

+
   
org.freedesktop.NetworkManager.Device.Vlan
Interface has no methods.
Signals:
PropertiesChanged (
         a{sv}: properties
         )
Parameters
properties -
@@ -1283,6 +1330,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_ACTIVE_CONNECTION_STATE_DEACTIVATING = 3

           The connection is being torn down and cleaned up.
+        
NM_ACTIVE_CONNECTION_STATE_DEACTIVATED = 4

+          The connection is no longer active.
         

 
   
org.freedesktop.NetworkManager.AgentManager
Methods:
Register (
@@ -1643,7 +1692,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG = 2

           Invalid IP configuration returned from the VPN plugin.
         

-
Generic types:
Enumerated types:
NM_802_11_MODE
NM_802_11_MODE_UNKNOWN = 0
Mode is unknown.
NM_802_11_MODE_ADHOC = 1
Uncoordinated network without central infrastructure.
NM_802_11_MODE_INFRA = 2
Coordinated network with one or more central controllers.
Mapping types:
String_Variant_Map - a{
+
Generic types:
Enumerated types:
NM_802_11_MODE
NM_802_11_MODE_UNKNOWN = 0
Mode is unknown.
NM_802_11_MODE_ADHOC = 1

+        For both devices and access point objects, indicates the object is
+        part of an Ad-Hoc 802.11 network without a central coordinating access
+        point.
+      
NM_802_11_MODE_INFRA = 2

+        The wireless device or access point is in infrastructure mode.  For
+        devices, this indicates the device is an 802.11 client/station.  For
+        access point objects, this indicates the object is an access point that
+        provides connectivity to clients.
+      
NM_802_11_MODE_AP = 3

+        The device is an access point/hotspot.  Not valid for access point
+        objects themselves.
+      
Mapping types:
String_Variant_Map - a{
         s: Key → v: Value
         }
       
A mapping from strings to variants representing extra
@@ -1687,7 +1748,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.org.freedesktop.NetworkManager.VPN.Error.BadArgumentsInvalid arguments were passed with the request.  FIXME: too general.
   
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.
   
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.
-
Index
Index of interfaces
Index of types
  • NM_802_11_AP_FLAGS
+
    Index
    Index of interfaces
    Index of types
    • NM_802_11_AP_FLAGS
     - u
    • NM_802_11_AP_SEC
     - u
    • NM_802_11_DEVICE_CAP
     - u
    • NM_802_11_MODE
diff --git a/docs/api/version.xml b/docs/api/version.xml
index f6c687fe..fa572dcf 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-0.9.6.4
+0.9.7.995
diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am
index a2a7d776..84807e25 100644
--- a/docs/libnm-glib/Makefile.am
+++ b/docs/libnm-glib/Makefile.am
@@ -10,7 +10,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 # 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-glib
+DOC_SOURCE_DIR=$(top_srcdir)/libnm-glib
 
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS=
@@ -71,8 +71,11 @@ extra_files = libnm-glib.png
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS =				\
 	-I$(top_srcdir)/include		\
+	-I$(top_builddir)/include	\
 	-I$(top_srcdir)/libnm-util	\
+	-I$(top_builddir)/libnm-util	\
 	-I$(top_srcdir)/libnm-glib	\
+	-I$(top_builddir)/libnm-glib	\
 	$(GLIB_CFLAGS)			\
 	$(DBUS_CFLAGS)
 
@@ -88,6 +91,7 @@ EXTRA_DIST += version.xml.in
 
 CLEANFILES += \
 	libnm-glib-sections.txt \
+	libnm-glib-overrides.txt \
 	html/* \
 	tmpl/* \
 	xml/*
diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in
index 717cfbf0..d41fbdc9 100644
--- a/docs/libnm-glib/Makefile.in
+++ b/docs/libnm-glib/Makefile.in
@@ -61,16 +61,18 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = docs/libnm-glib
 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.xml
 # 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-glib
+DOC_SOURCE_DIR = $(top_srcdir)/libnm-glib
 
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS = 
@@ -397,8 +408,11 @@ extra_files = libnm-glib.png
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
 	-I$(top_srcdir)/include		\
+	-I$(top_builddir)/include	\
 	-I$(top_srcdir)/libnm-util	\
+	-I$(top_builddir)/libnm-util	\
 	-I$(top_srcdir)/libnm-glib	\
+	-I$(top_builddir)/libnm-glib	\
 	$(GLIB_CFLAGS)			\
 	$(DBUS_CFLAGS)
 
@@ -446,7 +460,8 @@ REPORT_FILES = \
 	$(DOC_MODULE)-unused.txt
 
 CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
-	libnm-glib-sections.txt html/* tmpl/* xml/*
+	libnm-glib-sections.txt libnm-glib-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-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index 4b43358c..a205b980 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -597,7 +597,9 @@ The maximum bit rate of the access point.
 
      The "mode" property
      
 
        "mode"                     guint                 : Read
      
 
      
-The mode of the access point.
+The mode of the access point; either "infrastructure" (a central
+coordinator of the wireless network allowing clients to connect) or
+"ad-hoc" (a network with no central controller).
 
      
 
      Allowed values: [1,2]
      
 
      Default value: 2
      
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 3e02012b..cb771ba8 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -685,7 +685,10 @@ Gets a 
 
      nm_client_get_devices ()
      
 
      const GPtrArray *   nm_client_get_devices               (NMClient *client);
      
 
      
-Gets all the detected devices.
+Gets all the known network devices.  Use nm_device_get_type() or the
+NM_IS_DEVICE_XXXX() functions to determine what kind of device member of the
+returned array is, and then you may use device-specific methods such as
+nm_device_ethernet_get_hw_address().
 
      
 
      @@ -697,8 +700,9 @@ Gets all the detected devices.
 
-
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index fd8061ce..86536c2c 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -122,6 +122,7 @@ const char *        NMDeviceAdsl
                +----NMDeviceInfiniband
                +----NMDeviceBond
+               +----NMDeviceBridge
                +----NMDeviceVlan
diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html
index 9cb2c551..9f08c415 100644
--- a/docs/libnm-glib/html/NMDeviceBond.html
+++ b/docs/libnm-glib/html/NMDeviceBond.html
@@ -7,7 +7,7 @@
 
-
+
@@ -18,7 +18,7 @@
 
-
+
-
+
      
+
      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.
+
      
+
      
 

 
      
 
      Returns :
      		a GPtrArray containing all the NMDevices.
-The returned array is owned by the client and should not be modified. [transfer none][element-type NMClient.Device]
+a GPtrArray
+containing all the NMDevices.  The returned array is owned by the
+NMClient object and should not be modified. [transfer none][element-type NMClient.Device]
 
 
      
       
 
 
 
 
 
 
 
      Up
 Home
 libnm-glib Reference ManualNextNext
 
      
 
      
 Top
diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html
new file mode 100644
index 00000000..4a9b431f
--- /dev/null
+++ b/docs/libnm-glib/html/NMDeviceBridge.html
@@ -0,0 +1,331 @@
+
+
+
+
+NMDeviceBridge
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      
+
      
+
      
+
+
+
      
+
      NMDeviceBridge
      
+
      NMDeviceBridge
      
+
      
+
      
+
      Synopsis
      
+
                          NMDeviceBridge;
+                    NMDeviceBridgeClass;
+enum                NMDeviceBridgeError;
+#define             NM_DEVICE_BRIDGE_CARRIER
+#define             NM_DEVICE_BRIDGE_ERROR
+#define             NM_DEVICE_BRIDGE_HW_ADDRESS
+#define             NM_DEVICE_BRIDGE_SLAVES
+GQuark              nm_device_bridge_error_quark        (void);
+gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);
+const char *        nm_device_bridge_get_hw_address     (NMDeviceBridge *device);
+const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);
+GObject *           nm_device_bridge_new                (DBusGConnection *connection,
+                                                         const char *path);
+
      
+
      
+
      
+
      Object Hierarchy
      
+
      +  GObject
+   +----NMObject
+         +----NMDevice
+               +----NMDeviceBridge
+
      
+
      
+
      
+
      Implemented Interfaces
      
+
      
+NMDeviceBridge implements
+ GInitable and  GAsyncInitable.
      
+
      
+
      
+
      Properties
      
+
      +  "carrier"                  gboolean              : Read
+  "hw-address"               gchar*                : Read
+  "slaves"                   NMObjectArray*        : Read
+
      
+
      
+
      
+
      Description
      
+
      
+
      
+
      
+
      
+
      Details
      
+
      
+
      NMDeviceBridge
      
+
      typedef struct _NMDeviceBridge NMDeviceBridge;
      
+
      
+
      
+
      
+
      
+
      
+
      NMDeviceBridgeClass
      
+
      typedef struct {
+	NMDeviceClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMDeviceBridgeClass;
+
      
+
      
+
      
+
      
+
      
+
      
+
      enum NMDeviceBridgeError
      
+
      typedef enum {
+	NM_DEVICE_BRIDGE_ERROR_UNKNOWN = 0,               /*< nick=UnknownError >*/
+	NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION,     /*< nick=NotBridgeConnection >*/
+	NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION, /*< nick=InvalidBridgeConnection >*/
+	NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH,        /*< nick=InterfaceMismatch >*/
+} NMDeviceBridgeError;
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      

      NM_DEVICE_BRIDGE_ERROR_UNKNOWN
      		unknown or unclassified error
+
      NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION
      		the connection was not of bridge type
+
      NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION
      		the bridge connection was invalid
+
      NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH
      		the interfaces of the connection and the device mismatched
+
      
+
      
+
      
+
      
+
      NM_DEVICE_BRIDGE_CARRIER
      
+
      #define NM_DEVICE_BRIDGE_CARRIER     "carrier"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_DEVICE_BRIDGE_ERROR
      
+
      #define NM_DEVICE_BRIDGE_ERROR nm_device_bridge_error_quark ()
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_DEVICE_BRIDGE_HW_ADDRESS
      
+
      #define NM_DEVICE_BRIDGE_HW_ADDRESS  "hw-address"
+
      
+
      
+
      
+
      
+
      
+
      
+
      NM_DEVICE_BRIDGE_SLAVES
      
+
      #define NM_DEVICE_BRIDGE_SLAVES      "slaves"
+
      
+
      
+
      
+
      
+
      
+
      
+
      nm_device_bridge_error_quark ()
      
+
      GQuark              nm_device_bridge_error_quark        (void);
      
+
      
+Registers an error quark for NMDeviceBridge if necessary.
+
      
+
      
++
+
+
+
+
      

      Returns :
      		the error quark used for NMDeviceBridge errors.
      
+
      
+
      
+
      
+
      nm_device_bridge_get_carrier ()
      
+
      gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);
      
+
      
+Whether the device has carrier.
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      device :
      		a NMDeviceBridge
+
      Returns :
      		
+TRUE if the device has carrier
      
+
      
+
      
+
      
+
      nm_device_bridge_get_hw_address ()
      
+
      const char *        nm_device_bridge_get_hw_address     (NMDeviceBridge *device);
      
+
      
+Gets the hardware (MAC) address of the NMDeviceBridge
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      device :
      		a NMDeviceBridge
+
      Returns :
      		the hardware address. This is the internal string used by the
+device, and must not be modified.
      
+
      
+
      
+
      
+
      nm_device_bridge_get_slaves ()
      
+
      const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);
      
+
      
+Gets the devices currently slaved to device.
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
      

      device :
      		a NMDeviceBridge
+
      Returns :
      		the GPtrArray containing
+NMDevices that are slaves of device. This is the internal
+copy used by the device, and must not be modified. [element-type NMClient.Device]
+
      
+
      
+
      
+
      
+
      nm_device_bridge_new ()
      
+
      GObject *           nm_device_bridge_new                (DBusGConnection *connection,
+                                                         const char *path);
      
+
      
+Creates a new NMDeviceBridge.
+
      
+
      
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      

      connection :
      		the DBusGConnection
+
      path :
      		the DBus object path of the device
      Returns :
      		a new device. [transfer full]
+
      
+
      
+
      
+
      
+
      Property Details
      
+
      
+
      The "carrier" property
      
+
        "carrier"                  gboolean              : Read
      
+
      
+Whether the device has carrier.
+
      
+
      Default value: FALSE
      
+
      
+
      
+
      
+
      The "hw-address" property
      
+
        "hw-address"               gchar*                : Read
      
+
      
+The hardware (MAC) address of the device.
+
      
+
      Default value: NULL
      
+
      
+
      
+
      
+
      The "slaves" property
      
+
        "slaves"                   NMObjectArray*        : Read
      
+
      
+The devices (NMDevice) slaved to the bridge device.
+
      
+
      
+
      
+
      
+
      
+
      
+          Generated by GTK-Doc V1.18
      
+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceInfiniband.html b/docs/libnm-glib/html/NMDeviceInfiniband.html
index c4253e5d..4b0b5791 100644
--- a/docs/libnm-glib/html/NMDeviceInfiniband.html
+++ b/docs/libnm-glib/html/NMDeviceInfiniband.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -14,7 +14,7 @@
 
 
-
+
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index e41712f3..d4976feb 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -523,7 +523,7 @@ The hardware (MAC) address of the device.
 
      
 The mode of the device.
 
      
-
      Allowed values: <= 2
      
+
      Allowed values: <= 3
      Default value: 2
      
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index 61a4048a..e18588c4 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -214,7 +214,11 @@ should be called.
 
-
+
@@ -352,7 +356,7 @@ To easily create the hash table to return the WiFi PSK, you could do
 something like this:
 
      
-
      Example 1. Creating a secrets hash
      
+
      Example 1. Creating a secrets hash
      
 
      
   
      
@@ -406,7 +410,11 @@ something like this:
 
-
+
@@ -451,7 +459,11 @@ should be called.
 
-
+
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html
index 93e2532e..d344affc 100644
--- a/docs/libnm-glib/html/api-index-full.html
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -651,6 +651,30 @@
 
      
+NMDeviceBridge, struct in NMDeviceBridge
+
      
+
      
+
      
+NMDeviceBridge:carrier, object property in NMDeviceBridge
+
      
+
      
+
      
+NMDeviceBridge:hw-address, object property in NMDeviceBridge
+
      
+
      
+
      
+NMDeviceBridge:slaves, object property in NMDeviceBridge
+
      
+
      
+
      
+NMDeviceBridgeClass, struct in NMDeviceBridge
+
      
+
      
+
      
+NMDeviceBridgeError, enum in NMDeviceBridge
+
      
+
      
+
      
 NMDeviceBt, struct in NMDeviceBt
 
      
@@ -955,6 +979,42 @@
 
      
+NM_DEVICE_BRIDGE_CARRIER, macro in NMDeviceBridge
+
      
+
      
+
      
+NM_DEVICE_BRIDGE_ERROR, macro in NMDeviceBridge
+
      
+
      
+
      
+nm_device_bridge_error_quark, function in NMDeviceBridge
+
      
+
      
+
      
+nm_device_bridge_get_carrier, function in NMDeviceBridge
+
      
+
      
+
      
+nm_device_bridge_get_hw_address, function in NMDeviceBridge
+
      
+
      
+
      
+nm_device_bridge_get_slaves, function in NMDeviceBridge
+
      
+
      
+
      
+NM_DEVICE_BRIDGE_HW_ADDRESS, macro in NMDeviceBridge
+
      
+
      
+
      
+nm_device_bridge_new, function in NMDeviceBridge
+
      
+
      
+
      
+NM_DEVICE_BRIDGE_SLAVES, macro in NMDeviceBridge
+
      
+
      
+
      
 NM_DEVICE_BT_CAPABILITIES, macro in NMDeviceBt
 
      
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html
index fa143784..2a334ea9 100644
--- a/docs/libnm-glib/html/ch02.html
+++ b/docs/libnm-glib/html/ch02.html
@@ -21,7 +21,7 @@
 
      
     
 
      
 
      connection :
      		the connection for which secrets were requestedthe connection for which secrets were requested,
+note that this object will be unrefed after the callback has returned, use
+g_object_ref()/g_object_unref() if you want to use this object after the callback
+has returned. [transfer none]
+
 
      
 
      
 
      secrets :
      
 
      
 
      connection :
      		the connection for which secrets were to be savedthe connection for which secrets were to be saved,
+note that this object will be unrefed after the callback has returned, use
+g_object_ref()/g_object_unref() if you want to use this object after the callback
+has returned. [transfer none]
+
 
      
 
      
 
      error :
      		
 
 
 
 
 
 
      
 
      
 
      
-libnm-glib API Reference
      
+libnm-glib API Reference
      
 
      
 
      
 NMClient
@@ -54,6 +54,9 @@
 NMDeviceBond
 
      
 
      
+NMDeviceBridge
+
      
+
      
 NMDeviceInfiniband
 
      
 
      
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index a0375d4e..339a581c 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -15,14 +15,14 @@
 
      
 
      
 
      
-      for libnm-glib 0.9.6.4
+      for libnm-glib 0.9.7.995
 
       The latest version of this documentation can be found on-line at
       http://projects.gnome.org/NetworkManager/developers/libnm-glib/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
@@ -81,6 +81,9 @@
 NMDeviceBond
 
      
 
      
+NMDeviceBridge
+
      
+
      
 NMDeviceInfiniband
 
      
 
      
diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index cc8e3b43..92276d7d 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -419,6 +419,33 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index 7f2a66e7..3cf09621 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -14,6 +14,7 @@
       
       
       
+      
       
       
       
@@ -319,6 +320,21 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -631,6 +647,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index ae88a436..0488f18b 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -36,6 +36,7 @@
                 NMDeviceAdsl
                 NMDeviceInfiniband
                 NMDeviceBond
+                NMDeviceBridge
                 NMDeviceVlan
             NMWimaxNsp
             NMAccessPoint
diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml
index 1b989cb6..aa3c6332 100644
--- a/docs/libnm-glib/libnm-glib-docs.xml
+++ b/docs/libnm-glib/libnm-glib-docs.xml
@@ -74,6 +74,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt
index a150d0c0..84f897c4 100644
--- a/docs/libnm-glib/libnm-glib-sections.txt
+++ b/docs/libnm-glib/libnm-glib-sections.txt
@@ -237,6 +237,31 @@ NM_TYPE_DEVICE_BOND
 nm_device_bond_get_type
 
 
+
      
+nm-device-bridge
+NMDeviceBridge
+NMDeviceBridge
+NMDeviceBridgeClass
+NMDeviceBridgeError
+NM_DEVICE_BRIDGE_CARRIER
+NM_DEVICE_BRIDGE_ERROR
+NM_DEVICE_BRIDGE_HW_ADDRESS
+NM_DEVICE_BRIDGE_SLAVES
+nm_device_bridge_error_quark
+nm_device_bridge_get_carrier
+nm_device_bridge_get_hw_address
+nm_device_bridge_get_slaves
+nm_device_bridge_new
+
+NM_DEVICE_BRIDGE
+NM_DEVICE_BRIDGE_CLASS
+NM_DEVICE_BRIDGE_GET_CLASS
+NM_IS_DEVICE_BRIDGE
+NM_IS_DEVICE_BRIDGE_CLASS
+NM_TYPE_DEVICE_BRIDGE
+nm_device_bridge_get_type
+
      
+
 
      
 nm-device-bt
 NMDeviceBt
@@ -495,6 +520,7 @@ NM_TYPE_CLIENT_PERMISSION
 NM_TYPE_CLIENT_PERMISSION_RESULT
 NM_TYPE_DEVICE_ADSL_ERROR
 NM_TYPE_DEVICE_BOND_ERROR
+NM_TYPE_DEVICE_BRIDGE_ERROR
 NM_TYPE_DEVICE_BT_ERROR
 NM_TYPE_DEVICE_ETHERNET_ERROR
 NM_TYPE_DEVICE_INFINIBAND_ERROR
@@ -512,6 +538,7 @@ nm_client_permission_get_type
 nm_client_permission_result_get_type
 nm_device_adsl_error_get_type
 nm_device_bond_error_get_type
+nm_device_bridge_error_get_type
 nm_device_bt_error_get_type
 nm_device_ethernet_error_get_type
 nm_device_infiniband_error_get_type
diff --git a/docs/libnm-glib/libnm-glib.types b/docs/libnm-glib/libnm-glib.types
index e3750af9..d8486f47 100644
--- a/docs/libnm-glib/libnm-glib.types
+++ b/docs/libnm-glib/libnm-glib.types
@@ -10,6 +10,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -34,6 +35,7 @@ nm_device_olpc_mesh_get_type
 nm_device_adsl_get_type
 nm_device_infiniband_get_type
 nm_device_bond_get_type
+nm_device_bridge_get_type
 nm_device_vlan_get_type
 nm_wimax_nsp_get_type
 nm_access_point_get_type
diff --git a/docs/libnm-glib/tmpl/libnm_glib.sgml b/docs/libnm-glib/tmpl/libnm_glib.sgml
index ed0710b9..325e10cb 100644
--- a/docs/libnm-glib/tmpl/libnm_glib.sgml
+++ b/docs/libnm-glib/tmpl/libnm_glib.sgml
@@ -9,13 +9,11 @@ libnm_glib
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml
index 41cade52..f869ab7c 100644
--- a/docs/libnm-glib/tmpl/nm-access-point.sgml
+++ b/docs/libnm-glib/tmpl/nm-access-point.sgml
@@ -9,13 +9,11 @@ NMAccessPoint
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml
index 40528ae9..5bbb6b3b 100644
--- a/docs/libnm-glib/tmpl/nm-active-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-active-connection.sgml
@@ -9,13 +9,11 @@ NMActiveConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml
index b2d11e38..773592de 100644
--- a/docs/libnm-glib/tmpl/nm-client.sgml
+++ b/docs/libnm-glib/tmpl/nm-client.sgml
@@ -9,13 +9,11 @@ NMClient
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-adsl.sgml b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
index 286f2f41..286483f0 100644
--- a/docs/libnm-glib/tmpl/nm-device-adsl.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
@@ -9,13 +9,11 @@ NMDeviceAdsl
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bond.sgml b/docs/libnm-glib/tmpl/nm-device-bond.sgml
index 29c46c9a..16da4778 100644
--- a/docs/libnm-glib/tmpl/nm-device-bond.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bond.sgml
@@ -9,13 +9,11 @@ NMDeviceBond
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bridge.sgml b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
new file mode 100644
index 00000000..e82e2bcb
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
@@ -0,0 +1,140 @@
+
+NMDeviceBridge
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+@NM_DEVICE_BRIDGE_ERROR_UNKNOWN: 
+@NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION: 
+@NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION: 
+@NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml
index e0b17425..26582065 100644
--- a/docs/libnm-glib/tmpl/nm-device-bt.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bt.sgml
@@ -9,13 +9,11 @@ NMDeviceBt
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
index 3f5735b5..ea04914e 100644
--- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
@@ -9,13 +9,11 @@ NMDeviceEthernet
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
index 94ad7b90..e94c6bae 100644
--- a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
@@ -9,13 +9,11 @@ NMDeviceInfiniband
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-modem.sgml b/docs/libnm-glib/tmpl/nm-device-modem.sgml
index e41c07ec..259db939 100644
--- a/docs/libnm-glib/tmpl/nm-device-modem.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-modem.sgml
@@ -9,13 +9,11 @@ NMDeviceModem
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
index 20c63328..a604a43a 100644
--- a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
@@ -9,13 +9,11 @@ NMDeviceOlpcMesh
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-vlan.sgml b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
index 30d839e0..5a58b7b2 100644
--- a/docs/libnm-glib/tmpl/nm-device-vlan.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
@@ -9,13 +9,11 @@ NMDeviceVlan
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
index f5d42c19..89ead82a 100644
--- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
@@ -9,13 +9,11 @@ NMDeviceWifi
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wimax.sgml b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
index d23d0231..8d23e4da 100644
--- a/docs/libnm-glib/tmpl/nm-device-wimax.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
@@ -9,13 +9,11 @@ NMDeviceWimax
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
index 90be4054..68df46f9 100644
--- a/docs/libnm-glib/tmpl/nm-device.sgml
+++ b/docs/libnm-glib/tmpl/nm-device.sgml
@@ -9,13 +9,11 @@ NMDevice
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
index cef5854d..752a8b2c 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
@@ -9,13 +9,11 @@ NMDHCP4Config
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
index 2c113261..d01ac192 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
@@ -9,13 +9,11 @@ NMDHCP6Config
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml b/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
index b81a00af..a60db68e 100644
--- a/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
+++ b/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
@@ -9,13 +9,11 @@ nm-glib-enum-types
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml b/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
index 2f3b0280..dbe72434 100644
--- a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
+++ b/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
@@ -9,13 +9,11 @@ nm-glib-marshal
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
index e015c2af..0e33ca0b 100644
--- a/docs/libnm-glib/tmpl/nm-ip4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
@@ -9,13 +9,11 @@ NMIP4Config
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
index f098e022..f2e66b71 100644
--- a/docs/libnm-glib/tmpl/nm-ip6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
@@ -9,13 +9,11 @@ NMIP6Config
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml
index 93b2441e..aaf91b49 100644
--- a/docs/libnm-glib/tmpl/nm-object.sgml
+++ b/docs/libnm-glib/tmpl/nm-object.sgml
@@ -9,13 +9,11 @@ NMObject
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
index 628000c8..594371fd 100644
--- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
@@ -9,13 +9,11 @@ NMRemoteConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
index 44b4d4fb..3f24a06c 100644
--- a/docs/libnm-glib/tmpl/nm-remote-settings.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
@@ -9,13 +9,11 @@ NMRemoteSettings
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent.sgml b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
index 9d23cbc5..428b7afd 100644
--- a/docs/libnm-glib/tmpl/nm-secret-agent.sgml
+++ b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
@@ -9,13 +9,11 @@ NMSecretAgent
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-types.sgml b/docs/libnm-glib/tmpl/nm-types.sgml
index 18babb0f..1469192e 100644
--- a/docs/libnm-glib/tmpl/nm-types.sgml
+++ b/docs/libnm-glib/tmpl/nm-types.sgml
@@ -9,13 +9,11 @@ nm-types
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
index 3086909a..fe3dcbe0 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
@@ -9,13 +9,11 @@ NMVPNConnection
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml b/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
index 0f800cac..83b976cd 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
@@ -9,13 +9,11 @@ nm-vpn-enum-types
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
index f4c724a8..faa7a8cb 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
@@ -9,13 +9,11 @@ NMVpnPluginUiWidget
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
index ed0ab40b..a35e6a9a 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
@@ -9,13 +9,11 @@ nm-vpn-plugin-utils
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
index 7ece0f79..c04eb296 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
@@ -9,13 +9,11 @@ NMVPNPlugin
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
index f5dca7a3..4dd298b7 100644
--- a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
+++ b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
@@ -9,13 +9,11 @@ NMWimaxNsp
 
 
 
-
 
 
 
 
 
-
 
 
 
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index f6c687fe..fa572dcf 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-0.9.6.4
+0.9.7.995
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 ManualNextNext
 
      
 
      
 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
      		
 
 
 
      
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      

      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